diff --git a/cypress/e2e/ScopeSelector/index.js b/cypress/e2e/ScopeSelector/index.js
index 348c16f2c2..3daaa87f6e 100644
--- a/cypress/e2e/ScopeSelector/index.js
+++ b/cypress/e2e/ScopeSelector/index.js
@@ -232,12 +232,6 @@ Then('you are navigated to the search page with the same org unit and program Ch
     cy.url().should('eq', `${Cypress.config().baseUrl}/#/search?orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW`);
 });
 
-And('there should be Child Programme domain forms visible to search with', () => {
-    cy.get('[data-test="search-page-content"]')
-        .find('[data-test="capture-ui-input"]')
-        .should('have.length', 1);
-});
-
 const selectedChildProgram = ['Program', 'Child Programme'];
 const selectedMalariaProgram = ['Program', 'Malaria case diagnosis'];
 const selectedEventProgram = ['Program', 'Antenatal care visit'];
diff --git a/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js b/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js
index 7946b94e2e..4fafafb9a4 100644
--- a/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js
+++ b/cypress/e2e/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js
@@ -459,7 +459,7 @@ Then('the admission filter should be in effect', () => {
     // clean up
     cy.get('@newEventResult')
         .then((result) => {
-            expect(result.status).to.equal(201);
+            expect(result.response.statusCode).to.equal(201);
             const id = result.response.body.response.uid;
             cy.buildApiUrl('eventFilters', id)
                 .then((eventFiltersUrl) => {
@@ -495,8 +495,7 @@ When('you delete the name toDeleteWorkingList', () => {
         .click();
     cy.contains('Delete view')
         .click();
-    cy.server();
-    cy.route('DELETE', '**/eventFilters/**').as('deleteEventFilters');
+    cy.intercept('DELETE', '**/eventFilters/**').as('deleteEventFilters');
     cy.get('button')
         .contains('Confirm')
         .click();
diff --git a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
index 104ff877ce..1c1574e25d 100644
--- a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
+++ b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -717,12 +717,6 @@ Then('the working list configuration was kept', () => {
         .should('exist');
 });
 
-Then('the working list configuration was kept', () => {
-    cy.get('[data-test="tei-working-lists"]')
-        .contains('Event status: Completed')
-        .should('exist');
-});
-
 Then('the program stage custom working list filters are loaded', () => {
     cy.get('[data-test="tei-working-lists"]')
         .find('[data-test="more-filters"]')
diff --git a/cypress/support/tagUtils/filterInstanceVersion.js b/cypress/support/tagUtils/filterInstanceVersion.js
index f7b933cd8e..68ae9ea14d 100644
--- a/cypress/support/tagUtils/filterInstanceVersion.js
+++ b/cypress/support/tagUtils/filterInstanceVersion.js
@@ -31,8 +31,7 @@ export const filterInstanceVersion = (skip) => {
                 return false;
             }
 
-            const test = operation[operator](currentInstanceVersion, version);
-            return test;
+            return operation[operator](currentInstanceVersion, version);
         });
 
     if (!shouldRun) {
diff --git a/src/core_modules/capture-core/components/Pages/MainPage/WithoutOrgUnitSelectedMessage/WithoutOrgUnitSelectedMessage.js b/src/core_modules/capture-core/components/Pages/MainPage/WithoutOrgUnitSelectedMessage/WithoutOrgUnitSelectedMessage.js
index 5589098844..f791f50b93 100644
--- a/src/core_modules/capture-core/components/Pages/MainPage/WithoutOrgUnitSelectedMessage/WithoutOrgUnitSelectedMessage.js
+++ b/src/core_modules/capture-core/components/Pages/MainPage/WithoutOrgUnitSelectedMessage/WithoutOrgUnitSelectedMessage.js
@@ -39,6 +39,7 @@ type Props = {|
 |}
 
 const WithoutOrgUnitSelectedMessagePlain = ({ programId, setShowAccessible, classes }: Props) => {
+    // TODO - this hook breaks the app when the program is not found
     const { program, programType } = useProgramInfo(programId);
     const IncompleteSelectionMessage = useMemo(() => (programType === programTypes.TRACKER_PROGRAM ? (
         i18n.t('Or see all records accessible to you in {{program}} ', {