diff --git a/src/app/components/app-nav/index.js b/src/app/components/app-nav/index.js
index 4461f019..830d41c8 100644
--- a/src/app/components/app-nav/index.js
+++ b/src/app/components/app-nav/index.js
@@ -195,6 +195,7 @@ export const MobileNav = () => {
 					<Logo />
 				</div>
 				<button
+					id="nfd-app-mobile-nav"
 					role="button"
 					className="nfd-h-16 nfd-px-4 nfd-text-body nfd-flex nfd-items-center focus:nfd-outline-none focus:nfd-ring-2 focus:nfd-ring-inset focus:nfd-ring-primary"
 					onClick={ () => {
diff --git a/tests/cypress/integration/help.cy.js b/tests/cypress/integration/help.cy.js
index dc3c56b0..f6e8b161 100644
--- a/tests/cypress/integration/help.cy.js
+++ b/tests/cypress/integration/help.cy.js
@@ -2,9 +2,10 @@
 const pluginNotificationsFixture = require( '../fixtures/plugin-notifications.json' );
 const pluginProductsFixture = require( '../fixtures/plugin-products.json' );
 
-describe('Help Page', function () {
+describe('Help Page', { testIsolation: true }, () => {
 
-	before(() => {
+	beforeEach(() => {
+		cy.wpLogin();
         cy.setRegion();
         cy.setBrand();
         cy.setLanguage();
@@ -17,6 +18,7 @@ describe('Help Page', function () {
 			},
 			pluginProductsFixture
 		).as( 'pluginProductsFixture' );
+
 		cy.intercept(
 			{
 				method: 'GET',
@@ -24,6 +26,7 @@ describe('Help Page', function () {
 			},
 			pluginNotificationsFixture
 		).as( 'pluginNotificationsFixture' );
+
 		cy.visit(
 			'/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) + '#/help',
 			{
@@ -35,7 +38,6 @@ describe('Help Page', function () {
 				}
 			}
 		);
-		cy.injectAxe();
 
 	});
 	
@@ -45,37 +47,27 @@ describe('Help Page', function () {
 		cy.a11y('.hgwp-app-body');
 	});
 
-	it('Phone Card Exists', () => {
+	it('Cards Each Exist', () => {
 		cy.get('.card-help-phone').contains('h3', 'Phone')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('Chat Card Exists', () => {
 		cy.get('.card-help-chat').contains('h3', 'Chat')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('Tweet Card Exists', () => {
 		cy.get('.card-help-twitter').contains('h3', 'Tweet')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('KB Card Exists', () => {
 		cy.get('.card-help-kb').contains('h3', 'Knowledge Base')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('Blog Card Exists', () => {
 		cy.get('.card-help-blog').contains('h3', 'Blog')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('Youtube Card Exists', () => {
 		cy.get('.card-help-video').contains('h3', 'Video')
 			.scrollIntoView()
 			.should('be.visible');
diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js
index 1bb7ba66..ba717412 100644
--- a/tests/cypress/integration/home.cy.js
+++ b/tests/cypress/integration/home.cy.js
@@ -1,53 +1,51 @@
 // <reference types="Cypress" />
 
-describe('Home Page', function () {
-	const appId = Cypress.env( 'appId' );
-	const pluginId = Cypress.env( 'pluginId' );
+describe('Home Page', { testIsolation: true }, () => {
+	const appClass = '.' + Cypress.env( 'appId' );
 
-	before(() => {
-		cy.visit('/wp-admin/admin.php?page=' + pluginId + '#/home');
-		cy.injectAxe();
+	beforeEach( () => {
+		cy.wpLogin();
+		cy.visit( `/wp-admin/admin.php?page=${ Cypress.env( 'pluginId' ) }#/home` );
+		
 	});
 
 	it('Site Info Exists', () => {
 		cy.window().then((win) => {
 			const siteTitle = win.NewfoldRuntime.siteTitle;
-
-			cy.get('.' + appId + '-app-site-info').contains('h3', siteTitle)
+			cy.get( appClass + '-app-site-info').contains('h3', siteTitle)
 			.scrollIntoView()
 			.should('be.visible');
 		  })
 	});
 
 	it('Is Accessible', () => {
+		cy.injectAxe();
 		cy.wait(500);
-		cy.checkA11y('.' + appId + '-app-body');
+		cy.checkA11y( appClass + '-app-body');
 	});
 
-	it('Maintenance Mode Section Exists', () => {
+	it('Each Section Exists', () => {
+		// Maintenance Mode
 		cy
-			.get('.' + appId + '-app-home-coming-soon').contains('h3', 'Site Status')
+			.get( appClass + '-app-home-coming-soon').contains('h3', 'Site Status')
 			.scrollIntoView()
 			.should('be.visible');
-	});
-
-	it('Website Content Section Exists', () => {
+		
+		// Website Content
 		cy
-			.get('.' + appId + '-app-home-content').contains('h3', 'Website Content')
+			.get( appClass + '-app-home-content').contains('h3', 'Website Content')
 			.scrollIntoView()
 			.should('be.visible');
-	});
-
-	it('Settings and Performance Section Exists', () => {
+		
+		// Settings and Performance Section Exists
 		cy
-			.get('.' + appId + '-app-home-settings').contains('h3', 'Settings and Performance')
+			.get( appClass + '-app-home-settings').contains('h3', 'Settings and Performance')
 			.scrollIntoView()
 			.should('be.visible');
-	});
-
-	it('Web Hosting Section Exists', () => {
+		
+		// Web Hosting Section Exists
 		cy
-			.get('.' + appId + '-app-home-hosting').contains('h3', 'Web Hosting')
+			.get( appClass + '-app-home-hosting').contains('h3', 'Web Hosting')
 			.scrollIntoView()
 			.should('be.visible');
 	});
diff --git a/tests/cypress/integration/navigation.cy.js b/tests/cypress/integration/navigation.cy.js
index 4fd1ad67..bb71697e 100644
--- a/tests/cypress/integration/navigation.cy.js
+++ b/tests/cypress/integration/navigation.cy.js
@@ -1,159 +1,113 @@
 // <reference types="Cypress" />
 
-describe('Navigation', function () {
-	const appId = Cypress.env( 'appId' );
-	const pluginId = Cypress.env( 'pluginId' )
+describe('Navigation', { testIsolation: true }, () => {
+	const appClass = '.' + Cypress.env( 'appId' );
 
-	before(() => {
+	beforeEach(() => {
+		cy.wpLogin();
 		cy.exec( 'npx wp-env run cli wp transient delete newfold_marketplace' );
-		cy.visit('/wp-admin/admin.php?page=' + pluginId );
+		cy.visit( `/wp-admin/admin.php?page=${ Cypress.env( 'pluginId' ) }` );
 	});
 
 	it( "Admin submenu shouldn't exist inside app", () => {
-		cy.get( '#adminmenu #toplevel_page_' + pluginId + ' ul.wp-submenu' ).should(
+		cy.get( `#adminmenu #toplevel_page_${ Cypress.env( 'pluginId' ) } ul.wp-submenu` ).should(
 			'not.exist'
 		);
 	} );
 
 	it('Logo Links to home', () => {
-		cy.get('.' + appId + '-logo-wrap').click();
+		cy.get( appClass + '-logo-wrap').click();
 		cy.wait(500);
 		cy.hash().should('eq', '#/home');
 	});
 
-	// test main nav
 	it('Main nav links properly navigates', () => {
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace').
+			.get( appClass + '-app-navitem-Marketplace').
 			should('not.have.class', 'active');
-		cy.get('.' + appId + '-app-navitem-Marketplace').click();
+		cy.get( appClass + '-app-navitem-Marketplace').click();
 		cy.wait(500);
 		cy.hash().should('eq', '#/marketplace');
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace')
+			.get( appClass + '-app-navitem-Marketplace')
 			.should('have.class', 'active');
 
-		cy.get('.' + appId + '-app-navitem-Performance').click();
+		cy.get( appClass + '-app-navitem-Performance').click();
 		cy.wait(500);
 		cy.hash().should('eq', '#/performance');
 		cy
-			.get('.' + appId + '-app-navitem-Performance')
+			.get( appClass + '-app-navitem-Performance')
 			.should('have.class', 'active');
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace')
+			.get( appClass + '-app-navitem-Marketplace')
 			.should('not.have.class', 'active');
 
-		cy.get('.' + appId + '-app-navitem-Settings').click();
+		cy.get( appClass + '-app-navitem-Settings').click();
 		cy.wait(500);
 		cy.hash().should('eq', '#/settings');
 	});
 	
 	it('Subnav links properly navigates', () => {
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace')
+			.get( appClass + '-app-navitem-Marketplace')
 			.scrollIntoView()
 			.should('not.have.class', 'active');
-		cy.get('.' + appId + '-app-navitem-Marketplace').click();
+		cy.get( appClass + '-app-navitem-Marketplace').click();
 
 		cy.wait(500);
 		cy.hash().should('eq', '#/marketplace');
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace')
+			.get( appClass + '-app-navitem-Marketplace')
 			.should('have.class', 'active');
 
-			cy.get('.' + appId + '-app-subnavitem-Services').click();
+			cy.get( appClass + '-app-subnavitem-Services').click();
 			cy.wait(500);
 			cy.hash().should('eq', '#/marketplace/services');
 			cy
-				.get('.' + appId + '-app-subnavitem-Services')
+				.get( appClass + '-app-subnavitem-Services')
 				.should('have.class', 'active');
 			cy
-				.get('.' + appId + '-app-navitem-Marketplace')
+				.get( appClass + '-app-navitem-Marketplace')
 				.should('have.class', 'active');
 		
 
-		cy.get('.' + appId + '-app-subnavitem-SEO').click();
+		cy.get( appClass + '-app-subnavitem-SEO').click();
 		cy.wait(500);
 		cy.hash().should('eq', '#/marketplace/seo');
 		cy
-			.get('.' + appId + '-app-subnavitem-SEO')
+			.get( appClass + '-app-subnavitem-SEO')
 			.should('have.class', 'active');
 		cy
-			.get('.' + appId + '-app-subnavitem-Services')
+			.get( appClass + '-app-subnavitem-Services')
 			.should('not.have.class', 'active');
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace')
+			.get( appClass + '-app-navitem-Marketplace')
 			.should('have.class', 'active');
 			
-		cy.get('.' + appId + '-app-navitem-Performance').click();
+		cy.get( appClass + '-app-navitem-Performance').click();
 			cy.wait(500);
 		cy
-			.get('.' + appId + '-app-subnavitem-Services')
+			.get( appClass + '-app-subnavitem-Services')
 			.should('not.have.class', 'active');
 		cy
-			.get('.' + appId + '-app-subnavitem-SEO')
+			.get( appClass + '-app-subnavitem-SEO')
 			.should('not.have.class', 'active');
 		cy
-			.get('.' + appId + '-app-navitem-Marketplace')
+			.get( appClass + '-app-navitem-Marketplace')
 			.should('not.have.class', 'active');
 	});
 
-	// utility nav is no more, leaving this in place in case we bring it back anytime soon.
-	it.skip('Utility nav links properly navigates', () => {
-		cy
-			.get('.utility-link-Performance')
-			.should('not.have.class', 'active');
-		cy
-			.get('.utility-link-Performance').click();
-		cy.wait(500);
-		cy.hash().should('eq', '#/performance');
-		cy
-			.get('.utility-link-Performance')
-			.should('have.class', 'active');
-
-		cy
-			.get('.utility-link-Settings').click();
-		cy.wait(500);
-		cy.hash().should('eq', '#/settings');
-		cy
-			.get('.utility-link-Settings')
-			.should('have.class', 'active');
-		cy
-			.get('.utility-link-Performance')
-			.should('not.have.class', 'active');
-
-		cy
-			.get('.utility-link-Help').click();
-		cy.wait(500);
-		cy.hash().should('eq', '#/help');
-		cy
-			.get('.utility-link-Help')
-			.should('have.class', 'active');
-		cy
-			.get('.utility-link-Settings')
-			.should('not.have.class', 'active');
-	});
+	it( 'Mobile nav links dispaly and link properly on mobile', () => {
+		cy.viewport( 'iphone-x' );
+		cy.get( '#nfd-app-mobile-nav' ).should( 'be.visible' );
 
-	// no mobile nav, but should probably add
-	it.skip('Mobile nav links dispaly for mobile', () => {
-		cy
-			.get('.mobile-toggle')
-			.should('not.exist');
+		cy.get( appClass + '-app-navitem-Home' ).should( 'not.exist' );
 
-		cy.viewport('iphone-x');
-		cy
-			.get('.mobile-toggle')
-			.should('be.visible');
-	});
-
-	it.skip('Mobile nav links properly navigates', () => {
-		cy.get('.mobile-link-Home').should('not.exist');
-		cy.viewport('iphone-x');
-		cy.get('.mobile-toggle').click();
-		cy.wait(500);
-		cy.get('.mobile-link-Home').should('be.visible');
-		cy.get('button[aria-label="Close"]').should('be.visible')
-		cy.get('button[aria-label="Close"]').click();
-		cy.get('.mobile-link-Home').should('not.exist');
+		cy.get( '#nfd-app-mobile-nav' ).click();
+		cy.wait( 500 );
+		cy.get( appClass + '-app-navitem-Home' ).should( 'be.visible' );
+		cy.get( 'button.nfd-modal__close-button' ).should( 'be.visible' );
+		cy.get( 'button.nfd-modal__close-button' ).click();
+		cy.get( appClass + '-app-navitem-Home' ).should( 'not.exist' );
 	});
 });
diff --git a/tests/cypress/integration/pages-and-posts.cy.js b/tests/cypress/integration/pages-and-posts.cy.js
index 41bb290c..a4914ede 100644
--- a/tests/cypress/integration/pages-and-posts.cy.js
+++ b/tests/cypress/integration/pages-and-posts.cy.js
@@ -1,11 +1,10 @@
-describe( 'Pages & Posts', function () {
+describe( 'Pages & Posts', { testIsolation: true }, () => {
 	let NewfoldRuntime;
 
-	before( () => {
+	beforeEach( () => {
+		cy.wpLogin();
 		cy.visit(
-			'/wp-admin/admin.php?page=' +
-			Cypress.env( 'pluginId' ) +
-			'#/pages-and-posts'
+			`/wp-admin/admin.php?page=${ Cypress.env( 'pluginId' ) }#/pages-and-posts`
 		);
 		cy.window()
 			.its( 'NewfoldRuntime' )
diff --git a/tests/cypress/integration/region-help.cy.js b/tests/cypress/integration/region-help.cy.js
index 8da0a6db..a121b407 100644
--- a/tests/cypress/integration/region-help.cy.js
+++ b/tests/cypress/integration/region-help.cy.js
@@ -2,13 +2,15 @@
 const pluginNotificationsFixture = require( '../fixtures/plugin-notifications.json' );
 const pluginProductsFixture = require( '../fixtures/plugin-products.json' );
 
-describe('Language updates on Help Page', function () {
+describe('Language updates on Help Page', { testIsolation: true }, () => {
 
-	before(() => {
+	beforeEach(() => {
+		cy.wpLogin();
 		cy.setBrand('hostgator-latam');
         cy.setRegion('br');
         cy.setLanguage('pt_BR');
 		cy.reload();
+
 		cy.intercept(
 			{
 				method: 'GET',
@@ -35,30 +37,24 @@ describe('Language updates on Help Page', function () {
 				}
 			}
 		);
-		cy.injectAxe();
 
 	});
 
 	it('Region Change Updates Content', () => {
-		
-
 		cy.get('.card-help-phone').should('not.exist');
 		cy.get('.card-help-twitter').should('not.exist');
-	});
-
-	it('Chat Card Exists', () => {
+	
+		// Chat Card Exists
 		cy.get('.card-help-chat')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('KB Card Exists', () => {
+		//KB Card Exists
 		cy.get('.card-help-kb')
 			.scrollIntoView()
 			.should('be.visible');
-	});
 
-	it('Blog Card Exists', () => {
+		//Blog Card Exists
 		cy.get('.card-help-blog')
 			.scrollIntoView()
 			.should('be.visible');
@@ -70,7 +66,7 @@ describe('Language updates on Help Page', function () {
         cy.setLanguage();
         cy.reload();
 
-		// check that page reloaded
+		// confirm the page reloaded
 		cy.get('.card-help-blog')
 			.scrollIntoView()
 			.should('be.visible');
diff --git a/tests/cypress/integration/region.cy.js b/tests/cypress/integration/region.cy.js
index 32f03855..df2f36c3 100644
--- a/tests/cypress/integration/region.cy.js
+++ b/tests/cypress/integration/region.cy.js
@@ -1,8 +1,9 @@
 // <reference types="Cypress" />
 
-describe('Regional Adjustments', function () {
+describe('Regional Adjustments', { testIsolation: true }, () => {
 
-    before(() => {
+    beforeEach(() => {
+        cy.wpLogin();
         // Set up options
         cy.setRegion('BR');
         cy.setBrand('hostgator-latam');
diff --git a/tests/cypress/integration/settings.cy.js b/tests/cypress/integration/settings.cy.js
index b767a0a1..4ceb9dec 100644
--- a/tests/cypress/integration/settings.cy.js
+++ b/tests/cypress/integration/settings.cy.js
@@ -1,56 +1,56 @@
 // <reference types="Cypress" />
 
-describe('Settings Page', function () {
-	const appId = Cypress.env( 'appId' );
+describe('Settings Page', { testIsolation: true }, () => {
+	const appClass = '.' + Cypress.env( 'appId' );
 	const pluginId = Cypress.env( 'pluginId' );
 
-	before(() => {
-		cy.visit('/wp-admin/admin.php?page=' + pluginId + '#/settings');
-		
+	beforeEach( () => {
+		cy.wpLogin();
+		cy.visit( `/wp-admin/admin.php?page=${ Cypress.env( 'pluginId' ) }#/settings` );
 	});
 
 	it('Is Accessible', () => {
 		cy.injectAxe();
 		cy.wait(500);
-		cy.checkA11y('.' + appId + '-app-body');
+		cy.checkA11y( appClass + '-app-body');
 	});
 
-	it('Has Coming Soon', () => {
+	it('Has All Settings Sections', () => {
 		cy
-			.get('.' + appId + '-app-settings-coming-soon')
+			.get( appClass + '-app-settings-coming-soon')
 			.scrollIntoView()
 			.should('be.visible');
-	});
-
-	it('Has Auto Updates Settings', () => {
+	
+		// Has Auto Updates Settings
 		cy
-			.get('.' + appId + '-app-settings-update')
+			.get( appClass + '-app-settings-update')
 			.scrollIntoView()
 			.should('be.visible');
-	});
-
-	it('Has Content Settings', () => {
+	
+		// Has Content Settings
 		cy
-			.get('.' + appId + '-app-settings-content')
+			.get( appClass + '-app-settings-content')
 			.scrollIntoView()
 			.should('be.visible');
-	});
-
-	it('Has Comments Settings', () => {
+	
+		// Has Comments Settings
 		cy
-			.get('.' + appId + '-app-settings-comments')
+			.get( appClass + '-app-settings-comments')
 			.scrollIntoView()
 			.should('be.visible');
 	});
 
-	it('On load update all is checked, which forces other updates to check and disabled state', () => {
+	it('Autoupdate Toggles function properly', () => {
+		cy
+			.get( appClass + '-app-settings-update')
+			.scrollIntoView()
+		// On load update all is checked, which forces other updates to check and disabled state
 		cy.get('[data-id="autoupdate-all-toggle"]').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-core-toggle"]').should('be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-plugins-toggle"]').should('be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-themes-toggle"]').should('be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
-	});
-
-	it('Disable ALL toggle, leaves everything checked, but enables them', () => {
+		
+		// Disable ALL toggle, leaves everything checked, but enables them
 		cy.get('[data-id="autoupdate-all-toggle"]').click();
 		cy.wait(100);
         cy.get('.nfd-notifications')
@@ -60,9 +60,8 @@ describe('Settings Page', function () {
 		cy.get('[data-id="autoupdate-core-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-plugins-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-themes-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
-	});
-
-	it('Core toggle works', () => {
+	
+		// Core toggle works
 		cy.get('[data-id="autoupdate-core-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-core-toggle"]').click();
 		cy.wait(100);
@@ -71,9 +70,8 @@ describe('Settings Page', function () {
 			.contains('p', 'Disabled Core auto-updates')
 			.should('be.visible');
 		cy.get('[data-id="autoupdate-all-toggle"]').should('have.attr', 'aria-checked').and('include', 'false');
-	});
-
-	it('Plugins toggle works', () => {
+	
+		// Plugins toggle works
 		cy.get('[data-id="autoupdate-plugins-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-plugins-toggle"]').click();
 		cy.wait(100);
@@ -82,9 +80,8 @@ describe('Settings Page', function () {
 			.contains('p', 'Disabled Plugins auto-update')
 			.should('be.visible');
 		cy.get('[data-id="autoupdate-all-toggle"]').should('have.attr', 'aria-checked').and('include', 'false');
-	});
-
-	it('Themes toggle works', () => {
+	
+		// Themes toggle works
 		cy.get('[data-id="autoupdate-themes-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-themes-toggle"]').click();
 		cy.wait(100);
@@ -93,18 +90,16 @@ describe('Settings Page', function () {
 			.contains('p', 'Disabled Themes auto-update')
 			.should('be.visible');
 		cy.get('[data-id="autoupdate-all-toggle"]').should('have.attr', 'aria-checked').and('include', 'false');
-	});
-
-	it('All toggle activates all', () => {
+	
+		// All toggle activates all
 		cy.get('[data-id="autoupdate-all-toggle"]').click();
 		cy.wait(100);
 		cy.get('[data-id="autoupdate-all-toggle"]').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-core-toggle"]').should('be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-plugins-toggle"]').should('be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
 		cy.get('[data-id="autoupdate-themes-toggle"]').should('be.disabled').should('have.attr', 'aria-checked').and('include', 'true');
-	});
-
-	it('Disabling All toggle returns to previous state', () => {
+	
+		// Disabling All toggle returns to previous state
 		cy.get('[data-id="autoupdate-all-toggle"]').click();
 		cy.wait(100);
         cy.get('.nfd-notifications')
@@ -114,9 +109,8 @@ describe('Settings Page', function () {
 		cy.get('[data-id="autoupdate-core-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'false');
 		cy.get('[data-id="autoupdate-plugins-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'false');
 		cy.get('[data-id="autoupdate-themes-toggle"]').should('not.be.disabled').should('have.attr', 'aria-checked').and('include', 'false');
-	});
-
-	it('All Toggle takes over again when all are enabled', () => {
+		
+		// All Toggle takes over again when all are enabled
 		cy.get('[data-id="autoupdate-core-toggle"]').click();
 		cy.get('[data-id="autoupdate-plugins-toggle"]').click();
 		cy.get('[data-id="autoupdate-themes-toggle"]').click();
@@ -198,7 +192,7 @@ describe('Settings Page', function () {
 			.find('li:first')
 			.click(); // 10
 		cy.wait(100);
-		cy.get('.' + appId + '-app-settings-comments')
+		cy.get( appClass + '-app-settings-comments')
 			.contains('label', 'Display 10 comments per page.')
 			.should('be.visible');
 		
@@ -219,7 +213,7 @@ describe('Settings Page', function () {
 			.find('li:last')
 			.click(); // 100
 		cy.wait(100);
-		cy.get('.' + appId + '-app-settings-comments')
+		cy.get( appClass + '-app-settings-comments')
 			.contains('label', 'Close comments after 100 days.')
 			.should('be.visible');
 		
@@ -231,7 +225,7 @@ describe('Settings Page', function () {
 			.find('li:nth-child(6)')
 			.click(); // 14
 		cy.wait(100);
-		cy.get('.' + appId + '-app-settings-comments')
+		cy.get( appClass + '-app-settings-comments')
 			.contains('label', 'Close comments after 14 days.')
 			.should('be.visible');
 		
diff --git a/tests/cypress/integration/webinars.cy.js b/tests/cypress/integration/webinars.cy.js
index a60f65df..8626ea19 100644
--- a/tests/cypress/integration/webinars.cy.js
+++ b/tests/cypress/integration/webinars.cy.js
@@ -1,21 +1,26 @@
 // <reference types="Cypress" />
+const webinarsFixture = require( '../fixtures/webinars.json' );
+const webinarsPastFixture = require( '../fixtures/webinars-past.json' );
+const webinarsInactiveFixture = require( '../fixtures/webinars-inactive.json' );
 
-describe( 'Home page - Webinar Component', function () {
+describe( 'Home page - Webinar Component', { testIsolation: true }, () => {
     let webinarurl = 'https://cdn.hiive.space/resources/hostgator_US-webinars.json';
 
-	before( () => {
-		cy.visit(
-			'/wp-admin/admin.php?page=' + Cypress.env( 'pluginId' ) + '#/home'
-		);
+	beforeEach( () => {
+		cy.wpLogin();
+		cy.visit( `/wp-admin/admin.php?page=${ Cypress.env( 'pluginId' ) }#/home` );
 	} );
 
     it( 'Webinars section exists and renders properly', () => {
 		cy.intercept(
-			webinarurl,
-			{ fixture: 'webinars.json' }
-		);
+			{
+				method: 'GET',
+				url: webinarurl,
+			},
+			webinarsFixture
+		).as( 'webinarsFixture' );
 		cy.reload();
-
+		cy.wait( '@webinarsFixture' );
         // Section Exists
 		cy.get( '.wppbh-webinars-banner-section' )
 			.contains( 'h2', 'Build your brand with WordPress' )
@@ -69,19 +74,27 @@ describe( 'Home page - Webinar Component', function () {
 
 	it( "Webinars Section Doesn't Render When Active Propety is False", () => {
 		cy.intercept(
-			webinarurl,
-			{ fixture: 'webinars-inactive.json' }
-		);
+			{
+				method: 'GET',
+				url: webinarurl,
+			},
+			webinarsInactiveFixture
+		).as( 'webinarsInactiveFixture' );
 		cy.reload();
+		cy.wait( '@webinarsInactiveFixture' );
 		cy.get( '.wppbh-webinars-banner-section' ).should( 'not.exist' );
 	} );
 
 	it( "Webinars Section Doesn't Render Items Are in the Past", () => {
 		cy.intercept(
-			webinarurl,
-			{ fixture: 'webinars-past.json' }
-		);
+			{
+				method: 'GET',
+				url: webinarurl,
+			},
+			webinarsPastFixture
+		).as( 'webinarsPastFixture' );
 		cy.reload();
+		cy.wait( '@webinarsPastFixture' );
 		cy.get( '.wppbh-webinars-banner-section' ).should( 'not.exist' );
 	} );
 
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 06a4656a..711a0fc8 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -49,9 +49,37 @@ Cypress.Commands.add('login', (username, password) => {
 		});
 });
 
-Cypress.Commands.add('setPermalinkStructure', ((structure = '/%postname%/') => {
-    cy.exec(`npx wp-env run cli wp rewrite structure "${structure}"`);
-}));
+Cypress.Commands.add(
+	'setPermalinkStructure',
+	( structure = '/%postname%/' ) => {
+		cy.request( {
+			method: 'GET',
+			url: '/wp-json/',
+			failOnStatusCode: false,
+		} ).then( ( result ) => {
+			if ( result.isOkStatusCode ) {
+				return;
+			}
+			const permalinkWpCliCommand = `wp rewrite structure "${ structure }" --hard;`;
+			const permalinkWpEnvCommand = `npx wp-env run cli ${ permalinkWpCliCommand }`;
+			const permalinkWpEnvTestCommand = `npx wp-env run tests-cli ${ permalinkWpCliCommand }`;
+			cy.exec( permalinkWpEnvCommand, { failOnNonZeroExit: true } ).then(
+				( result ) => {
+					cy.request( '/wp-json/' );
+				}
+			);
+			cy.exec( permalinkWpEnvTestCommand, {
+				failOnNonZeroExit: true,
+			} ).then( ( result ) => {
+				cy.request( '/wp-json/' );
+			} );
+		} );
+	}
+);
+
+Cypress.Commands.add( 'wpLogin', () => {
+	cy.login( Cypress.env( 'wpUsername' ), Cypress.env( 'wpPassword' ) );
+});
 
 Cypress.Commands.add('setBrand', ((brand = null) => {
 	if ( brand === null ) {
diff --git a/tests/cypress/support/index.js b/tests/cypress/support/index.js
index 9f0d98ce..5607a05e 100644
--- a/tests/cypress/support/index.js
+++ b/tests/cypress/support/index.js
@@ -17,10 +17,7 @@ import 'cypress-axe';
 import './commands';
 
 before(() => {
-	cy.login(
-		Cypress.env('wpUsername'),
-		Cypress.env('wpPassword')
-	);
+	cy.wpLogin();
 });
 
 Cypress.on('uncaught:exception', (err, runnable) => {