diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index 520ab8367..331c8040a 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -364,4 +364,43 @@ describe('Data browser data', () => {
     cy.contains('Balls to the Wall');
     cy.themeshot('aiassistant');
   });
+
+  it('Modify data', () => {
+    // TODO FIX: delete references cascade not working
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.contains('Employee').click();
+    cy.contains('Rows: 8');
+
+    cy.contains('Laura').click();
+    cy.contains('Laura').click();
+    cy.get('body').realType('Jane');
+    // cy.contains('Peacock').click();
+    // cy.testid('TableDataTab_deleteSelectedRows').click();
+    cy.contains('King').click();
+    cy.testid('TableDataTab_deleteSelectedRows').click();
+    cy.testid('TableDataTab_insertNewRow').click();
+    cy.get('body').realType('Novak');
+    cy.get('body').realPress('{enter}');
+    cy.realPress(['ArrowRight']);
+    cy.get('body').realType('Karel');
+    cy.testid('TableDataTab_save').click();
+    cy.contains('INSERT INTO `Employee`');
+    cy.contains("SET `FirstName`='Jane'");
+    cy.contains('DELETE FROM `Employee`');
+    cy.themeshot('modifydata');
+
+    // cy.testid('ConfirmSqlModal_okButton').click();
+    // cy.contains('Cannot delete or update a parent row')
+    // cy.testid('ConfirmSqlModal_okButton').click();
+
+    // cy.testid('TableDataTab_save').click();
+    // cy.testid('ConfirmSqlModal_deleteReferencesCascade').click();
+    // cy.testid('ConfirmSqlModal_okButton').click();
+
+    cy.testid('ConfirmSqlModal_okButton').click();
+
+    cy.contains('Novak');
+    cy.contains('Rows: 8');
+  });
 });
diff --git a/packages/web/src/modals/ConfirmSqlModal.svelte b/packages/web/src/modals/ConfirmSqlModal.svelte
index 3b328eaf3..1f048a878 100644
--- a/packages/web/src/modals/ConfirmSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmSqlModal.svelte
@@ -92,6 +92,7 @@
           templateProps={{ noMargin: true }}
           label="Delete references CASCADE"
           name="deleteReferencesCascade"
+          data-testid="ConfirmSqlModal_deleteReferencesCascade"
         />
       </div>
     {/if}
@@ -166,8 +167,14 @@
           closeCurrentModal();
           onConfirm(currentScript);
         }}
+        data-testid="ConfirmSqlModal_okButton"
+      />
+      <FormStyledButton
+        type="button"
+        value="Close"
+        on:click={closeCurrentModal}
+        data-testid="ConfirmSqlModal_closeButton"
       />
-      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
       <FormStyledButton
         type="button"
         value="Open script"
@@ -178,6 +185,7 @@
 
           closeCurrentModal();
         }}
+        data-testid="ConfirmSqlModal_openScriptButton"
       />
     </div>
   </ModalBase>
diff --git a/packages/web/src/modals/ErrorMessageModal.svelte b/packages/web/src/modals/ErrorMessageModal.svelte
index 9a69b4fc1..3a49450b9 100644
--- a/packages/web/src/modals/ErrorMessageModal.svelte
+++ b/packages/web/src/modals/ErrorMessageModal.svelte
@@ -30,7 +30,7 @@
     {/if}
 
     <div slot="footer">
-      <FormSubmit value="Close" on:click={closeCurrentModal} />
+      <FormSubmit value="Close" on:click={closeCurrentModal} data-testid="ErrorMessageModal_closeButton" />
     </div>
   </ModalBase>
 </FormProvider>
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index 64bf4782e..06bb02941 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -318,20 +318,29 @@
     <!-- <ToolStripCommandButton command="dataGrid.refresh" hideDisabled />
     <ToolStripCommandButton command="dataForm.refresh" hideDisabled /> -->
 
-    <ToolStripCommandButton command="dataForm.goToFirst" hideDisabled />
-    <ToolStripCommandButton command="dataForm.goToPrevious" hideDisabled />
-    <ToolStripCommandButton command="dataForm.goToNext" hideDisabled />
-    <ToolStripCommandButton command="dataForm.goToLast" hideDisabled />
+    <ToolStripCommandButton command="dataForm.goToFirst" hideDisabled data-testid="TableDataTab_goToFirst" />
+    <ToolStripCommandButton command="dataForm.goToPrevious" hideDisabled data-testid="TableDataTab_goToPrevious" />
+    <ToolStripCommandButton command="dataForm.goToNext" hideDisabled data-testid="TableDataTab_goToNext" />
+    <ToolStripCommandButton command="dataForm.goToLast" hideDisabled data-testid="TableDataTab_goToLast" />
 
     <ToolStripCommandButton
       command="tableData.save"
       iconAfter={getNumberIcon(changeSetChangedCount($changeSetStore?.value))}
+      data-testid="TableDataTab_save"
     />
-    <ToolStripCommandButton command="dataGrid.revertAllChanges" hideDisabled />
-    <ToolStripCommandButton command="dataGrid.insertNewRow" hideDisabled />
-    <ToolStripCommandButton command="dataGrid.deleteSelectedRows" hideDisabled />
-    <ToolStripCommandButton command="dataGrid.switchToForm" hideDisabled />
-    <ToolStripCommandButton command="dataGrid.switchToTable" hideDisabled />
+    <ToolStripCommandButton
+      command="dataGrid.revertAllChanges"
+      hideDisabled
+      data-testid="TableDataTab_revertAllChanges"
+    />
+    <ToolStripCommandButton command="dataGrid.insertNewRow" hideDisabled data-testid="TableDataTab_insertNewRow" />
+    <ToolStripCommandButton
+      command="dataGrid.deleteSelectedRows"
+      hideDisabled
+      data-testid="TableDataTab_deleteSelectedRows"
+    />
+    <ToolStripCommandButton command="dataGrid.switchToForm" hideDisabled data-testid="TableDataTab_switchToForm" />
+    <ToolStripCommandButton command="dataGrid.switchToTable" hideDisabled data-testid="TableDataTab_switchToTable" />
     <ToolStripExportButton {quickExportHandlerRef} />
 
     <ToolStripButton