diff --git a/api/src/paths/project/{projectId}/attachments/{attachmentId}/delete.ts b/api/src/paths/project/{projectId}/attachments/{attachmentId}/delete.ts
index de1796a60b..4c23c534e5 100644
--- a/api/src/paths/project/{projectId}/attachments/{attachmentId}/delete.ts
+++ b/api/src/paths/project/{projectId}/attachments/{attachmentId}/delete.ts
@@ -5,6 +5,7 @@ import { PROJECT_ROLE, SYSTEM_ROLE } from '../../../../../constants/roles';
 import { getDBConnection } from '../../../../../database/db';
 import { authorizeRequestHandler } from '../../../../../request-handlers/security/authorization';
 import { AttachmentService } from '../../../../../services/attachment-service';
+import { HistoryPublishService } from '../../../../../services/history-publish-service';
 import { deleteFileFromS3 } from '../../../../../utils/file-utils';
 import { getLogger } from '../../../../../utils/logger';
 import { attachmentApiDocObject } from '../../../../../utils/shared-api-docs';
@@ -103,13 +104,16 @@ export function deleteAttachment(): RequestHandler {
       await connection.open();
 
       const attachmentService = new AttachmentService(connection);
+      const historyPublishService = new HistoryPublishService(connection);
 
       let deleteResult: { key: string };
       if (req.body.attachmentType === ATTACHMENT_TYPE.REPORT) {
+        await historyPublishService.deleteProjectReportAttachmentPublishRecord(Number(req.params.attachmentId));
         await attachmentService.deleteProjectReportAttachmentAuthors(Number(req.params.attachmentId));
 
         deleteResult = await attachmentService.deleteProjectReportAttachment(Number(req.params.attachmentId));
       } else {
+        await historyPublishService.deleteProjectAttachmentPublishRecord(Number(req.params.attachmentId));
         deleteResult = await attachmentService.deleteProjectAttachment(Number(req.params.attachmentId));
       }
 
diff --git a/api/src/repositories/history-publish-repository.ts b/api/src/repositories/history-publish-repository.ts
index d0fcc46eb2..9fe31acfa5 100644
--- a/api/src/repositories/history-publish-repository.ts
+++ b/api/src/repositories/history-publish-repository.ts
@@ -623,6 +623,44 @@ export class HistoryPublishRepository extends BaseRepository {
     await this.connection.sql(sqlStatement);
   }
 
+  /**
+   * Deletes a record from `project_attachment_publish` for a given attachment id.
+   *
+   * @param {number} projectAttachmentId
+   * @return {*}  {Promise<void>}
+   * @memberof HistoryPublishRepository
+   */
+  async deleteProjectAttachmentPublishRecord(projectAttachmentId: number): Promise<void> {
+    const sqlStatement = SQL`
+      delete
+      from
+        project_attachment_publish
+      where
+        project_attachment_id = ${projectAttachmentId};
+    `;
+
+    await this.connection.sql(sqlStatement);
+  }
+
+  /**
+   * Deletes a record from `project_report_publish` for a given attachment id.
+   *
+   * @param {number} projectAttachmentId
+   * @return {*}  {Promise<void>}
+   * @memberof HistoryPublishRepository
+   */
+  async deleteProjectReportAttachmentPublishRecord(projectAttachmentId: number): Promise<void> {
+    const sqlStatement = SQL`
+      delete
+      from
+        project_report_publish
+      where
+        project_report_attachment_id = ${projectAttachmentId};
+    `;
+
+    await this.connection.sql(sqlStatement);
+  }
+
   /**
    * Gets the count of unpublished survey attachments
    *
diff --git a/api/src/repositories/user-repository.ts b/api/src/repositories/user-repository.ts
index 50a4831539..ae02805fa3 100644
--- a/api/src/repositories/user-repository.ts
+++ b/api/src/repositories/user-repository.ts
@@ -182,9 +182,9 @@ export class UserRepository extends BaseRepository {
       ON
         uis.user_identity_source_id = su.user_identity_source_id
       WHERE
-        su.user_identifier = ${userIdentifier}
+        su.user_identifier = ${userIdentifier.toLowerCase()}
       AND
-        uis.name = ${identitySource}
+        uis.name = ${identitySource.toUpperCase()}
       GROUP BY
         su.system_user_id,
         su.record_end_date,
@@ -229,7 +229,7 @@ export class UserRepository extends BaseRepository {
         WHERE
           name = ${identitySource.toUpperCase()}
       ),
-      ${userIdentifier},
+      ${userIdentifier.toLowerCase()},
       now()
     )
     RETURNING
diff --git a/api/src/services/history-publish-service.ts b/api/src/services/history-publish-service.ts
index 5ed43ea222..fe7ba8345f 100644
--- a/api/src/services/history-publish-service.ts
+++ b/api/src/services/history-publish-service.ts
@@ -250,6 +250,28 @@ export class HistoryPublishService extends DBService {
     return this.historyRepository.deleteSurveyReportAttachmentPublishRecord(surveyReportAttachmentId);
   }
 
+  /**
+   *  Deletes a record from `project_attachment_publish` for a given attachment id.
+   *
+   * @param {number} surveyAttachmentId
+   * @return {*}  {Promise<void>}
+   * @memberof HistoryPublishService
+   */
+  async deleteProjectAttachmentPublishRecord(surveyAttachmentId: number): Promise<void> {
+    return this.historyRepository.deleteProjectAttachmentPublishRecord(surveyAttachmentId);
+  }
+
+  /**
+   * Deletes a record from `project_report_publish` for a given attachment id.
+   *
+   * @param {number} surveyReportAttachmentId
+   * @return {*}  {Promise<void>}
+   * @memberof HistoryPublishService
+   */
+  async deleteProjectReportAttachmentPublishRecord(surveyReportAttachmentId: number): Promise<void> {
+    return this.historyRepository.deleteProjectReportAttachmentPublishRecord(surveyReportAttachmentId);
+  }
+
   /**
    *  Returns true if a given survey has any unpublished attachments and false if no unpublished attachments are found
    *
diff --git a/app/src/components/dialog/__snapshots__/EditDialog.test.tsx.snap b/app/src/components/dialog/__snapshots__/EditDialog.test.tsx.snap
index 059472899f..93c7868b32 100644
--- a/app/src/components/dialog/__snapshots__/EditDialog.test.tsx.snap
+++ b/app/src/components/dialog/__snapshots__/EditDialog.test.tsx.snap
@@ -53,7 +53,6 @@ exports[`EditDialog matches snapshot when open, with error message 1`] = `
           <form>
             <div
               class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-              data-testid="testField"
             >
               <label
                 class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -76,6 +75,7 @@ exports[`EditDialog matches snapshot when open, with error message 1`] = `
                 <textarea
                   aria-invalid="false"
                   class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline MuiOutlinedInput-inputMultiline"
+                  data-testid="testField"
                   id="testField"
                   name="testField"
                   required=""
@@ -221,7 +221,6 @@ exports[`EditDialog matches the snapshot when open, with no error message 1`] =
           <form>
             <div
               class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-              data-testid="testField"
             >
               <label
                 class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -244,6 +243,7 @@ exports[`EditDialog matches the snapshot when open, with no error message 1`] =
                 <textarea
                   aria-invalid="false"
                   class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline MuiOutlinedInput-inputMultiline"
+                  data-testid="testField"
                   id="testField"
                   name="testField"
                   required=""
diff --git a/app/src/components/fields/CustomTextField.tsx b/app/src/components/fields/CustomTextField.tsx
index b34d72f3d4..20de317dd8 100644
--- a/app/src/components/fields/CustomTextField.tsx
+++ b/app/src/components/fields/CustomTextField.tsx
@@ -18,13 +18,15 @@ const CustomTextField: React.FC<ICustomTextField> = (props) => {
       name={name}
       label={label}
       id={name}
-      data-testid={name}
       onChange={handleChange}
       variant="outlined"
       value={get(values, name)}
       fullWidth={true}
       error={get(touched, name) && Boolean(get(errors, name))}
       helperText={get(touched, name) && get(errors, name)}
+      inputProps={{
+        'data-testid': name
+      }}
       {...other}
     />
   );
diff --git a/app/src/features/projects/components/__snapshots__/ProjectFundingItemForm.test.tsx.snap b/app/src/features/projects/components/__snapshots__/ProjectFundingItemForm.test.tsx.snap
index 3d204d5bc3..677884202e 100644
--- a/app/src/features/projects/components/__snapshots__/ProjectFundingItemForm.test.tsx.snap
+++ b/app/src/features/projects/components/__snapshots__/ProjectFundingItemForm.test.tsx.snap
@@ -93,7 +93,6 @@ exports[`ProjectFundingItemForm auto selection of investment action category wor
         >
           <div
             class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-            data-testid="agency_project_id"
           >
             <label
               class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
@@ -109,6 +108,7 @@ exports[`ProjectFundingItemForm auto selection of investment action category wor
               <input
                 aria-invalid="false"
                 class="MuiInputBase-input MuiOutlinedInput-input"
+                data-testid="agency_project_id"
                 id="agency_project_id"
                 name="agency_project_id"
                 type="text"
@@ -401,7 +401,6 @@ exports[`ProjectFundingItemForm auto selection of investment action category wor
         >
           <div
             class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-            data-testid="agency_project_id"
           >
             <label
               class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
@@ -417,6 +416,7 @@ exports[`ProjectFundingItemForm auto selection of investment action category wor
               <input
                 aria-invalid="false"
                 class="MuiInputBase-input MuiOutlinedInput-input"
+                data-testid="agency_project_id"
                 id="agency_project_id"
                 name="agency_project_id"
                 type="text"
@@ -780,7 +780,6 @@ exports[`ProjectFundingItemForm renders correctly with agency 1 1`] = `
         >
           <div
             class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-            data-testid="agency_project_id"
           >
             <label
               class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -796,6 +795,7 @@ exports[`ProjectFundingItemForm renders correctly with agency 1 1`] = `
               <input
                 aria-invalid="false"
                 class="MuiInputBase-input MuiOutlinedInput-input"
+                data-testid="agency_project_id"
                 id="agency_project_id"
                 name="agency_project_id"
                 type="text"
@@ -1159,7 +1159,6 @@ exports[`ProjectFundingItemForm renders correctly with agency 2 1`] = `
         >
           <div
             class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-            data-testid="agency_project_id"
           >
             <label
               class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -1175,6 +1174,7 @@ exports[`ProjectFundingItemForm renders correctly with agency 2 1`] = `
               <input
                 aria-invalid="false"
                 class="MuiInputBase-input MuiOutlinedInput-input"
+                data-testid="agency_project_id"
                 id="agency_project_id"
                 name="agency_project_id"
                 type="text"
@@ -1467,7 +1467,6 @@ exports[`ProjectFundingItemForm renders correctly with any agency other than 1 o
         >
           <div
             class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-            data-testid="agency_project_id"
           >
             <label
               class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -1483,6 +1482,7 @@ exports[`ProjectFundingItemForm renders correctly with any agency other than 1 o
               <input
                 aria-invalid="false"
                 class="MuiInputBase-input MuiOutlinedInput-input"
+                data-testid="agency_project_id"
                 id="agency_project_id"
                 name="agency_project_id"
                 type="text"
@@ -1777,7 +1777,6 @@ exports[`ProjectFundingItemForm renders correctly with default empty values 1`]
         >
           <div
             class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-            data-testid="agency_project_id"
           >
             <label
               class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
@@ -1793,6 +1792,7 @@ exports[`ProjectFundingItemForm renders correctly with default empty values 1`]
               <input
                 aria-invalid="false"
                 class="MuiInputBase-input MuiOutlinedInput-input"
+                data-testid="agency_project_id"
                 id="agency_project_id"
                 name="agency_project_id"
                 type="text"
diff --git a/app/src/features/projects/create/CreateProjectPage.test.tsx b/app/src/features/projects/create/CreateProjectPage.test.tsx
index adfe8cf812..76c816c2f3 100644
--- a/app/src/features/projects/create/CreateProjectPage.test.tsx
+++ b/app/src/features/projects/create/CreateProjectPage.test.tsx
@@ -19,7 +19,6 @@ import { Feature } from 'geojson';
 import { createMemoryHistory } from 'history';
 import { useBiohubApi } from 'hooks/useBioHubApi';
 import { DataLoader } from 'hooks/useDataLoader';
-import { IGetAllCodeSetsResponse } from 'interfaces/useCodesApi.interface';
 import React from 'react';
 import { MemoryRouter, Router } from 'react-router';
 import { codes } from 'test-helpers/code-helpers';
@@ -28,9 +27,6 @@ const history = createMemoryHistory();
 
 jest.mock('../../../hooks/useBioHubApi');
 const mockUseBiohubApi = {
-  codes: {
-    getAllCodeSets: jest.fn<Promise<IGetAllCodeSetsResponse>, []>()
-  },
   draft: {
     createDraft: jest.fn<Promise<object>, []>(),
     updateDraft: jest.fn<Promise<object>, []>(),
@@ -48,7 +44,8 @@ const mockBiohubApi = ((useBiohubApi as unknown) as jest.Mock<typeof mockUseBioh
 
 const mockCodesContext: ICodesContext = {
   codesDataLoader: {
-    data: codes
+    data: codes,
+    load: () => {}
   } as DataLoader<any, any, any>
 };
 
@@ -67,7 +64,6 @@ const renderContainer = () => {
 describe('CreateProjectPage', () => {
   beforeEach(() => {
     // clear mocks before each test
-    mockBiohubApi().codes.getAllCodeSets.mockClear();
     mockBiohubApi().draft.createDraft.mockClear();
     mockBiohubApi().draft.updateDraft.mockClear();
     mockBiohubApi().draft.getDraft.mockClear();
@@ -80,10 +76,6 @@ describe('CreateProjectPage', () => {
   });
 
   it('renders the initial default page correctly', async () => {
-    mockBiohubApi().codes.getAllCodeSets.mockResolvedValue(({
-      coordinator_agency: [{ id: 1, name: 'A Rocha Canada' }]
-    } as unknown) as IGetAllCodeSetsResponse);
-
     mockBiohubApi().external.post.mockResolvedValue({
       features: [
         {
@@ -371,26 +363,26 @@ describe('CreateProjectPage', () => {
     });
 
     it('opens the save as draft and exit dialog', async () => {
-      const { getByLabelText, findAllByText } = renderContainer();
+      const { getByTestId, findAllByText } = renderContainer();
 
       const saveAsDraftButton = await findAllByText('Save Draft');
 
       fireEvent.click(saveAsDraftButton[0]);
 
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByTestId('draft_name')).toBeVisible();
       });
     });
 
     it('closes the dialog on cancel button click', async () => {
-      const { getByLabelText, findAllByText, getByRole, queryByLabelText } = renderContainer();
+      const { getByTestId, findAllByText, getByRole, queryByLabelText } = renderContainer();
 
       const saveAsDraftButton = await findAllByText('Save Draft');
 
       fireEvent.click(saveAsDraftButton[1]);
 
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByTestId('draft_name')).toBeVisible();
       });
 
       const cancelButton = rawGetByText(getByRole('dialog'), 'Cancel');
@@ -402,56 +394,98 @@ describe('CreateProjectPage', () => {
       });
     });
 
-    it.skip('calls the createDraft/updateDraft functions and closes the dialog on save button click', async () => {
+    it('calls the createDraft function and navigates to the projects list page', async () => {
+      history.push('/admin/projects/create');
+
       mockBiohubApi().draft.createDraft.mockResolvedValue({
         id: 1,
         date: '2021-01-20'
       });
 
-      const { getByText, findAllByText, queryByLabelText, getByLabelText } = renderContainer();
+      const { getByText, getByTestId } = renderContainer();
 
-      const saveAsDraftButton = await findAllByText('Save Draft');
+      const saveDraftButton = await getByTestId('save-draft-button');
 
-      fireEvent.click(saveAsDraftButton[0]);
+      fireEvent.click(saveDraftButton);
 
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByTestId('draft_name')).toBeVisible();
       });
 
-      fireEvent.change(getByLabelText('Draft Name *'), { target: { value: 'draft name' } });
+      fireEvent.change(getByTestId('draft_name'), { target: { value: 'draft name' } });
 
-      fireEvent.click(getByText('Save'));
+      fireEvent.click(getByTestId('edit-dialog-save'));
 
       await waitFor(() => {
         expect(mockBiohubApi().draft.createDraft).toHaveBeenCalledWith('draft name', expect.any(Object));
 
-        expect(queryByLabelText('Draft Name *')).not.toBeInTheDocument();
+        expect(history.location.pathname).toEqual('/admin/projects');
       });
+    });
 
-      fireEvent.click(saveAsDraftButton[0]);
+    it('calls the updateDraft function and navigates to the projects list page', async () => {
+      history.push('/admin/projects/create?draftId=1');
+
+      mockBiohubApi().draft.getDraft.mockResolvedValue({
+        id: 1,
+        name: 'My draft',
+        data: {
+          coordinator: {
+            first_name: 'Draft first name',
+            last_name: 'Draft last name',
+            email_address: 'draftemail@example.com',
+            coordinator_agency: '',
+            share_contact_details: 'false'
+          },
+          project: ProjectDetailsFormInitialValues.project,
+          objectives: ProjectObjectivesFormInitialValues.objectives,
+          location: ProjectLocationFormInitialValues.location,
+          iucn: ProjectIUCNFormInitialValues.iucn,
+          funding: ProjectFundingFormInitialValues.funding,
+          partnerships: ProjectPartnershipsFormInitialValues.partnerships
+        }
+      });
+
+      mockBiohubApi().draft.updateDraft.mockResolvedValue({
+        id: 1,
+        date: '2021-01-20'
+      });
 
+      const { getByText, getByTestId } = renderContainer();
+
+      //wait for initial page to load
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByText('General Information')).toBeVisible();
       });
 
-      fireEvent.change(getByLabelText('Draft Name *'), { target: { value: 'draft name' } });
+      const saveDraftButton = await getByTestId('save-draft-button');
 
-      fireEvent.click(getByText('Save'));
+      fireEvent.click(saveDraftButton);
 
       await waitFor(() => {
-        expect(mockBiohubApi().draft.updateDraft).toHaveBeenCalledWith(1, 'draft name', expect.any(Object));
+        expect(getByTestId('draft_name')).toBeVisible();
+      });
 
-        expect(queryByLabelText('Draft Name *')).not.toBeInTheDocument();
+      fireEvent.change(getByTestId('draft_name'), { target: { value: 'my new draft name' } });
+
+      fireEvent.click(getByTestId('edit-dialog-save'));
+
+      await waitFor(() => {
+        expect(mockBiohubApi().draft.updateDraft).toHaveBeenCalledWith(1, 'my new draft name', expect.any(Object));
+
+        expect(history.location.pathname).toEqual('/admin/projects');
       });
     });
 
-    it.skip('calls the createDraft/updateDraft functions with WIP form data', async () => {
+    it('calls the createDraft functions with WIP form data and navigates to the projects list page', async () => {
+      history.push('/admin/projects/create');
+
       mockBiohubApi().draft.createDraft.mockResolvedValue({
         id: 1,
         date: '2021-01-20'
       });
 
-      const { getByText, findAllByText, getByLabelText, queryByLabelText } = renderContainer();
+      const { getByText, getByTestId, getByLabelText } = renderContainer();
 
       //wait for initial page to load
       await waitFor(() => {
@@ -461,17 +495,17 @@ describe('CreateProjectPage', () => {
       // update first name field
       fireEvent.change(getByLabelText('First Name *'), { target: { value: 'draft first name' } });
 
-      const saveAsDraftButton = await findAllByText('Save Draft');
+      const saveDraftButton = await getByTestId('save-draft-button');
 
-      fireEvent.click(saveAsDraftButton[0]);
+      fireEvent.click(saveDraftButton);
 
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByTestId('draft_name')).toBeVisible();
       });
 
-      fireEvent.change(getByLabelText('Draft Name *'), { target: { value: 'draft name' } });
+      fireEvent.change(getByTestId('draft_name'), { target: { value: 'draft name' } });
 
-      fireEvent.click(getByText('Save'));
+      fireEvent.click(getByTestId('edit-dialog-save'));
 
       await waitFor(() => {
         expect(mockBiohubApi().draft.createDraft).toHaveBeenCalledWith('draft name', {
@@ -496,28 +530,66 @@ describe('CreateProjectPage', () => {
           partnerships: { indigenous_partnerships: [], stakeholder_partnerships: [] }
         });
 
-        expect(queryByLabelText('Draft Name *')).not.toBeInTheDocument();
+        expect(history.location.pathname).toEqual('/admin/projects');
       });
+    });
 
-      // update last name field
-      fireEvent.change(getByLabelText('Last Name *'), { target: { value: 'draft last name' } });
+    it('calls the updateDraft functions with WIP form data and navigates to the projects list page', async () => {
+      history.push('/admin/projects/create?draftId=1');
 
-      fireEvent.click(saveAsDraftButton[0]);
+      mockBiohubApi().draft.getDraft.mockResolvedValue({
+        id: 1,
+        name: 'My draft',
+        data: {
+          coordinator: {
+            first_name: 'Draft first name',
+            last_name: 'Draft last name',
+            email_address: 'draftemail@example.com',
+            coordinator_agency: '',
+            share_contact_details: 'false'
+          },
+          project: ProjectDetailsFormInitialValues.project,
+          objectives: ProjectObjectivesFormInitialValues.objectives,
+          location: ProjectLocationFormInitialValues.location,
+          iucn: ProjectIUCNFormInitialValues.iucn,
+          funding: ProjectFundingFormInitialValues.funding,
+          partnerships: ProjectPartnershipsFormInitialValues.partnerships
+        }
+      });
+
+      mockBiohubApi().draft.updateDraft.mockResolvedValue({
+        id: 1,
+        date: '2021-01-20'
+      });
 
+      const { getByTestId, getByText, getByLabelText } = renderContainer();
+
+      // wait for initial page to load
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByText('General Information')).toBeVisible();
       });
 
-      fireEvent.change(getByLabelText('Draft Name *'), { target: { value: 'draft name' } });
+      // update project name field
+      fireEvent.change(getByLabelText('First Name *'), { target: { value: 'my new draft first name' } });
+
+      const saveDraftButton = await getByTestId('save-draft-button');
 
-      fireEvent.click(getByText('Save'));
+      fireEvent.click(saveDraftButton);
 
       await waitFor(() => {
-        expect(mockBiohubApi().draft.updateDraft).toHaveBeenCalledWith(1, 'draft name', {
+        expect(getByTestId('draft_name')).toBeVisible();
+      });
+
+      fireEvent.change(getByTestId('draft_name'), { target: { value: 'my new draft project name' } });
+
+      fireEvent.click(getByTestId('edit-dialog-save'));
+
+      await waitFor(() => {
+        expect(mockBiohubApi().draft.updateDraft).toHaveBeenCalledWith(1, 'my new draft project name', {
           coordinator: {
-            first_name: 'draft first name',
-            last_name: 'draft last name',
-            email_address: '',
+            first_name: 'my new draft first name',
+            last_name: 'Draft last name',
+            email_address: 'draftemail@example.com',
             coordinator_agency: '',
             share_contact_details: 'false'
           },
@@ -535,7 +607,7 @@ describe('CreateProjectPage', () => {
           partnerships: { indigenous_partnerships: [], stakeholder_partnerships: [] }
         });
 
-        expect(queryByLabelText('Draft Name *')).not.toBeInTheDocument();
+        expect(history.location.pathname).toEqual('/admin/projects');
       });
     });
 
@@ -544,19 +616,19 @@ describe('CreateProjectPage', () => {
         throw new Error('Draft failed exception!');
       });
 
-      const { getByText, findAllByText, getByLabelText, queryByLabelText } = renderContainer();
+      const { getByTestId, queryByLabelText } = renderContainer();
 
-      const saveAsDraftButton = await findAllByText('Save Draft');
+      const saveDraftButton = await getByTestId('save-draft-button');
 
-      fireEvent.click(saveAsDraftButton[0]);
+      fireEvent.click(saveDraftButton);
 
       await waitFor(() => {
-        expect(getByLabelText('Draft Name *')).toBeVisible();
+        expect(getByTestId('draft_name')).toBeVisible();
       });
 
-      fireEvent.change(getByLabelText('Draft Name *'), { target: { value: 'draft name' } });
+      fireEvent.change(getByTestId('draft_name'), { target: { value: 'draft name' } });
 
-      fireEvent.click(getByText('Save'));
+      fireEvent.click(getByTestId('edit-dialog-save'));
 
       await waitFor(() => {
         expect(queryByLabelText('Draft Name *')).not.toBeInTheDocument();
diff --git a/app/src/features/projects/create/CreateProjectPage.tsx b/app/src/features/projects/create/CreateProjectPage.tsx
index 5481669ae2..efefc57f6a 100644
--- a/app/src/features/projects/create/CreateProjectPage.tsx
+++ b/app/src/features/projects/create/CreateProjectPage.tsx
@@ -6,7 +6,6 @@ import Paper from '@material-ui/core/Paper';
 import { Theme } from '@material-ui/core/styles/createMuiTheme';
 import makeStyles from '@material-ui/core/styles/makeStyles';
 import Typography from '@material-ui/core/Typography';
-import assert from 'assert';
 import EditDialog from 'components/dialog/EditDialog';
 import { IErrorDialogProps } from 'components/dialog/ErrorDialog';
 import YesNoDialog from 'components/dialog/YesNoDialog';
@@ -83,7 +82,7 @@ const CreateProjectPage: React.FC = () => {
   const codesContext = useContext(CodesContext);
 
   const codes = codesContext.codesDataLoader.data;
-  assert(codesContext.codesDataLoader.data);
+  codesContext.codesDataLoader.load();
 
   const draftId = Number(queryParams.draftId);
 
@@ -350,14 +349,16 @@ const CreateProjectPage: React.FC = () => {
                   color="primary"
                   variant="contained"
                   onClick={() => formikRef.current?.submitForm()}
-                  className={classes.actionButton}>
+                  className={classes.actionButton}
+                  data-testid="submit-project-button">
                   Submit Project
                 </Button>
                 <Button
                   color="primary"
                   variant="contained"
                   onClick={() => setOpenDraftDialog(true)}
-                  className={classes.actionButton}>
+                  className={classes.actionButton}
+                  data-testid="save-draft-button">
                   Save Draft
                 </Button>
 
@@ -365,7 +366,8 @@ const CreateProjectPage: React.FC = () => {
                   color="secondary"
                   variant="outlined"
                   onClick={() => setOpenDeleteDraftDialog(true)}
-                  className={classes.actionButton}>
+                  className={classes.actionButton}
+                  data-testid="delete-draft-button">
                   Delete Draft
                 </Button>
 
diff --git a/app/src/features/projects/list/ProjectsListTable.tsx b/app/src/features/projects/list/ProjectsListTable.tsx
index dbf9fdcff5..724f286bd9 100644
--- a/app/src/features/projects/list/ProjectsListTable.tsx
+++ b/app/src/features/projects/list/ProjectsListTable.tsx
@@ -101,14 +101,16 @@ const ProjectsListTable: React.FC<IProjectsListTableProps> = (props) => {
           <TableRow>
             <TableCell>Name</TableCell>
             <TableCell>Type</TableCell>
-            <SystemRoleGuard
-              validSystemRoles={[
-                SYSTEM_ROLE.DATA_ADMINISTRATOR,
-                SYSTEM_ROLE.SYSTEM_ADMIN,
-                SYSTEM_ROLE.PROJECT_CREATOR
-              ]}>
-              <TableCell width={150}>Status</TableCell>
-            </SystemRoleGuard>
+            <TableCell width={150}>
+              <SystemRoleGuard
+                validSystemRoles={[
+                  SYSTEM_ROLE.DATA_ADMINISTRATOR,
+                  SYSTEM_ROLE.SYSTEM_ADMIN,
+                  SYSTEM_ROLE.PROJECT_CREATOR
+                ]}>
+                Status
+              </SystemRoleGuard>
+            </TableCell>
             <TableCell width={150}>Start Date</TableCell>
             <TableCell width={150}>End Date</TableCell>
           </TableRow>
diff --git a/app/src/features/surveys/__snapshots__/SurveyPermitForm.test.tsx.snap b/app/src/features/surveys/__snapshots__/SurveyPermitForm.test.tsx.snap
index 0ae2fb9479..fbc9536089 100644
--- a/app/src/features/surveys/__snapshots__/SurveyPermitForm.test.tsx.snap
+++ b/app/src/features/surveys/__snapshots__/SurveyPermitForm.test.tsx.snap
@@ -69,7 +69,6 @@ exports[`SurveyPermitForm renders correctly with error on the permits field due
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="permit.permits.[0].permit_number"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -91,6 +90,7 @@ exports[`SurveyPermitForm renders correctly with error on the permits field due
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input"
+                        data-testid="permit.permits.[0].permit_number"
                         id="permit.permits.[0].permit_number"
                         name="permit.permits.[0].permit_number"
                         required=""
@@ -239,7 +239,6 @@ exports[`SurveyPermitForm renders correctly with error on the permits field due
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="permit.permits.[1].permit_number"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -261,6 +260,7 @@ exports[`SurveyPermitForm renders correctly with error on the permits field due
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input"
+                        data-testid="permit.permits.[1].permit_number"
                         id="permit.permits.[1].permit_number"
                         name="permit.permits.[1].permit_number"
                         required=""
@@ -451,7 +451,6 @@ exports[`SurveyPermitForm renders correctly with errors on the permit_number and
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="permit.permits.[0].permit_number"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -473,6 +472,7 @@ exports[`SurveyPermitForm renders correctly with errors on the permit_number and
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input"
+                        data-testid="permit.permits.[0].permit_number"
                         id="permit.permits.[0].permit_number"
                         name="permit.permits.[0].permit_number"
                         required=""
@@ -621,7 +621,6 @@ exports[`SurveyPermitForm renders correctly with errors on the permit_number and
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="permit.permits.[1].permit_number"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -643,6 +642,7 @@ exports[`SurveyPermitForm renders correctly with errors on the permit_number and
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input"
+                        data-testid="permit.permits.[1].permit_number"
                         id="permit.permits.[1].permit_number"
                         name="permit.permits.[1].permit_number"
                         required=""
@@ -833,7 +833,6 @@ exports[`SurveyPermitForm renders correctly with existing permit values 1`] = `
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="permit.permits.[0].permit_number"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -855,6 +854,7 @@ exports[`SurveyPermitForm renders correctly with existing permit values 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input"
+                        data-testid="permit.permits.[0].permit_number"
                         id="permit.permits.[0].permit_number"
                         name="permit.permits.[0].permit_number"
                         required=""
@@ -1003,7 +1003,6 @@ exports[`SurveyPermitForm renders correctly with existing permit values 1`] = `
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="permit.permits.[1].permit_number"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -1025,6 +1024,7 @@ exports[`SurveyPermitForm renders correctly with existing permit values 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input"
+                        data-testid="permit.permits.[1].permit_number"
                         id="permit.permits.[1].permit_number"
                         name="permit.permits.[1].permit_number"
                         required=""
diff --git a/app/src/features/surveys/components/__snapshots__/GeneralInformationForm.test.tsx.snap b/app/src/features/surveys/components/__snapshots__/GeneralInformationForm.test.tsx.snap
index b7b353821b..f3bf8c2197 100644
--- a/app/src/features/surveys/components/__snapshots__/GeneralInformationForm.test.tsx.snap
+++ b/app/src/features/surveys/components/__snapshots__/GeneralInformationForm.test.tsx.snap
@@ -10,7 +10,6 @@ exports[`General Information Form renders correctly the empty component correctl
     >
       <div
         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        data-testid="survey_details.survey_name"
       >
         <label
           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
@@ -32,6 +31,7 @@ exports[`General Information Form renders correctly the empty component correctl
           <input
             aria-invalid="false"
             class="MuiInputBase-input MuiOutlinedInput-input"
+            data-testid="survey_details.survey_name"
             id="survey_details.survey_name"
             name="survey_details.survey_name"
             required=""
@@ -415,7 +415,6 @@ exports[`General Information Form renders correctly the empty component correctl
       >
         <div
           class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-          data-testid="survey_details.biologist_first_name"
         >
           <label
             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
@@ -437,6 +436,7 @@ exports[`General Information Form renders correctly the empty component correctl
             <input
               aria-invalid="false"
               class="MuiInputBase-input MuiOutlinedInput-input"
+              data-testid="survey_details.biologist_first_name"
               id="survey_details.biologist_first_name"
               name="survey_details.biologist_first_name"
               required=""
@@ -463,7 +463,6 @@ exports[`General Information Form renders correctly the empty component correctl
       >
         <div
           class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-          data-testid="survey_details.biologist_last_name"
         >
           <label
             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
@@ -485,6 +484,7 @@ exports[`General Information Form renders correctly the empty component correctl
             <input
               aria-invalid="false"
               class="MuiInputBase-input MuiOutlinedInput-input"
+              data-testid="survey_details.biologist_last_name"
               id="survey_details.biologist_last_name"
               name="survey_details.biologist_last_name"
               required=""
@@ -680,7 +680,6 @@ exports[`General Information Form renders correctly the filled component correct
     >
       <div
         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        data-testid="survey_details.survey_name"
       >
         <label
           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -702,6 +701,7 @@ exports[`General Information Form renders correctly the filled component correct
           <input
             aria-invalid="false"
             class="MuiInputBase-input MuiOutlinedInput-input"
+            data-testid="survey_details.survey_name"
             id="survey_details.survey_name"
             name="survey_details.survey_name"
             required=""
@@ -1085,7 +1085,6 @@ exports[`General Information Form renders correctly the filled component correct
       >
         <div
           class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-          data-testid="survey_details.biologist_first_name"
         >
           <label
             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -1107,6 +1106,7 @@ exports[`General Information Form renders correctly the filled component correct
             <input
               aria-invalid="false"
               class="MuiInputBase-input MuiOutlinedInput-input"
+              data-testid="survey_details.biologist_first_name"
               id="survey_details.biologist_first_name"
               name="survey_details.biologist_first_name"
               required=""
@@ -1133,7 +1133,6 @@ exports[`General Information Form renders correctly the filled component correct
       >
         <div
           class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-          data-testid="survey_details.biologist_last_name"
         >
           <label
             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -1155,6 +1154,7 @@ exports[`General Information Form renders correctly the filled component correct
             <input
               aria-invalid="false"
               class="MuiInputBase-input MuiOutlinedInput-input"
+              data-testid="survey_details.biologist_last_name"
               id="survey_details.biologist_last_name"
               name="survey_details.biologist_last_name"
               required=""
@@ -1215,7 +1215,6 @@ exports[`General Information Form renders correctly the filled component correct
                     >
                       <div
                         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                        data-testid="permit.permits.[0].permit_number"
                       >
                         <label
                           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -1237,6 +1236,7 @@ exports[`General Information Form renders correctly the filled component correct
                           <input
                             aria-invalid="false"
                             class="MuiInputBase-input MuiOutlinedInput-input"
+                            data-testid="permit.permits.[0].permit_number"
                             id="permit.permits.[0].permit_number"
                             name="permit.permits.[0].permit_number"
                             required=""
@@ -1543,7 +1543,6 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
     >
       <div
         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        data-testid="survey_details.survey_name"
       >
         <label
           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-error Mui-error MuiFormLabel-filled Mui-required Mui-required"
@@ -1566,6 +1565,7 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
             aria-describedby="survey_details.survey_name-helper-text"
             aria-invalid="true"
             class="MuiInputBase-input MuiOutlinedInput-input"
+            data-testid="survey_details.survey_name"
             id="survey_details.survey_name"
             name="survey_details.survey_name"
             required=""
@@ -1962,7 +1962,6 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
       >
         <div
           class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-          data-testid="survey_details.biologist_first_name"
         >
           <label
             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-error Mui-error MuiFormLabel-filled Mui-required Mui-required"
@@ -1985,6 +1984,7 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
               aria-describedby="survey_details.biologist_first_name-helper-text"
               aria-invalid="true"
               class="MuiInputBase-input MuiOutlinedInput-input"
+              data-testid="survey_details.biologist_first_name"
               id="survey_details.biologist_first_name"
               name="survey_details.biologist_first_name"
               required=""
@@ -2017,7 +2017,6 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
       >
         <div
           class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-          data-testid="survey_details.biologist_last_name"
         >
           <label
             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-error Mui-error MuiFormLabel-filled Mui-required Mui-required"
@@ -2040,6 +2039,7 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
               aria-describedby="survey_details.biologist_last_name-helper-text"
               aria-invalid="true"
               class="MuiInputBase-input MuiOutlinedInput-input"
+              data-testid="survey_details.biologist_last_name"
               id="survey_details.biologist_last_name"
               name="survey_details.biologist_last_name"
               required=""
@@ -2106,7 +2106,6 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
                     >
                       <div
                         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                        data-testid="permit.permits.[0].permit_number"
                       >
                         <label
                           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -2128,6 +2127,7 @@ exports[`General Information Form renders correctly when errors exist 1`] = `
                           <input
                             aria-invalid="false"
                             class="MuiInputBase-input MuiOutlinedInput-input"
+                            data-testid="permit.permits.[0].permit_number"
                             id="permit.permits.[0].permit_number"
                             name="permit.permits.[0].permit_number"
                             required=""
diff --git a/app/src/features/surveys/components/__snapshots__/ProprietaryDataForm.test.tsx.snap b/app/src/features/surveys/components/__snapshots__/ProprietaryDataForm.test.tsx.snap
index 1a2aae7178..7a75677957 100644
--- a/app/src/features/surveys/components/__snapshots__/ProprietaryDataForm.test.tsx.snap
+++ b/app/src/features/surveys/components/__snapshots__/ProprietaryDataForm.test.tsx.snap
@@ -451,7 +451,6 @@ exports[`Proprietary Data Form renders correctly the filled component correctly
             >
               <div
                 class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                data-testid="proprietor.proprietor_name"
               >
                 <label
                   class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -473,6 +472,7 @@ exports[`Proprietary Data Form renders correctly the filled component correctly
                   <input
                     aria-invalid="false"
                     class="MuiInputBase-input MuiOutlinedInput-input"
+                    data-testid="proprietor.proprietor_name"
                     id="proprietor.proprietor_name"
                     name="proprietor.proprietor_name"
                     required=""
@@ -499,7 +499,6 @@ exports[`Proprietary Data Form renders correctly the filled component correctly
             >
               <div
                 class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                data-testid="proprietor.category_rationale"
               >
                 <label
                   class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -521,6 +520,7 @@ exports[`Proprietary Data Form renders correctly the filled component correctly
                   <textarea
                     aria-invalid="false"
                     class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline MuiOutlinedInput-inputMultiline"
+                    data-testid="proprietor.category_rationale"
                     id="proprietor.category_rationale"
                     name="proprietor.category_rationale"
                     required=""
@@ -984,7 +984,6 @@ exports[`Proprietary Data Form renders correctly when errors exist when survey d
             >
               <div
                 class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                data-testid="proprietor.proprietor_name"
               >
                 <label
                   class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-error Mui-error MuiFormLabel-filled Mui-required Mui-required"
@@ -1007,6 +1006,7 @@ exports[`Proprietary Data Form renders correctly when errors exist when survey d
                     aria-describedby="proprietor.proprietor_name-helper-text"
                     aria-invalid="true"
                     class="MuiInputBase-input MuiOutlinedInput-input"
+                    data-testid="proprietor.proprietor_name"
                     id="proprietor.proprietor_name"
                     name="proprietor.proprietor_name"
                     required=""
@@ -1039,7 +1039,6 @@ exports[`Proprietary Data Form renders correctly when errors exist when survey d
             >
               <div
                 class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                data-testid="proprietor.category_rationale"
               >
                 <label
                   class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-error Mui-error MuiFormLabel-filled Mui-required Mui-required"
@@ -1062,6 +1061,7 @@ exports[`Proprietary Data Form renders correctly when errors exist when survey d
                     aria-describedby="proprietor.category_rationale-helper-text"
                     aria-invalid="true"
                     class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline MuiOutlinedInput-inputMultiline"
+                    data-testid="proprietor.category_rationale"
                     id="proprietor.category_rationale"
                     name="proprietor.category_rationale"
                     required=""
diff --git a/app/src/features/surveys/components/__snapshots__/StudyAreaForm.test.tsx.snap b/app/src/features/surveys/components/__snapshots__/StudyAreaForm.test.tsx.snap
index 7354f79fe0..98259d5f1e 100644
--- a/app/src/features/surveys/components/__snapshots__/StudyAreaForm.test.tsx.snap
+++ b/app/src/features/surveys/components/__snapshots__/StudyAreaForm.test.tsx.snap
@@ -8,7 +8,6 @@ exports[`Study Area Form renders correctly the empty component correctly 1`] = `
     >
       <div
         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        data-testid="location.survey_area_name"
       >
         <label
           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
@@ -30,6 +29,7 @@ exports[`Study Area Form renders correctly the empty component correctly 1`] = `
           <input
             aria-invalid="false"
             class="MuiInputBase-input MuiOutlinedInput-input"
+            data-testid="location.survey_area_name"
             id="location.survey_area_name"
             name="location.survey_area_name"
             required=""
@@ -432,7 +432,6 @@ exports[`Study Area Form renders correctly the filled component correctly 1`] =
     >
       <div
         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        data-testid="location.survey_area_name"
       >
         <label
           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled Mui-required Mui-required"
@@ -454,6 +453,7 @@ exports[`Study Area Form renders correctly the filled component correctly 1`] =
           <input
             aria-invalid="false"
             class="MuiInputBase-input MuiOutlinedInput-input"
+            data-testid="location.survey_area_name"
             id="location.survey_area_name"
             name="location.survey_area_name"
             required=""
@@ -900,7 +900,6 @@ exports[`Study Area Form renders correctly when errors exist 1`] = `
     >
       <div
         class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        data-testid="location.survey_area_name"
       >
         <label
           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined Mui-error Mui-error MuiFormLabel-filled Mui-required Mui-required"
@@ -923,6 +922,7 @@ exports[`Study Area Form renders correctly when errors exist 1`] = `
             aria-describedby="location.survey_area_name-helper-text"
             aria-invalid="true"
             class="MuiInputBase-input MuiOutlinedInput-input"
+            data-testid="location.survey_area_name"
             id="location.survey_area_name"
             name="location.survey_area_name"
             required=""
diff --git a/app/src/features/surveys/view/SurveyHeader.test.tsx b/app/src/features/surveys/view/SurveyHeader.test.tsx
index bad1781b29..995a825f55 100644
--- a/app/src/features/surveys/view/SurveyHeader.test.tsx
+++ b/app/src/features/surveys/view/SurveyHeader.test.tsx
@@ -2,6 +2,7 @@ import { cleanup, fireEvent, render, waitFor } from '@testing-library/react';
 import { SYSTEM_ROLE } from 'constants/roles';
 import { AuthStateContext, IAuthState } from 'contexts/authStateContext';
 import { DialogContextProvider } from 'contexts/dialogContext';
+import { IProjectContext, ProjectContext } from 'contexts/projectContext';
 import { ISurveyContext, SurveyContext } from 'contexts/surveyContext';
 import SurveyHeader from 'features/surveys/view/SurveyHeader';
 import { createMemoryHistory } from 'history';
@@ -81,15 +82,23 @@ describe('SurveyHeader', () => {
 
   const renderComponent = (authState: any) => {
     return render(
-      <SurveyContext.Provider value={mockSurveyContext}>
-        <AuthStateContext.Provider value={authState as IAuthState}>
-          <DialogContextProvider>
-            <Router history={history}>
-              <SurveyHeader />
-            </Router>
-          </DialogContextProvider>
-        </AuthStateContext.Provider>
-      </SurveyContext.Provider>
+      <ProjectContext.Provider
+        value={
+          ({
+            projectId: 1,
+            surveysListDataLoader: ({ refresh: jest.fn() } as unknown) as DataLoader<any, any, any>
+          } as unknown) as IProjectContext
+        }>
+        <SurveyContext.Provider value={mockSurveyContext}>
+          <AuthStateContext.Provider value={authState as IAuthState}>
+            <DialogContextProvider>
+              <Router history={history}>
+                <SurveyHeader />
+              </Router>
+            </DialogContextProvider>
+          </AuthStateContext.Provider>
+        </SurveyContext.Provider>
+      </ProjectContext.Provider>
     );
   };
 
diff --git a/app/src/features/surveys/view/SurveyHeader.tsx b/app/src/features/surveys/view/SurveyHeader.tsx
index ea9aa85ab6..7c90821cb4 100644
--- a/app/src/features/surveys/view/SurveyHeader.tsx
+++ b/app/src/features/surveys/view/SurveyHeader.tsx
@@ -26,6 +26,7 @@ import { DeleteSurveyI18N } from 'constants/i18n';
 import { PROJECT_ROLE, SYSTEM_ROLE } from 'constants/roles';
 import { AuthStateContext } from 'contexts/authStateContext';
 import { DialogContext } from 'contexts/dialogContext';
+import { ProjectContext } from 'contexts/projectContext';
 import { SurveyContext } from 'contexts/surveyContext';
 import { APIError } from 'hooks/api/useAxios';
 import { useBiohubApi } from 'hooks/useBioHubApi';
@@ -61,6 +62,8 @@ const useStyles = makeStyles((theme: Theme) => ({
  */
 const SurveyHeader = () => {
   const surveyContext = useContext(SurveyContext);
+  const projectContext = useContext(ProjectContext);
+
   const surveyWithDetails = surveyContext.surveyDataLoader.data;
 
   const classes = useStyles();
@@ -124,6 +127,7 @@ const SurveyHeader = () => {
         showDeleteErrorDialog({ open: true });
         return;
       }
+      projectContext.surveysListDataLoader.refresh(projectContext.projectId);
 
       history.push(`/admin/projects/${surveyContext.projectId}/surveys`);
     } catch (error) {
diff --git a/app/src/pages/access/__snapshots__/AccessRequestPage.test.tsx.snap b/app/src/pages/access/__snapshots__/AccessRequestPage.test.tsx.snap
index 26c3a363f6..899a1483a4 100644
--- a/app/src/pages/access/__snapshots__/AccessRequestPage.test.tsx.snap
+++ b/app/src/pages/access/__snapshots__/AccessRequestPage.test.tsx.snap
@@ -130,7 +130,6 @@ exports[`AccessRequestPage renders correctly 1`] = `
                 >
                   <div
                     class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-                    data-testid="reason"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
@@ -146,6 +145,7 @@ exports[`AccessRequestPage renders correctly 1`] = `
                       <textarea
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline MuiOutlinedInput-inputMultiline"
+                        data-testid="reason"
                         id="reason"
                         name="reason"
                         rows="4"
diff --git a/database/src/migrations/20230427160000_api_delete_survey.ts b/database/src/migrations/20230427160000_api_delete_survey.ts
new file mode 100644
index 0000000000..44617b0f38
--- /dev/null
+++ b/database/src/migrations/20230427160000_api_delete_survey.ts
@@ -0,0 +1,91 @@
+import { Knex } from 'knex';
+
+/**
+ * Apply biohub release changes.
+ *
+ * @export
+ * @param {Knex} knex
+ * @return {*}  {Promise<void>}
+ */
+export async function up(knex: Knex): Promise<void> {
+  await knex.raw(`set search_path=biohub;
+
+  CREATE OR REPLACE PROCEDURE api_delete_survey(p_survey_id integer)
+  LANGUAGE plpgsql
+  SECURITY DEFINER
+ AS $procedure$
+   -- *******************************************************************
+     -- Procedure: api_delete_survey
+     -- Purpose: deletes a survey and dependencies
+     --
+     -- MODIFICATION HISTORY
+     -- Person           Date        Comments
+     -- ---------------- ----------- --------------------------------------
+     -- shreyas.devalapurkar@quartech.com
+     --                  2021-06-18  initial release
+     -- charlie.garrettjones@quartech.com
+     --                  2021-06-21  added occurrence submission delete
+     -- charlie.garrettjones@quartech.com
+     --                  2021-09-21  added survey summary submission delete
+     -- kjartan.einarsson@quartech.com
+     --                  2022-08-28  added survey_vantage, survey_spatial_component, survey delete
+     -- charlie.garrettjones@quartech.com
+     --                  2022-09-07  changes to permit model
+     -- charlie.garrettjones@quartech.com
+     --                  2022-10-05  1.3.0 model changes
+     -- charlie.garrettjones@quartech.com
+     --                  2022-10-05  1.5.0 model changes, drop concept of occurrence deletion for published data
+     -- charlie.garrettjones@quartech.com
+     --                  2023-03-14  1.7.0 model changes
+     -- alfred.rosenthal@quartech.com
+     --                  2023-03-15  added missing publish tables to survey delete
+     -- curtis.upshall@quartech.com
+     --                  2023-04-28  change order of survey delete procedure
+     -- *******************************************************************
+     declare
+
+     begin
+       with occurrence_submissions as (select occurrence_submission_id from occurrence_submission where survey_id = p_survey_id)
+       , submission_spatial_components as (select submission_spatial_component_id from submission_spatial_component
+          where occurrence_submission_id in (select occurrence_submission_id from occurrence_submissions))
+       delete from spatial_transform_submission where submission_spatial_component_id in (select submission_spatial_component_id from submission_spatial_components);
+       delete from submission_spatial_component where occurrence_submission_id in (select occurrence_submission_id from occurrence_submission where survey_id = p_survey_id);
+
+       with occurrence_submissions as (select occurrence_submission_id from occurrence_submission where survey_id = p_survey_id)
+       , submission_statuses as (select submission_status_id from submission_status
+        where occurrence_submission_id in (select occurrence_submission_id from occurrence_submissions))
+       delete from submission_message where submission_status_id in (select submission_status_id from submission_statuses);
+       delete from submission_status where occurrence_submission_id in (select occurrence_submission_id from occurrence_submission where survey_id = p_survey_id);
+
+       delete from occurrence_submission_publish where occurrence_submission_id in (select occurrence_submission_id from occurrence_submission where survey_id = p_survey_id);
+
+       delete from occurrence_submission where survey_id = p_survey_id;
+
+       delete from survey_summary_submission_publish where survey_summary_submission_id in (select survey_summary_submission_id from survey_summary_submission where survey_id = p_survey_id);
+       delete from survey_summary_submission_message where survey_summary_submission_id in (select survey_summary_submission_id from survey_summary_submission where survey_id = p_survey_id);
+       delete from survey_summary_submission where survey_id = p_survey_id;
+       delete from survey_proprietor where survey_id = p_survey_id;
+       delete from survey_attachment_publish where survey_attachment_id in (select survey_attachment_id from survey_attachment where survey_id = p_survey_id);
+       delete from survey_attachment where survey_id = p_survey_id;
+       delete from survey_report_author where survey_report_attachment_id in (select survey_report_attachment_id from survey_report_attachment where survey_id = p_survey_id);
+       delete from survey_report_publish where survey_report_attachment_id in (select survey_report_attachment_id from survey_report_attachment where survey_id = p_survey_id);
+       delete from survey_report_attachment where survey_id = p_survey_id;
+       delete from study_species where survey_id = p_survey_id;
+       delete from survey_funding_source where survey_id = p_survey_id;
+       delete from survey_vantage where survey_id = p_survey_id;
+       delete from survey_spatial_component where survey_id = p_survey_id;
+       delete from survey_metadata_publish where survey_id = p_survey_id;
+
+       delete from permit where survey_id = p_survey_id;
+       delete from survey where survey_id = p_survey_id;
+
+     exception
+       when others THEN
+         raise;
+     end;
+   $procedure$;`);
+}
+
+export async function down(knex: Knex): Promise<void> {
+  await knex.raw(``);
+}