diff --git a/tests/cypress/integration/Home/commerceHomePage.cy.js b/tests/cypress/integration/Home/commerceHomePage.cy.js
index e610bd6f..5cb30bdb 100644
--- a/tests/cypress/integration/Home/commerceHomePage.cy.js
+++ b/tests/cypress/integration/Home/commerceHomePage.cy.js
@@ -1,319 +1,327 @@
-import { GetPluginId } from "../wp-module-support/pluginID.cy";
-import { comingSoon } from "../wp-module-support/utils.cy";
-import { EventsAPI, APIList } from "../wp-module-support/eventsAPIs.cy";
+import { GetPluginId } from '../wp-module-support/pluginID.cy';
+import {
+	comingSoon,
+	viewCompletedTasks,
+	viewRemainingTasks,
+} from '../wp-module-support/utils.cy';
+import { EventsAPI, APIList } from '../wp-module-support/eventsAPIs.cy';
 
 const customCommandTimeout = 60000;
 const pluginId = GetPluginId();
-const hg_region = 'br'
+const hg_region = 'br';
 
-describe("Commerce Home Page- Coming soon mode", () => {
-  before(() => {
-    cy.exec(`npx wp-env run cli wp plugin deactivate woocommerce`, {
-      failOnNonZeroExit: false,
-    });
-    cy.visit("/wp-admin/admin.php?page=" + pluginId + "#/home");
-    comingSoon(true);
-  });
+describe( 'Commerce Home Page- Coming soon mode', () => {
+	before( () => {
+		cy.exec( `npx wp-env run cli wp plugin deactivate woocommerce`, {
+			failOnNonZeroExit: false,
+		} );
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+		comingSoon( true );
+	} );
 
-  beforeEach(() => {
-    cy.visit("/wp-admin/admin.php?page=" + pluginId + "#/home");
-  });
+	beforeEach( () => {
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+	} );
 
-  it("Verify Congrats on your new site message, coming soon alert", () => {
-    cy.contains("Congrats on your new site!", {
-      timeout: customCommandTimeout,
-    }).should("exist");
-    cy.get(".nfd-alert.nfd-alert--warning", {
-      timeout: customCommandTimeout,
-    })
-      .as("comingsoonalert")
-      .should("exist");
-    cy.get("@comingsoonalert").find(".nfd-validation-icon").should("exist");
-    cy.get("@comingsoonalert")
-      .find(".nfd-validation-message")
-      .should("exist")
-      .and(
-        "have.text",
-        'Your site is currently displaying a "Coming Soon" page.'
-      );
-  });
+	it( 'Verify Congrats on your new site message, coming soon alert', () => {
+		cy.get( '.nfd-gap-4 .nfd-title.nfd-title--2', {
+			timeout: customCommandTimeout,
+		} )
+			.eq( 0 )
+			.should( 'exist' );
+		cy.get( '.nfd-alert.nfd-alert--warning', {
+			timeout: customCommandTimeout,
+		} )
+			.as( 'comingsoonalert' )
+			.should( 'exist' );
+		cy.get( '@comingsoonalert' )
+			.find( '.nfd-validation-icon' )
+			.should( 'exist' );
+		cy.get( '@comingsoonalert' )
+			.find( '.nfd-validation-message' )
+			.should( 'exist' );
+	} );
 
-  it("Verify Site Preview flex and View your site option", () => {
-    cy.get(".nfd-justify-start > .nfd-flex-col > .nfd-absolute", {
-      timeout: customCommandTimeout,
-    })
-      .as("sitePreviewFlex")
-      .should("exist");
-    cy.get("@sitePreviewFlex")
-      .trigger("mouseover")
-      .find('[data-cy="view-site"]')
-      .should("have.text", "View your site")
-      .invoke("removeAttr", "target")
-      .click();
-    cy.url().should("eq", Cypress.config().baseUrl + "/");
-    cy.go("back");
-  });
+	it( 'Verify Site Preview flex and View your site option', () => {
+		cy.get( '.nfd-justify-start > .nfd-flex-col > .nfd-absolute', {
+			timeout: customCommandTimeout,
+		} )
+			.as( 'sitePreviewFlex' )
+			.should( 'exist' );
+		cy.get( '@sitePreviewFlex' )
+			.trigger( 'mouseover' )
+			.find( '[data-cy="view-site"]' )
+			.should( 'exist' )
+			.invoke( 'removeAttr', 'target' )
+			.click();
+		cy.url().should( 'eq', Cypress.config().baseUrl + '/' );
+		cy.go( 'back' );
+	} );
 
-  it("Verify presense of Ready to go to live? canvas", () => {
-    cy.get(".nfd-px-4", { timeout: customCommandTimeout })
-      .as("readyToGoNextLevel")
-      .should("exist");
-    cy.get("@readyToGoNextLevel", { timeout: customCommandTimeout })
-      .find(".nfd-flex-1 h1")
-      .should("have.text", "Ready to go live?");
-    cy.get("@readyToGoNextLevel")
-      .find(".nfd-flex-1 span")
-      .should("exist")
-      .and(
-        "have.text",
-        "Preview your Site before setting it live to make sure everything is how you want it.\nOnce you're ready, set your site live!"
-      );
-    cy.get("@readyToGoNextLevel", { timeout: customCommandTimeout })
-      .find(".nfd-flex-none > .nfd-button--secondary")
-      .should("exist")
-      .and("have.text", "View your site");
-    cy.get("@readyToGoNextLevel")
-      .find(".nfd-flex-none .nfd-button--upsell")
-      .should("exist")
-      .and("have.text", "Launch your site");
-  });
+	it( 'Verify presense of Ready to go to live? canvas', () => {
+		cy.get( '.nfd-px-4', { timeout: customCommandTimeout } )
+			.as( 'readyToGoNextLevel' )
+			.should( 'exist' );
+		cy.get( '@readyToGoNextLevel', { timeout: customCommandTimeout } )
+			.find( '.nfd-flex-1 h1' )
+			.should( 'exist' );
+		cy.get( '@readyToGoNextLevel' )
+			.find( '.nfd-flex-1 span' )
+			.should( 'exist' );
+		cy.get( '@readyToGoNextLevel', { timeout: customCommandTimeout } )
+			.find( '.nfd-flex-none > .nfd-button--secondary' )
+			.should( 'exist' )
+			.and( 'have.text', 'View your site' );
+		cy.get( '@readyToGoNextLevel' )
+			.find( '.nfd-flex-none .nfd-button--upsell' )
+			.should( 'exist' )
+			.and( 'have.text', 'Launch your site' );
+	} );
 
-  it("Verify Visit your site and Launch your site functionality", () => {
-    cy.get(".nfd-flex-none > .nfd-button--secondary", {
-      timeout: customCommandTimeout,
-    })
-      .invoke("removeAttr", "target")
-      .click();
-    cy.url().should("eq", Cypress.config().baseUrl + "/");
-    cy.go("back");
-    cy.get(".nfd-flex-none > .nfd-button--upsell").click();
-    cy.get(".nfd-notification--success")
-      .should("exist")
-      .and("contain.text", "Your site is online now!");
-    cy.contains("Ready to go to the next level?", {
-      timeout: customCommandTimeout,
-    }).should("exist");
-  });
-});
+	it( 'Verify Visit your site and Launch your site functionality', () => {
+		cy.get( '.nfd-flex-none > .nfd-button--secondary', {
+			timeout: customCommandTimeout,
+		} )
+			.invoke( 'removeAttr', 'target' )
+			.click();
+		cy.url().should( 'eq', Cypress.config().baseUrl + '/' );
+		cy.go( 'back' );
+		cy.get( '.nfd-flex-none > .nfd-button--upsell' ).click();
+		cy.get( '.nfd-notification--success' ).should( 'exist' );
+	} );
+} );
 
-describe("Commerce Home Page- Live Mode", () => {
-  before(() => {
-    cy.exec(`npx wp-env run cli wp plugin deactivate woocommerce`, {
-      failOnNonZeroExit: false,
-    });
-    cy.visit("/wp-admin/admin.php?page=" + pluginId + "#/home");
-    comingSoon(false);
-  });
+describe( 'Commerce Home Page- Live Mode', () => {
+	before( () => {
+		cy.exec( `npx wp-env run cli wp plugin deactivate woocommerce`, {
+			failOnNonZeroExit: false,
+		} );
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+		comingSoon( false );
+	} );
 
-  beforeEach(() => {
-    cy.visit("/wp-admin/admin.php?page=" + pluginId + "#/home");
-  });
+	beforeEach( () => {
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+	} );
 
-  it("Verify presense of Ready to go to next level? canvas", () => {
-    cy.get(".nfd-flex.nfd-gap-4", { timeout: customCommandTimeout })
-      .eq(2)
-      .as("readyToGoNextLevel")
-      .should("exist");
-    cy.get("@readyToGoNextLevel", { timeout: customCommandTimeout })
-      .find("h1")
-      .should("have.text", "Ready to go to the next level?");
-    cy.get("@readyToGoNextLevel")
-      .find("div span")
-      .should("exist")
-      .and("have.text", "Your site is live to the world!");
-  });
+	it( 'Verify presense of Ready to go to next level? canvas', () => {
+		cy.get( '.nfd-flex.nfd-gap-4', { timeout: customCommandTimeout } )
+			.eq( 2 )
+			.as( 'readyToGoNextLevel' )
+			.should( 'exist' );
+		cy.get( '@readyToGoNextLevel', { timeout: customCommandTimeout } )
+			.find( 'h1' )
+			.should( 'exist' );
+		cy.get( '@readyToGoNextLevel' ).find( 'div span' ).should( 'exist' );
+	} );
 
-  it("Verify by default View Site option should be displayed", () => {
-    cy.contains(".nfd-button--primary", "View Site", {
-      timeout: customCommandTimeout,
-    })
-      .should("exist")
-      .invoke("removeAttr", "target")
-      .click();
-    cy.url().should("eq", Cypress.config().baseUrl + "/");
-  });
-});
+	it( 'Verify by default View Site option should be displayed', () => {
+		cy.contains( '.nfd-button--primary', 'View Site', {
+			timeout: customCommandTimeout,
+		} )
+			.should( 'exist' )
+			.invoke( 'removeAttr', 'target' )
+			.click();
+		cy.url().should( 'eq', Cypress.config().baseUrl + '/' );
+	} );
+} );
 
-describe("Commerce Home Page- Next Steps", () => {
-  before(() => {
-    cy.exec(`npx wp-env run cli wp plugin deactivate woocommerce`, {
-      failOnNonZeroExit: false,
-    });
+describe( 'Commerce Home Page- Next Steps', () => {
+	before( () => {
+		cy.exec( `npx wp-env run cli wp plugin deactivate woocommerce`, {
+			failOnNonZeroExit: false,
+		} );
 
-    if (pluginId == 'hostgator') {
-      cy.exec(`npx wp-env run cli wp option delete mm_brand`);
-      cy.exec(`npx wp-env run cli wp option set mm_brand ${pluginId}`);
-      cy.exec(`npx wp-env run cli wp option set hg_region ${hg_region}}`);
-    }
-  });
+		if ( pluginId == 'hostgator' ) {
+			cy.exec( `npx wp-env run cli wp option delete mm_brand` );
+			cy.exec(
+				`npx wp-env run cli wp option set mm_brand ${ pluginId }`
+			);
+			cy.exec(
+				`npx wp-env run cli wp option set hg_region ${ hg_region }}`
+			);
+		}
+	} );
 
-  beforeEach(() => {
-    cy.visit("/wp-admin/admin.php?page=" + pluginId + "#/home");
-  });
+	beforeEach( () => {
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+	} );
 
-  after(() => {
-    cy.exec(`npx wp-env run cli wp option delete nfd_module_onboarding_flow`);
-    cy.reload();
-    cy.visit(
-      "/wp-admin/index.php?page=nfd-onboarding#/wp-setup/step/get-started/experience"
-    );
-    cy.get("button.nfd-nav-card-button.nfd-card-button").should("be.disabled");
-  });
+	after( () => {
+		cy.exec(
+			`npx wp-env run cli wp option delete nfd_module_onboarding_flow`
+		);
+		cy.reload();
+		cy.visit(
+			'/wp-admin/index.php?page=nfd-onboarding#/wp-setup/step/get-started/experience'
+		);
+		cy.get( 'button.nfd-nav-card-button.nfd-card-button' ).should(
+			'be.disabled'
+		);
+	} );
 
-  it("Verify Next steps for your site when woocommerce is not active", () => {
-    const steps = [
-      "Add a new page to your site",
-      "Upload media to your site",
-      "Enable Jetpack to connect to your social media accounts",
-    ];
-    cy.get(".nfd-grid.nfd-gap-4", { timeout: customCommandTimeout })
-      .as("nextSteps")
-      .should("exist");
-    cy.get("@nextSteps")
-      .find("h1")
-      .should("have.text", "Next steps for your site");
-    cy.get("@nextSteps")
-      .find("p")
-      .should(
-        "have.text",
-        "You're just a few steps away from sharing your store with the world!"
-      );
-    cy.get("@nextSteps")
-      .find("ul li")
-      .each((item, index, list) => {
-        expect(list).to.have.length(3);
+	it( 'Verify Next steps for your site when woocommerce is not active', () => {
+		const steps = [
+			'Add a new page to your site',
+			'Upload media to your site',
+			'Enable Jetpack to connect to your social media accounts',
+		];
+		cy.get( '.nfd-grid.nfd-gap-4', { timeout: customCommandTimeout } )
+			.as( 'nextSteps' )
+			.should( 'exist' );
+		cy.get( '@nextSteps' ).find( 'h1' ).should( 'exist' );
+		cy.get( '@nextSteps' ).find( 'p' ).should( 'exist' );
+		cy.get( '@nextSteps' )
+			.find( 'ul li' )
+			.each( ( item, index, list ) => {
+				expect( list ).to.have.length( 3 );
 
-        expect(Cypress.$(item).text()).to.eq(steps[index]);
-      });
-  });
+				expect( Cypress.$( item ).text() ).to.eq( steps[ index ] );
+			} );
+	} );
 
-  it("Verify Next steps when experience level is novice", () => {
-    const other_steps = [
-      "Sign up for Yoast SEO Academy",
-      "Add a new page to your site",
-      "Upload media to your site",
-      "Enable Jetpack to connect to your social media accounts",
-    ];
+	it( 'Verify Next steps when experience level is novice', () => {
+		const other_steps = [
+			'Sign up for Yoast SEO Academy',
+			'Add a new page to your site',
+			'Upload media to your site',
+			'Enable Jetpack to connect to your social media accounts',
+		];
 
-    const steps = ["Sign up for Bluehost WordPress Academy", ...other_steps];
+		const steps = [
+			'Sign up for Bluehost WordPress Academy',
+			...other_steps,
+		];
 
-    cy.visit(
-      "/wp-admin/index.php?page=nfd-onboarding#/wp-setup/step/get-started/experience"
-    );
-    cy.get("#inspector-radio-control-0-0", {
-      timeout: customCommandTimeout,
-    }).click({ force: true });
-    cy.get(".navigation-buttons_next").click({ force: true });
-    cy.visit("/wp-admin/admin.php?page=" + pluginId + "#/home");
-    cy.exec(`npx wp-env run cli wp plugin deactivate woocommerce`, {
-      failOnNonZeroExit: false,
-    });
-    cy.wait(2000);
-    cy.get(".nfd-grid.nfd-gap-4", { timeout: customCommandTimeout })
-      .as("nextSteps")
-      .should("exist")
-      .scrollIntoView();
+		cy.visit(
+			'/wp-admin/index.php?page=nfd-onboarding#/wp-setup/step/get-started/experience'
+		);
+		cy.get( '#inspector-radio-control-0-0', {
+			timeout: customCommandTimeout,
+		} ).click( { force: true } );
+		cy.get( '.navigation-buttons_next' ).click( { force: true } );
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+		cy.exec( `npx wp-env run cli wp plugin deactivate woocommerce`, {
+			failOnNonZeroExit: false,
+		} );
+		cy.wait( 2000 );
+		cy.get( '.nfd-grid.nfd-gap-4', { timeout: customCommandTimeout } )
+			.as( 'nextSteps' )
+			.should( 'exist' )
+			.scrollIntoView();
 
-    cy.get("@nextSteps")
-      .find("ul li")
-      .each((item, index, list) => {
-        if (pluginId == "bluehost") {
-          expect(list).to.have.length(5);
-          expect(Cypress.$(item).text()).to.eq(steps[index]);
-        } else {
-          expect(list).to.have.length(4);
-          expect(Cypress.$(item).text()).to.eq(other_steps[index]);
-        }
-      });
-  });
+		cy.get( '@nextSteps' )
+			.find( 'ul li' )
+			.each( ( item, index, list ) => {
+				if ( pluginId == 'bluehost' ) {
+					expect( list ).to.have.length( 5 );
+					expect( Cypress.$( item ).text() ).to.eq( steps[ index ] );
+				} else {
+					expect( list ).to.have.length( 4 );
+					expect( Cypress.$( item ).text() ).to.eq(
+						other_steps[ index ]
+					);
+				}
+			} );
+	} );
 
-  it("Verify Signup for Bluehost WordPress Academy step", () => {
-    if (pluginId == "bluehost") {
-      cy.intercept(APIList.bh_academy).as("events");
-      cy.contains(
-        ".nfd-grid.nfd-gap-4 ul li a",
-        "Sign up for Bluehost WordPress Academy",
-        { timeout: customCommandTimeout }
-      )
-        .as("nextSteps")
-        .should("exist")
-        .scrollIntoView()
-        .invoke("removeAttr", "target")
-        .click();
-      cy.url().should(
-        "equal",
-        "https://academy.bluehost.com/?utm_source=wp-home&utm_medium=bluehost_plugin"
-      );
-      cy.go("back");
-      EventsAPI(APIList.bh_academy, pluginId);
+	it( 'Verify Signup for Bluehost WordPress Academy step', () => {
+		if ( pluginId == 'bluehost' ) {
+			cy.intercept( APIList.bh_academy ).as( 'events' );
+			cy.contains(
+				'.nfd-grid.nfd-gap-4 ul li a',
+				'Sign up for Bluehost WordPress Academy',
+				{ timeout: customCommandTimeout }
+			)
+				.as( 'nextSteps' )
+				.should( 'exist' )
+				.scrollIntoView()
+				.invoke( 'removeAttr', 'target' )
+				.click();
+			cy.url().should(
+				'equal',
+				'https://academy.bluehost.com/?utm_source=wp-home&utm_medium=bluehost_plugin'
+			);
+			cy.go( 'back' );
+			EventsAPI( APIList.bh_academy, pluginId );
 
-      cy.get("@nextSteps").should("not.exist");
-      cy.contains(".nfd-link", "View completed tasks", {
-        timeout: customCommandTimeout,
-      }).click();
-      cy.get("@nextSteps").should("exist");
-      cy.contains(".nfd-link", "View remaining tasks").click();
-    }
-  });
+			cy.get( '@nextSteps' ).should( 'not.exist' );
+			viewCompletedTasks();
+			cy.get( '@nextSteps' ).should( 'exist' );
+			viewRemainingTasks();
+		}
+	} );
 
-  it("Verify Signup for Wordpress SEO Academy step", () => {
-    cy.intercept(APIList.yoast_seo_academy).as("events");
-    cy.contains(
-      ".nfd-grid.nfd-gap-4 ul li a",
-      "Sign up for Yoast SEO Academy",
-      { timeout: customCommandTimeout }
-    )
-      .as("nextSteps")
-      .should("exist")
-      .scrollIntoView()
-      .invoke("removeAttr", "target")
-      .click();
-    if (pluginId == 'crazy-domains') {
-      cy.url().should(
-        "equal",
-        `https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/?utm_medium=crazydomains_plugin&utm_source=wp-home`
-      );
-    } else {
-      cy.url().should(
-        "equal",
-        `https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/?utm_medium=${pluginId}_plugin&utm_source=wp-home`
-      );
-    }
-    cy.go("back");
-    EventsAPI(APIList.yoast_seo_academy, pluginId);
+	it( 'Verify Signup for Wordpress SEO Academy step', () => {
+		cy.intercept( APIList.yoast_seo_academy ).as( 'events' );
+		cy.contains(
+			'.nfd-grid.nfd-gap-4 ul li a',
+			'Sign up for Yoast SEO Academy',
+			{ timeout: customCommandTimeout }
+		)
+			.as( 'nextSteps' )
+			.should( 'exist' )
+			.scrollIntoView()
+			.invoke( 'removeAttr', 'target' )
+			.click();
+		if ( pluginId == 'crazy-domains' ) {
+			cy.url().should(
+				'equal',
+				`https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/?utm_medium=crazydomains_plugin&utm_source=wp-home`
+			);
+		} else {
+			cy.url().should(
+				'equal',
+				`https://my.yoast.com/signup?redirect_to=https://academy.yoast.com/courses/?utm_medium=${ pluginId }_plugin&utm_source=wp-home`
+			);
+		}
+		cy.go( 'back' );
+		EventsAPI( APIList.yoast_seo_academy, pluginId );
 
-    cy.get("@nextSteps").should("not.exist");
-    cy.contains(".nfd-link", "View completed tasks", {
-      timeout: customCommandTimeout,
-    }).click();
-    cy.get("@nextSteps").should("exist");
-    cy.contains(".nfd-link", "View remaining tasks").click();
-  });
+		cy.get( '@nextSteps' ).should( 'not.exist' );
+		viewCompletedTasks();
+		cy.get('@nextSteps').should('exist');
+		viewRemainingTasks();
+	} );
 
-  it("Verify Add a new page to your site step", () => {
-    cy.get(".nfd-grid.nfd-gap-4 ul li", {
-      timeout: customCommandTimeout,
-    });
-    cy.contains(".nfd-grid.nfd-gap-4 ul li a", "Add a new page to your site", {
-      timeout: customCommandTimeout,
-    })
-      .as("addPage")
-      .scrollIntoView()
-      .click();
-    cy.url().should(
-      "eq",
-      Cypress.config().baseUrl +
-        "/wp-admin/post-new.php?post_type=page&return_to_nfd=%2Fhome"
-    );
-    cy.go("back");
-    cy.wait(2000);
-    cy.get("@addPage").should("not.exist");
-  });
+	it( 'Verify Add a new page to your site step', () => {
+		cy.get( '.nfd-grid.nfd-gap-4 ul li', {
+			timeout: customCommandTimeout,
+		} );
+		cy.contains(
+			'.nfd-grid.nfd-gap-4 ul li a',
+			'Add a new page to your site',
+			{
+				timeout: customCommandTimeout,
+			}
+		)
+			.as( 'addPage' )
+			.scrollIntoView()
+			.click();
+		cy.url().should(
+			'eq',
+			Cypress.config().baseUrl +
+				'/wp-admin/post-new.php?post_type=page&return_to_nfd=%2Fhome'
+		);
+		cy.go( 'back' );
+		cy.wait( 2000 );
+		cy.get( '@addPage' ).should( 'not.exist' );
+		viewCompletedTasks();
+    	cy.get( '@addPage' ).should( 'exist' );
+    	viewRemainingTasks();
+	} );
 
-  it("Verify Option Upload Media to your site", () => {
-    cy.contains("Upload media to your site", {timeout: customCommandTimeout}).as("uploadMedia").should("exist");
-    cy.get("@uploadMedia").click();
-    cy.url().should("eq", Cypress.config().baseUrl + "/wp-admin/media-new.php");
-    cy.go("back");
-  });
-});
+	it( 'Verify Option Upload Media to your site', () => {
+		cy.contains( 'Upload media to your site', {
+			timeout: customCommandTimeout,
+		} )
+			.as( 'uploadMedia' )
+			.should( 'exist' );
+		cy.get( '@uploadMedia' ).click();
+		cy.url().should(
+			'eq',
+			Cypress.config().baseUrl + '/wp-admin/media-new.php'
+		);
+		cy.go( 'back' );
+	} );
+} );
diff --git a/tests/cypress/integration/Store/storePage.cy.js b/tests/cypress/integration/Store/storePage.cy.js
index 99e6473b..264b3693 100644
--- a/tests/cypress/integration/Store/storePage.cy.js
+++ b/tests/cypress/integration/Store/storePage.cy.js
@@ -6,76 +6,54 @@ const appId = getAppId();
 const customCommandTimeout = 30000;
 
 describe( 'Store Page- WooCommerce is deactivated/uninstalled', () => {
-	before(() => {
+	before( () => {
 		cy.exec( `npx wp-env run cli wp plugin deactivate woocommerce`, {
 			failOnNonZeroExit: false,
-        });
-        cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
-        comingSoon(false)
+		} );
+		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/home' );
+		comingSoon( false );
 	} );
 
-	beforeEach(() => {
+	beforeEach( () => {
 		cy.visit( '/wp-admin/admin.php?page=' + pluginId + '#/store' );
 	} );
 
 	it( 'Verify that Payments tab is not displayed', () => {
-		const subNavTexts = ['Products & Services', 'Store Details'];
-		const subNavTextsOther = [ 'Products', 'Store Details' ];
-	
-		cy.reload()
-		cy.contains( '.nfd-mb-0', 'Store' , { timeout: customCommandTimeout })
-			.find( `.${ appId }-app-subnavitem` )
+		cy.reload();
+		cy.get( `.${ appId }-app-navitem-Store`, {
+			timeout: customCommandTimeout,
+		} )
+			.next()
+			.find( '.nfd-m-0' )
 			.each( ( item, index, list ) => {
-				expect(list).to.have.length(2);
-				if (pluginId !== 'bluehost') {
-					expect(Cypress.$(item).text()).to.eq(
-						subNavTextsOther[index]
-					);
-				} else {
-					expect(Cypress.$(item).text()).to.eq(
-						subNavTexts[index]
-					);
-				}
+				expect( list ).to.have.length( 2 );
 			} );
+		cy.get( `.${ appId }-app-subnavitem-Products` ).should( 'exist' );
+		cy.get( `.${ appId }-app-subnavitem-Store` ).should( 'exist' );
+		cy.get( `.${ appId }-app-subnavitem-Payments` ).should( 'not.exist' );
 	} );
 
 	it( 'Verify Store page title and sub titles', () => {
-		cy.get( '.nfd-app-section-header h2' )
-			.should( 'exist' )
-			.and( 'have.text', 'Store' );
-		cy.contains( '.nfd-app-section-content', 'Add a store to your site' )
+		cy.get( '.nfd-app-section-header h2' ).should( 'exist' );
+		cy.get( '.nfd-app-section-header' )
+			.next()
 			.as( 'storeFlex' )
 			.should( 'exist' );
-		cy.get( '@storeFlex' )
-			.find( 'span' )
-			.should(
-				'have.text',
-				'Adding a store to your website is quick and easy!\nJust install WooCommerce and get ready to start making money!'
-			);
+		cy.get( '@storeFlex' ).find( 'span' ).should( 'exist' );
 	} );
 
 	it( 'Verify Store and its sub tabs should have Install WooCommerce buttons', () => {
-		const buttonTexts = [
-			'Install WooCommerce',
-			'Install WooCommerce to unlock',
+		const storeNavElements = [
+			`.${ appId }-app-navitem-Store`,
+			`.${ appId }-app-subnavitem-Products`,
+			`.${ appId }-app-subnavitem-Store`,
 		];
 
-		cy.get( '.nfd-app-section-container .nfd-button--upsell' )
-			.as( 'upsellButtons' )
-			.each( ( item, index, list ) => {
-				expect( Cypress.$( item ).text() ).to.eq(
-					buttonTexts[ index ]
-				);
-			} );
-
-		cy.get( `.${ appId }-app-subnavitem-Products` ).click();
-		cy.get( '@upsellButtons' ).each( ( item, index ) => {
-			expect( Cypress.$( item ).text() ).to.eq( buttonTexts[ index ] );
-		} );
-
-		cy.get( `.${ appId }-app-subnavitem-Store ` ).click();
-		cy.get( '@upsellButtons' ).each( ( item, index ) => {
-			expect( Cypress.$( item ).text() ).to.eq( buttonTexts[ index ] );
+		storeNavElements.forEach( ( ele ) => {
+			cy.get( ele, { timeout: customCommandTimeout } ).click();
+			cy.get( '.nfd-button--upsell', {
+				timeout: customCommandTimeout,
+			} ).should( 'exist' );
 		} );
 	} );
 } );
diff --git a/tests/cypress/integration/wp-module-support/utils.cy.js b/tests/cypress/integration/wp-module-support/utils.cy.js
index eb617d42..2d5acad6 100644
--- a/tests/cypress/integration/wp-module-support/utils.cy.js
+++ b/tests/cypress/integration/wp-module-support/utils.cy.js
@@ -50,3 +50,19 @@ export const installWoo = () => {
 	} ).should( 'exist' );
 	cy.get( '.nfd-w-0  p' ).should( 'exist' );
 };
+
+export const viewCompletedTasks = () => {
+	cy.get( '.nfd-card.nfd-p-0', {
+		timeout: customCommandTimeout,
+	} )
+		.next()
+		.click();
+};
+
+export const viewRemainingTasks = () => {
+	cy.get( '.nfd-card.nfd-p-0', {
+		timeout: customCommandTimeout,
+	} )
+		.next()
+		.click();
+};