diff --git a/.github/workflows/verify-app.yml b/.github/workflows/verify-app.yml
index 4877b7ceed..31f099ced0 100644
--- a/.github/workflows/verify-app.yml
+++ b/.github/workflows/verify-app.yml
@@ -94,7 +94,7 @@ jobs:
 
   instance-version:
     runs-on: ubuntu-latest
-    needs: [lint, flow, unit-tests]
+    needs: install # [lint, flow, unit-tests]
     if: "!(startsWith(github.event.head_commit.message, 'fix(translations)') && github.actor == 'dhis2-bot') && !contains(github.event.head_commit.message, '[skip ci]')"
     outputs:
       version: ${{ steps.instance-version.outputs.version }}
diff --git a/cypress/e2e/SmokeTests/index.js b/cypress/e2e/SmokeTests/index.js
index 7deac3868d..68a9261632 100644
--- a/cypress/e2e/SmokeTests/index.js
+++ b/cypress/e2e/SmokeTests/index.js
@@ -7,6 +7,7 @@ Then('you should see the app main selections', () => {
 });
 
 Given('you open the App without auth cookie', () => {
+    cy.clearCookies();
     cy.visit('/');
 });
 
diff --git a/package.json b/package.json
index 0c704f903a..99841541eb 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
         "uuid": "^9.0.0"
     },
     "scripts": {
-        "start": "yarn verifyCacheVersion && concurrently --kill-others \"yarn workspaces run build:watch\" \"d2-app-scripts start\"",
+        "start": "export  yarn verifyCacheVersion && concurrently --kill-others \"yarn workspaces run build:watch\" \"d2-app-scripts start\"",
         "start:forCypress": "yarn workspaces run build && node scripts/startAppForCypress.js",
         "build": "yarn verifyCacheVersion && yarn workspaces run build && GENERATE_SOURCEMAP=false d2-app-scripts build && cp ./package.json ./build/app/package.json",
         "build:standalone": "yarn workspaces run build && GENERATE_SOURCEMAP=false d2-app-scripts build --standalone",
diff --git a/src/core_modules/capture-core/components/D2Form/D2Form.component.js b/src/core_modules/capture-core/components/D2Form/D2Form.component.js
index 4f17677b07..addff864e7 100644
--- a/src/core_modules/capture-core/components/D2Form/D2Form.component.js
+++ b/src/core_modules/capture-core/components/D2Form/D2Form.component.js
@@ -92,6 +92,7 @@ class D2Form extends React.PureComponent<PropsForPureComponent> {
             formBuilderId={this.getFormBuilderId(section.id)}
             sectionId={section.id}
             applyCustomFormClass={false}
+            data-test="d2-form-component"
             {...passOnProps}
         />
     )
@@ -105,6 +106,7 @@ class D2Form extends React.PureComponent<PropsForPureComponent> {
             formId={this.getFormId()}
             formBuilderId={this.getFormBuilderId(section.id)}
             sectionId={section.id}
+            data-test="d2-form-component"
             applyCustomFormClass={!!section.customForm}
             {...passOnProps}
         />
diff --git a/src/core_modules/capture-core/components/D2Form/D2Section.component.js b/src/core_modules/capture-core/components/D2Form/D2Section.component.js
index e0cf89264c..10d8854f89 100644
--- a/src/core_modules/capture-core/components/D2Form/D2Section.component.js
+++ b/src/core_modules/capture-core/components/D2Form/D2Section.component.js
@@ -116,7 +116,6 @@ class D2SectionPlain extends React.PureComponent<Props> {
         }
 
         return (<div
-            data-test="d2-form-component"
             className={applyCustomFormClass ? this.props.classes.containerCustomForm : ''}
         >
             {
diff --git a/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js b/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js
index 218004f055..bf7e55746e 100644
--- a/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js
+++ b/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js
@@ -274,6 +274,7 @@ export class D2SectionFieldsComponent extends Component<Props> {
             <CustomFormHOC
                 formBuilderRef={(instance) => { this.formBuilderInstance = instance; }}
                 id={formId}
+                data-test="dhis2-capture-form"
                 fields={this.getFieldConfigWithRulesEffects()}
                 dataElements={this.formFields}
                 values={values}
diff --git a/yarn.lock b/yarn.lock
index 8be06b9e02..475e8cabec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17153,10 +17153,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.3:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"