diff --git a/cypress/e2e/process_groups.cy.js b/cypress/e2e/process_groups.cy.js
index c3d5885..9038d28 100644
--- a/cypress/e2e/process_groups.cy.js
+++ b/cypress/e2e/process_groups.cy.js
@@ -31,7 +31,9 @@ describe('process-groups', () => {
       newGroupDisplayName
     );
 
-    cy.contains('Delete Process Group').click();
+    cy.contains('Delete').click();
+    cy.contains('Are you sure');
+    cy.contains('OK').click();
     cy.url().should('include', `process-groups`);
     cy.contains(groupId).should('not.exist');
   });
diff --git a/cypress/e2e/process_models.cy.js b/cypress/e2e/process_models.cy.js
index cc624cd..9577f15 100644
--- a/cypress/e2e/process_models.cy.js
+++ b/cypress/e2e/process_models.cy.js
@@ -33,7 +33,9 @@ describe('process-models', () => {
       newModelDisplayName
     );
 
-    cy.contains('Delete process model').click();
+    cy.contains('Delete').click();
+    cy.contains('Are you sure');
+    cy.contains('OK').click();
     cy.url().should('include', `process-groups/${groupId}`);
     cy.contains(modelId).should('not.exist');
   });
@@ -104,7 +106,9 @@ describe('process-models', () => {
     cy.contains(`${jsonFileName}.json`).should('exist');
 
     cy.contains('Edit process model').click();
-    cy.contains('Delete process model').click();
+    cy.contains('Delete').click();
+    cy.contains('Are you sure');
+    cy.contains('OK').click();
     cy.url().should('include', `process-groups/${groupId}`);
     cy.contains(modelId).should('not.exist');
   });
@@ -140,12 +144,16 @@ describe('process-models', () => {
     cy.getBySel('process-instance-list-link').click();
     cy.getBySel('process-instance-show-link').click();
     cy.contains('Delete').click();
+    cy.contains('Are you sure');
+    cy.contains('OK').click();
     cy.contains(`Process Instances for ${modelId}`);
     cy.contains(`Process Model: ${modelId}`);
     cy.contains(modelId).click();
 
     cy.contains('Edit process model').click();
-    cy.contains('Delete process model').click();
+    cy.contains('Delete').click();
+    cy.contains('Are you sure');
+    cy.contains('OK').click();
     cy.url().should('include', `process-groups/${groupId}`);
     cy.contains(modelId).should('not.exist');
   });
diff --git a/cypress/e2e/tasks.cy.js b/cypress/e2e/tasks.cy.js
index c285f24..44a6261 100644
--- a/cypress/e2e/tasks.cy.js
+++ b/cypress/e2e/tasks.cy.js
@@ -1,5 +1,5 @@
-const submitInputIntoFormField = (formName, fieldKey, fieldValue) => {
-  cy.contains(`Task: ${formName}`);
+const submitInputIntoFormField = (taskName, fieldKey, fieldValue) => {
+  cy.contains(`Task: ${taskName}`);
   cy.get(fieldKey).clear().type(fieldValue);
   cy.contains('Submit').click();
 };
@@ -21,7 +21,7 @@ describe('process-models', () => {
     cy.logout();
   });
 
-  it('can complete and navigate a form', () => {
+  it.only('can complete and navigate a form', () => {
     const groupId = 'acceptance-tests-group-one';
     const modelId = `acceptance-tests-model-2`;
     const completedTaskClassName = 'completed-task-highlight';
@@ -36,20 +36,38 @@ describe('process-models', () => {
 
     // FIXME: this will probably need a better way to link to the proper form that we want
     cy.contains('Complete form1').click();
-    submitInputIntoFormField('form1', '#root_user_generated_number_1', 2);
-    submitInputIntoFormField('form2', '#root_user_generated_number_2', 3);
+    submitInputIntoFormField(
+      'get_user_generated_number_one',
+      '#root_user_generated_number_1',
+      2
+    );
+    submitInputIntoFormField(
+      'get_user_generated_number_two',
+      '#root_user_generated_number_2',
+      3
+    );
 
-    cy.contains('Task: form3');
+    cy.contains('Task: get_user_generated_number_three');
     cy.getBySel('form-nav-form2').click();
-    checkFormFieldIsReadOnly('form2', '#root_user_generated_number_2');
+    checkFormFieldIsReadOnly(
+      'get_user_generated_number_two',
+      '#root_user_generated_number_2'
+    );
     cy.getBySel('form-nav-form1').click();
-    checkFormFieldIsReadOnly('form1', '#root_user_generated_number_1');
+    checkFormFieldIsReadOnly(
+      'get_user_generated_number_one',
+      '#root_user_generated_number_1'
+    );
 
     cy.getBySel('form-nav-form3').should('have.text', 'form3 - Current');
     cy.getBySel('form-nav-form3').click();
-    submitInputIntoFormField('form3', '#root_user_generated_number_3', 4);
+    submitInputIntoFormField(
+      'get_user_generated_number_three',
+      '#root_user_generated_number_3',
+      4
+    );
 
-    cy.contains('Task: form4');
+    cy.contains('Task: get_user_generated_number_four');
     cy.navigateToProcessModel(groupId, modelId);
     cy.getBySel('process-instance-list-link').click();
     cy.assertAtLeastOneItemInPaginatedResults();
@@ -74,7 +92,11 @@ describe('process-models', () => {
 
     // FIXME: this will probably need a better way to link to the proper form that we want
     cy.contains('Complete form4').click();
-    submitInputIntoFormField('form4', '#root_user_generated_number_4', 5);
+    submitInputIntoFormField(
+      'get_user_generated_number_four',
+      '#root_user_generated_number_4',
+      5
+    );
     cy.url().should('include', '/tasks');
 
     cy.navigateToProcessModel(groupId, modelId);