diff --git a/tests/cypress/integration/1-Initial-steps/branding.cy.js b/tests/cypress/integration/1-Initial-steps/branding.cy.js
index a45be4d90..ba2a8f214 100644
--- a/tests/cypress/integration/1-Initial-steps/branding.cy.js
+++ b/tests/cypress/integration/1-Initial-steps/branding.cy.js
@@ -3,7 +3,7 @@ import { GetPluginId, GetPluginName } from '../wp-module-support/pluginID.cy';
 
 describe( 'Branding', function () {
 	before( () => {
-		cy.visit( 'wp-admin/index.php?page=nfd-onboarding' );
+		cy.visit( 'wp-admin/index.php?page=nfd-onboarding#/wp-setup/step/get-started/welcome' );
 	} );
 
 	// since we are setting brand from plugin container, it will not be set to "newfold"
diff --git a/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js b/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js
index 09ae733bd..b22f05e3c 100644
--- a/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js
+++ b/tests/cypress/integration/2-general-onboarding-flow/basic-info.cy.js
@@ -182,9 +182,9 @@ describe( 'Basic Info Page', function () {
 				);
 			}
 			else{
-				cy.get( '.Tooltip-Wrapper', { timeout: 3000 } ).should( 'exist' );
-				cy.get( '.Tooltip-Tip', { timeout: 3000 } )
-					.should( 'be.visible' );
+				cy.get( '.Tooltip-Tip', { timeout: 3000 } ).should( 'be.visible' );
+				cy.get( '.navigation-buttons_next' ).click();
+				cy.get( '.components-modal__content' ).should( 'be.visible' );
 			};
 
 			cy.get( '.components-modal__header button' , { timeout: customCommandTimeout } ).click();
diff --git a/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js b/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js
index 798f73227..c07993ab1 100644
--- a/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js
+++ b/tests/cypress/integration/2-general-onboarding-flow/get-started-welcome.cy.js
@@ -84,8 +84,8 @@ describe( 'Get Started Welcome Page', function () {
 		GetPluginName();
 	} );
 
-	it( 'Check navigation back is not visible', () => {
-		cy.get( '.navigation-buttons_back' ).should( 'not.exist' );
+	it( 'Check navigation back is visible', () => {
+		cy.get( '.navigation-buttons_back' ).should('exist');
 	} );
 
 	it( 'Check if next step loads on clicking navigation next', () => {
diff --git a/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js b/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js
index 0752c9380..6f24fc950 100644
--- a/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js
+++ b/tests/cypress/integration/3-ecommerce-onboarding-flow/get-started-welcome.cy.js
@@ -83,8 +83,8 @@ describe( 'Get Started Welcome Page', function () {
 		GetPluginName();
 	} );
 
-	it( 'Check navigation back is not visible', () => {
-		cy.get( '.navigation-buttons_back' ).should( 'not.exist' );
+	it( 'Check navigation back is visible', () => {
+		cy.get( '.navigation-buttons_back' ).should( 'exist' );
 	} );
 
 	it( 'Check if next step loads on clicking navigation next', () => {
diff --git a/tests/cypress/integration/4-design-steps/colors-step.cy.js b/tests/cypress/integration/4-design-steps/colors-step.cy.js
index 3d15da0da..96e4b18ee 100644
--- a/tests/cypress/integration/4-design-steps/colors-step.cy.js
+++ b/tests/cypress/integration/4-design-steps/colors-step.cy.js
@@ -11,6 +11,8 @@ import {
 
 describe( 'Colors Step Test', function () {
 	before( () => {
+		cy.exec('npx wp-env run cli wp theme activate yith-wonder');
+		cy.wait(5000);
 		cy.visit(
 			'wp-admin/?page=nfd-onboarding#/wp-setup/step/design/colors'
 		);
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/fork.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js
similarity index 88%
rename from tests/cypress/integration/5-AI-SiteGen-onboarding-flow/fork.cy.js
rename to tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js
index 68e664288..3792754d7 100644
--- a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/fork.cy.js
+++ b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js
@@ -4,9 +4,13 @@ import { AdminBarCheck, DarkBGCheck, LightBGCheck, OptionsDetails } from "../wp-
 
 describe( 'SiteGen Fork Step', function () {
 	before( () => {
+        cy.exec(`npx wp-env run cli wp option set _transient_nfd_site_capabilities '{"hasAISitegGen": true, "canAccessAI": true}' --format=json`);
+        cy.exec(`npx wp-env run cli wp option set _transient_timeout_nfd_site_capabilities 4102444800`);
+        cy.wait(10000);
 		cy.visit(
 			'wp-admin/?page=nfd-onboarding#/wp-setup/step/fork'
 		);
+        cy.wait(5000);
 	} );
 
     it( 'Check for the header admin bar', () => {
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/welcome.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/2-welcome.cy.js
similarity index 100%
rename from tests/cypress/integration/5-AI-SiteGen-onboarding-flow/welcome.cy.js
rename to tests/cypress/integration/5-AI-SiteGen-onboarding-flow/2-welcome.cy.js
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/site-details.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/3-site-details.cy.js
similarity index 100%
rename from tests/cypress/integration/5-AI-SiteGen-onboarding-flow/site-details.cy.js
rename to tests/cypress/integration/5-AI-SiteGen-onboarding-flow/3-site-details.cy.js
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/site-logo.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/4-site-logo.cy.js
similarity index 100%
rename from tests/cypress/integration/5-AI-SiteGen-onboarding-flow/site-logo.cy.js
rename to tests/cypress/integration/5-AI-SiteGen-onboarding-flow/4-site-logo.cy.js
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/experience.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/5-experience.cy.js
similarity index 100%
rename from tests/cypress/integration/5-AI-SiteGen-onboarding-flow/experience.cy.js
rename to tests/cypress/integration/5-AI-SiteGen-onboarding-flow/5-experience.cy.js
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/preview.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/6-preview.cy.js
similarity index 100%
rename from tests/cypress/integration/5-AI-SiteGen-onboarding-flow/preview.cy.js
rename to tests/cypress/integration/5-AI-SiteGen-onboarding-flow/6-preview.cy.js