diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js
index 09c6f6b81..50c71d33f 100644
--- a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js
+++ b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/1-fork.cy.js
@@ -28,14 +28,15 @@ describe( 'SiteGen Fork Step', function() {
 		AdminBarCheck();
 	} );
 
-	it( 'Check for the existing dark background', () => {
-		DarkBGCheck();
+	it( 'Check for the default light background', () => {
+		LightBGCheck();
 	} );
 
-	it( 'Check for the light background', () => {
-		LightBGCheck();
+	it( 'Check for the dark background', () => {
+		DarkBGCheck();
 	} );
 
+
 	it( 'Check for the heading and the title', () => {
 		cy.get( '.nfd-onboarding-step__heading__title' )
 			.should( 'be.visible' )
@@ -120,8 +121,8 @@ describe( 'SiteGen Fork Step', function() {
 		).should( 'exist' );
 
 		AdminBarCheck();
-		DarkBGCheck();
 		LightBGCheck();
+		DarkBGCheck();
 		cy.wait( '@migrateCall', { timeout: waitTime } );
 	} );
 
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/3-site-details.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/3-site-details.cy.js
index d52056e85..ae3761916 100644
--- a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/3-site-details.cy.js
+++ b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/3-site-details.cy.js
@@ -19,12 +19,12 @@ describe( 'SiteGen Site Details Step', function () {
 		AdminBarCheck();
 	} );
 
-	it( 'Check for the existing dark background', () => {
-		DarkBGCheck();
+	it( 'Check for the default light background', () => {
+		LightBGCheck();
 	} );
 
-	it( 'Check for the light background', () => {
-		LightBGCheck();
+	it( 'Check for the dark background', () => {
+		DarkBGCheck();
 	} );
 
 	it( 'Check the Progress Bar Value', () => {
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/4-site-logo.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/4-site-logo.cy.js
index 0d2ef5ef3..ec5a7d2d2 100644
--- a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/4-site-logo.cy.js
+++ b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/4-site-logo.cy.js
@@ -32,14 +32,14 @@ describe( 'SiteGen Site Logo Step', function () {
 		AdminBarCheck();
 	} );
 
-	it( 'Check for the existing dark background', () => {
-		DarkBGCheck();
-	} );
-
-	it( 'Check for the light background', () => {
+	it( 'Check for the default light background', () => {
 		LightBGCheck();
 	} );
 
+	it( 'Check for the dark background', () => {
+		DarkBGCheck();
+	} );
+	
 	it( 'Check the Progress Bar Value', () => {
 		ProgressBarCheck( '20%' );
 	} );
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/5-experience.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/5-experience.cy.js
index a3291ade1..7d7e5e31e 100644
--- a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/5-experience.cy.js
+++ b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/5-experience.cy.js
@@ -32,12 +32,12 @@ describe( 'SiteGen Experience & Site Building Step', function () {
 		AdminBarCheck();
 	} );
 
-	it( 'Check for the existing dark background', () => {
-		DarkBGCheck();
+	it( 'Check for the default light background', () => {
+		LightBGCheck();
 	} );
 
-	it( 'Check for the light background', () => {
-		LightBGCheck();
+	it( 'Check for the dark background', () => {
+		DarkBGCheck();
 	} );
 
 	it( 'Check the Progress Bar Value', () => {
diff --git a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/7-editor.cy.js b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/7-editor.cy.js
index 9ca12c630..b7024735b 100644
--- a/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/7-editor.cy.js
+++ b/tests/cypress/integration/5-AI-SiteGen-onboarding-flow/7-editor.cy.js
@@ -40,10 +40,9 @@ describe( 'SiteGen Site Editor Step', function () {
 	} );
 
 	it( 'Check if we cannot change to dark background', () => {
-		cy.get( '.nfd-onboarding-toggle__theme__button__light' ).should(
+		cy.get( '.nfd-onboarding-toggle__theme__button__dark' ).should(
 			'not.exist'
 		);
-		cy.get( '.nfd-onboarding-sitegen-dark' ).should( 'not.exist' );
 	} );
 
 	it( 'Check the Progress Bar Value', () => {
diff --git a/tests/cypress/integration/wp-module-support/MockApi.cy.js b/tests/cypress/integration/wp-module-support/MockApi.cy.js
index 39e908ce2..d7eb02337 100644
--- a/tests/cypress/integration/wp-module-support/MockApi.cy.js
+++ b/tests/cypress/integration/wp-module-support/MockApi.cy.js
@@ -100,6 +100,6 @@ export const migrationConnection = ( req ) => {
 		method: 'GET',
 		statusCode: 200,
 		body: migrate_connect_mock,
-		delay: 8000,
+		delay: 13000,
 	} );
 };
diff --git a/tests/cypress/integration/wp-module-support/siteGen.cy.js b/tests/cypress/integration/wp-module-support/siteGen.cy.js
index f41c9c0c8..04c26d836 100644
--- a/tests/cypress/integration/wp-module-support/siteGen.cy.js
+++ b/tests/cypress/integration/wp-module-support/siteGen.cy.js
@@ -16,11 +16,13 @@ export const DarkBGCheck = () => {
 	cy.get( '.nfd-onboarding-toggle__theme__button__light' )
 		.should( 'exist' )
 		.click();
+	cy.wait( 2000 );
 	cy.get( '.nfd-onboarding-sitegen-dark' ).should( 'be.visible' );
 	// Now changing the background back to light
 	cy.get( '.nfd-onboarding-toggle__theme__button__dark' )
 		.should( 'exist' )
 		.click();
+	cy.wait( 2000 );
 	cy.get( '.nfd-onboarding-sitegen-light' ).should( 'be.visible' );
 };