diff --git a/e2e/tests/plugin-form-dimensional_scalar.spec.ts b/e2e/tests/plugin-form-dimensional_scalar.spec.ts
index 460df20dc..88efb3e52 100644
--- a/e2e/tests/plugin-form-dimensional_scalar.spec.ts
+++ b/e2e/tests/plugin-form-dimensional_scalar.spec.ts
@@ -34,8 +34,6 @@ test('Dimensional scalar', async ({ page }) => {
     await page.getByTestId('number').getByRole('spinbutton').fill('25')
     await page.getByRole('textbox').fill('1 mile')
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await navigate()
     await expect(
@@ -66,8 +64,6 @@ test('Dimensional scalar', async ({ page }) => {
       .getByLabel('label (optional)')
       .fill('Should not show as config overrides')
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'waveForm' }).click()
     await expect(page.getByText('significantWaveHeight (config)')).toBeVisible()
@@ -92,8 +88,6 @@ test('Dimensional scalar', async ({ page }) => {
     await page.getByLabel('label (optional)').fill('New Maximum')
     await page.getByLabel('unit (optional)').fill('€')
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'waveForm' }).click()
     await expect(
diff --git a/e2e/tests/plugin-form-relative_reference.spec.ts b/e2e/tests/plugin-form-relative_reference.spec.ts
index f9718e242..efefa5e7a 100644
--- a/e2e/tests/plugin-form-relative_reference.spec.ts
+++ b/e2e/tests/plugin-form-relative_reference.spec.ts
@@ -19,8 +19,6 @@ test('Relative reference', async ({ page }) => {
     await page.getByRole('button', { name: 'Edit' }).last().click()
     await page.getByTestId('form-number-widget-A Number').fill('1')
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close data' }).click()
 
@@ -37,9 +35,8 @@ test('Relative reference', async ({ page }) => {
     await page.getByTestId('form-number-widget-A Number').fill('10')
     await page.getByRole('button', { name: 'Submit' }).click()
     await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
-    await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close job' }).click()
+    await page.waitForTimeout(5000) // Wait for react-query cache to expire
     await page.getByTestId('data').getByText('Data').click()
     await expect(page.getByRole('code')).toBeVisible()
     await page.getByRole('button', { name: 'Edit' }).last().click()
@@ -65,8 +62,6 @@ test('Relative reference', async ({ page }) => {
     await page.getByTestId('form-number-widget-A Number').fill('2')
     await page.getByRole('button', { name: 'Submit' }).click()
     await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
-    await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close data' }).click()
     await page.getByTestId('job').getByText('Job').last().click()
     await expect(page.getByRole('code')).toBeVisible()
@@ -101,8 +96,6 @@ test('Relative reference', async ({ page }) => {
     await page.getByTestId('form-number-widget-A Number').fill('3')
     await page.getByRole('button', { name: 'Submit' }).click()
     await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
-    await expect(page.getByRole('alert')).not.toBeVisible()
     await page.getByRole('button', { name: 'Close data' }).click()
     await page.getByText('Job', { exact: true }).nth(3).click()
     await expect(page.getByRole('code')).toBeVisible()
diff --git a/e2e/tests/plugin-list-task_list.spec.ts b/e2e/tests/plugin-list-task_list.spec.ts
index 8f1a9a0da..e4372b551 100644
--- a/e2e/tests/plugin-list-task_list.spec.ts
+++ b/e2e/tests/plugin-list-task_list.spec.ts
@@ -21,8 +21,6 @@ test('task list', async ({ page }) => {
       .getByLabel('Task description: (Optional)')
       .fill('Review and submit the tax return.')
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await page.getByLabel('Close task_list').click()
     await page.getByTestId('task_list').getByLabel('Open in tab').click()
     await expect(page.getByText('Tax return', { exact: true })).toBeVisible()
@@ -53,8 +51,6 @@ test('task list', async ({ page }) => {
     ).toHaveValue('Wash the car')
     await page.getByText('Mark task as complete').first().click()
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await page.getByLabel('Close task_list').click()
     await page.getByTestId('task_list').getByLabel('Open in tab').click()
     await page
@@ -223,8 +219,6 @@ test('task list', async ({ page }) => {
       .getByLabel('Task description: (Optional)')
       .fill('Remember to buy new brush.')
     await page.getByRole('button', { name: 'Submit' }).click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
     await page.getByLabel('Close task_list').click()
     await page.getByTestId('task_list').getByLabel('Open in tab').click()
     await expect(
@@ -243,7 +237,7 @@ test('task list', async ({ page }) => {
     await expect(page.getByLabel('Task description: (Optional)')).toHaveValue(
       'Remember to buy new brush.'
     )
-    await page.getByRole('button', { name: 'Minimize item' }).last().click()
+    await page.getByTestId('expandListItem-2').click()
   })
 
   await test.step('Pagination', async () => {
diff --git a/e2e/tests/plugin-table-car_list.spec.ts b/e2e/tests/plugin-table-car_list.spec.ts
index 669eb5f8e..46c034251 100644
--- a/e2e/tests/plugin-table-car_list.spec.ts
+++ b/e2e/tests/plugin-table-car_list.spec.ts
@@ -19,8 +19,6 @@ test('Table car list example', async ({ page }) => {
     await page.getByLabel('Model').fill('e-tron')
     await page.getByLabel('Color (Optional)').fill('Black')
     await page.getByTestId('form-submit').click()
-    await expect(page.getByRole('alert')).toHaveText(['Document updated'])
-    await page.getByRole('button', { name: 'close', exact: true }).click()
 
     //Currently we need to reload application to view saved values...
     await page.reload()