diff --git a/tests/EndToEnd/forms/general/CategoryFormCest.php b/tests/EndToEnd/forms/general/CategoryFormCest.php
index 70369b251..0d8e85e29 100644
--- a/tests/EndToEnd/forms/general/CategoryFormCest.php
+++ b/tests/EndToEnd/forms/general/CategoryFormCest.php
@@ -51,16 +51,6 @@ public function testAddCategoryWithValidFormSetting(EndToEndTester $I)
 			value: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
-		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Save.
 		$I->click('input#submit');
 
@@ -117,16 +107,6 @@ public function testAddCategoryWithNoneFormSetting(EndToEndTester $I)
 			value: 'None'
 		);
 
-		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Save.
 		$I->click('input#submit');
 
@@ -192,16 +172,6 @@ public function testEditCategoryWithValidFormSetting(EndToEndTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="wp-convertkit-form">');
 
-		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Change Form to value specified in the .env file.
 		$I->fillSelect2Field(
 			$I,
@@ -264,16 +234,6 @@ public function testEditCategoryWithNoneFormSetting(EndToEndTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="wp-convertkit-form">');
 
-		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Change Form to None.
 		$I->fillSelect2Field(
 			$I,
@@ -460,16 +420,6 @@ public function testEditCategoryWithFormPositionBefore(EndToEndTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="wp-convertkit-form">');
 
-		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Change Form to value specified in the .env file.
 		$I->fillSelect2Field(
 			$I,
@@ -542,16 +492,6 @@ public function testEditCategoryWithFormPositionAfter(EndToEndTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="wp-convertkit-form">');
 
-		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Change Form to value specified in the .env file.
 		$I->fillSelect2Field(
 			$I,
diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
index fbefdf635..db9bcf6bd 100644
--- a/tests/EndToEnd/forms/post-types/CPTFormCest.php
+++ b/tests/EndToEnd/forms/post-types/CPTFormCest.php
@@ -138,16 +138,6 @@ public function testAddNewCPTUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(
 			title: 'Kit: CPT: Form: Default: None'
 		);
 
-		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			'#wp-convertkit-form',
-			[
-				'Default',
-				'None',
-			]
-		);
-
 		// Publish and view the CPT on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 90873aa8c..d9bc74afd 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -67,16 +67,6 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 			title: 'Kit: Page: Form: Default: None'
 		);
 
-		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
diff --git a/tests/EndToEnd/forms/post-types/PostFormCest.php b/tests/EndToEnd/forms/post-types/PostFormCest.php
index 698d1870f..bf0b6891f 100644
--- a/tests/EndToEnd/forms/post-types/PostFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PostFormCest.php
@@ -67,16 +67,6 @@ public function testAddNewPostUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 			title: 'Kit: Post: Form: Default: None'
 		);
 
-		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			selectElement: '#wp-convertkit-form',
-			prependOptions: [
-				'Default',
-				'None',
-			]
-		);
-
 		// Publish and view the Post on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
diff --git a/tests/EndToEnd/general/other/SelectOptionOrderCest.php b/tests/EndToEnd/general/other/SelectOptionOrderCest.php
new file mode 100644
index 000000000..e3fce7172
--- /dev/null
+++ b/tests/EndToEnd/general/other/SelectOptionOrderCest.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests for the order of resources in select elements.
+ *
+ * @since   3.3.0
+ */
+class SelectOptionOrderCest
+{
+	/**
+	 * Run common actions before running the test functions in this class.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _before(EndToEndTester $I)
+	{
+		// Activate and Setup Kit plugin.
+		$I->activateKitPlugin($I);
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Create Custom Post Types using the Custom Post Type UI Plugin.
+		$I->registerCustomPostTypes($I);
+	}
+
+	/**
+	 * Test that the order of the Form resources are alphabetical, with the Default and None options prepending the Forms,
+	 * when adding a new Category.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSelectOrderOnAddCategory(EndToEndTester $I)
+	{
+		// Navigate to Posts > Categories.
+		$I->amOnAdminPage('edit-tags.php?taxonomy=category');
+
+		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-form',
+			prependOptions: [
+				'Default',
+				'None',
+			]
+		);
+	}
+
+	/**
+	 * Test that the order of the Form resources are alphabetical, with the Default and None options prepending the Forms,
+	 * when editing a Category.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSelectOrderOnEditCategory(EndToEndTester $I)
+	{
+		// Create Category.
+		$termID = $I->haveTermInDatabase( 'Kit: Edit Category', 'category' );
+		$termID = $termID[0];
+
+		// Edit the Term.
+		$I->amOnAdminPage('term.php?taxonomy=category&tag_ID=' . $termID);
+
+		// Check the order of the Form resources are alphabetical, with the Default option prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-form',
+			prependOptions: [
+				'Default',
+				'None',
+			]
+		);
+	}
+
+	/**
+	 * Test that the order of the Form resources are alphabetical, with the Default and None options prepending the Forms,
+	 * when Pages, Posts and Custom Post Types (CPTs) are added.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSelectOrderOnPostTypes(EndToEndTester $I)
+	{
+		// Navigate to Pages > Add New.
+		$I->amOnAdminPage('post-new.php?post_type=page');
+
+		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-form',
+			prependOptions: [
+				'Default',
+				'None',
+			]
+		);
+
+		// Check the order of the Landing Page resources are alphabetical, with the None option prepending the Landing Pages.
+		$I->checkSelectLandingPageOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-landing_page',
+			prependOptions: [
+				'None',
+			]
+		);
+
+		// Check the order of the Tag resources are alphabetical, with the None option prepending the Tags.
+		$I->checkSelectTagOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-tag',
+			prependOptions: [
+				'None',
+			]
+		);
+
+		// Navigate to Posts > Add New.
+		$I->amOnAdminPage('post-new.php?post_type=post');
+
+		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-form',
+			prependOptions: [
+				'Default',
+				'None',
+			]
+		);
+
+		// Check the order of the Tag resources are alphabetical, with the None option prepending the Tags.
+		$I->checkSelectTagOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-tag',
+			prependOptions: [
+				'None',
+			]
+		);
+
+		// Navigate to Custom Post Type > Add New.
+		$I->amOnAdminPage('post-new.php?post_type=article');
+
+		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-form',
+			prependOptions: [
+				'Default',
+				'None',
+			]
+		);
+
+		// Check the order of the Tag resources are alphabetical, with the None option prepending the Tags.
+		$I->checkSelectTagOptionOrder(
+			$I,
+			selectElement: '#wp-convertkit-tag',
+			prependOptions: [
+				'None',
+			]
+		);
+	}
+
+	/**
+	 * Test that the order of the Form resources are alphabetical, with the None option prepending the Forms,
+	 * when the Plugin Settings General screen is viewed.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSelectOrderOnPluginSettingsGeneralScreen(EndToEndTester $I)
+	{
+		// Go to the Plugin's Settings Screen.
+		$I->loadKitSettingsGeneralScreen($I);
+
+		// Check the order of the Form resources are alphabetical, with 'None' as the first choice.
+		$I->checkSelectFormOptionOrder(
+			$I,
+			selectElement: '#_wp_convertkit_settings_page_form',
+			prependOptions: [
+				'None',
+			]
+		);
+	}
+
+	/**
+	 * Deactivate and reset Plugin(s) after each test, if the test passes.
+	 * We don't use _after, as this would provide a screenshot of the Plugin
+	 * deactivation and not the true test error.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->unregisterCustomPostTypes($I);
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+		$I->deactivateKitPlugin($I);
+		$I->resetKitPlugin($I);
+	}
+}
diff --git a/tests/EndToEnd/general/other/UpgradePathsCest.php b/tests/EndToEnd/general/other/UpgradePathsCest.php
index af97ded84..94d4f1c39 100644
--- a/tests/EndToEnd/general/other/UpgradePathsCest.php
+++ b/tests/EndToEnd/general/other/UpgradePathsCest.php
@@ -139,15 +139,6 @@ public function testGetAccessTokenByAPIKeyAndSecret(EndToEndTester $I)
 		// Confirm the Plugin authorized by checking for a Disconnect button.
 		$I->see('Kit WordPress');
 		$I->see('Disconnect');
-
-		// Check the order of the Form resources are alphabetical, with 'None' as the first choice.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			'#_wp_convertkit_settings_page_form',
-			[
-				'None',
-			]
-		);
 	}
 
 	/**
diff --git a/tests/EndToEnd/general/plugin-screens/PluginSettingsGeneralCest.php b/tests/EndToEnd/general/plugin-screens/PluginSettingsGeneralCest.php
index de70736ab..eda010b26 100644
--- a/tests/EndToEnd/general/plugin-screens/PluginSettingsGeneralCest.php
+++ b/tests/EndToEnd/general/plugin-screens/PluginSettingsGeneralCest.php
@@ -146,15 +146,6 @@ public function testValidCredentials(EndToEndTester $I)
 		$I->see('Disconnect');
 		$I->seeElementInDOM('input#submit');
 
-		// Check the order of the Form resources are alphabetical, with 'None' as the first choice.
-		$I->checkSelectFormOptionOrder(
-			$I,
-			'#_wp_convertkit_settings_page_form',
-			[
-				'None',
-			]
-		);
-
 		// Save Changes to confirm credentials are not lost.
 		$I->click('Save Changes');
 
diff --git a/tests/EndToEnd/integrations/divi-theme/DiviThemeBroadcastsCest.php b/tests/EndToEnd/integrations/divi-theme/DiviThemeBroadcastsCest.php
index 9aac59cb8..9aa0aeeac 100644
--- a/tests/EndToEnd/integrations/divi-theme/DiviThemeBroadcastsCest.php
+++ b/tests/EndToEnd/integrations/divi-theme/DiviThemeBroadcastsCest.php
@@ -122,83 +122,6 @@ public function testBroadcastsModule(EndToEndTester $I)
 		);
 	}
 
-	/**
-	 * Test the Broadcasts module displays the expected message when the Plugin has no credentials.
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBroadcastsModuleWhenNoCredentials(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No Credentials notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Create a Divi Page in the backend editor.
-		$I->createDiviPageInBackendEditor(
-			$I,
-			title: 'Kit: Page: Broadcasts: Divi 5: No Credentials'
-		);
-
-		// Insert the Broadcasts module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Broadcasts',
-			programmaticName: 'convertkit_broadcasts'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'Not connected to Kit',
-			text: 'Connect your Kit account at Settings > Kit, and then refresh this page to configure broadcasts to display.'
-		);
-	}
-
-	/**
-	 * Test the Broadcasts module displays the expected message when the Kit account
-	 * has no broadcasts.
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBroadcastsModuleWhenNoBroadcasts(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No resources notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Setup Plugin.
-		$I->setupKitPluginCredentialsNoData($I);
-		$I->setupKitPluginResourcesNoData($I);
-
-		// Create a Divi Page in the backend editor.
-		$I->createDiviPageInBackendEditor(
-			$I,
-			title: 'Kit: Page: Broadcasts: Divi 5: No Broadcasts'
-		);
-
-		// Insert the Broadcasts module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Broadcasts',
-			programmaticName: 'convertkit_broadcasts'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'No broadcasts exist in Kit',
-			text: 'Add a broadcast to your Kit account, and then refresh this page to configure broadcasts to display.'
-		);
-	}
-
 	/**
 	 * Deactivate and reset Plugin(s) after each test, if the test passes.
 	 * We don't use _after, as this would provide a screenshot of the Plugin
diff --git a/tests/EndToEnd/integrations/divi-theme/DiviThemeFormCest.php b/tests/EndToEnd/integrations/divi-theme/DiviThemeFormCest.php
index 003d2d08b..5eeb3a1a3 100644
--- a/tests/EndToEnd/integrations/divi-theme/DiviThemeFormCest.php
+++ b/tests/EndToEnd/integrations/divi-theme/DiviThemeFormCest.php
@@ -64,77 +64,6 @@ public function testFormModule(EndToEndTester $I)
 		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
-	/**
-	 * Test the Form module displays the expected message when the Plugin has no credentials
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testFormModuleWhenNoCredentials(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No Credentials notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Create a Divi Page in the frontend editor.
-		$I->createDiviPageInFrontendEditor($I, 'Kit: Page: Form: Divi: Frontend: No Credentials', false);
-
-		// Insert the Form module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Form',
-			programmaticName: 'convertkit_form'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'Not connected to Kit',
-			text: 'Connect your Kit account at Settings > Kit, and then refresh this page to select a form.'
-		);
-	}
-
-	/**
-	 * Test the Form module displays the expected message when the Kit account
-	 * has no forms.
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testFormModuleWhenNoForms(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No resources notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Setup Plugin.
-		$I->setupKitPluginCredentialsNoData($I);
-		$I->setupKitPluginResourcesNoData($I);
-
-		// Create a Divi Page in the frontend editor.
-		$I->createDiviPageInFrontendEditor($I, 'Kit: Page: Form: Divi: Frontend: No Forms');
-
-		// Insert the Form module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Form',
-			programmaticName: 'convertkit_form'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'No forms exist in Kit',
-			text: 'Add a form to your Kit account, and then refresh this page to select a form.'
-		);
-	}
-
 	/**
 	 * Test the Form module works when a valid Legacy Form is selected.
 	 *
diff --git a/tests/EndToEnd/integrations/divi-theme/DiviThemeFormTriggerCest.php b/tests/EndToEnd/integrations/divi-theme/DiviThemeFormTriggerCest.php
index 6c2fe182c..984d5ea02 100644
--- a/tests/EndToEnd/integrations/divi-theme/DiviThemeFormTriggerCest.php
+++ b/tests/EndToEnd/integrations/divi-theme/DiviThemeFormTriggerCest.php
@@ -64,78 +64,6 @@ public function testFormTriggerModule(EndToEndTester $I)
 		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
 	}
 
-
-	/**
-	 * Test the Form module displays the expected message when the Plugin has no credentials
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testFormTriggerModuleWhenNoCredentials(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No Credentials notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Create a Divi Page in the frontend editor.
-		$I->createDiviPageInFrontendEditor($I, 'Kit: Page: Form Trigger: Divi: Frontend: No Credentials', false);
-
-		// Insert the Form module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Form Trigger',
-			programmaticName: 'convertkit_formtrigger'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'Not connected to Kit',
-			text: 'Connect your Kit account at Settings > Kit, and then refresh this page to select a form.'
-		);
-	}
-
-	/**
-	 * Test the Form module displays the expected message when the Kit account
-	 * has no forms.
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testFormTriggerModuleInFrontendEditorWhenNoForms(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No resources notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Setup Plugin.
-		$I->setupKitPluginCredentialsNoData($I);
-		$I->setupKitPluginResourcesNoData($I);
-
-		// Create a Divi Page in the frontend editor.
-		$I->createDiviPageInFrontendEditor($I, 'Kit: Page: Form Trigger: Divi: Frontend: No Forms');
-
-		// Insert the Form module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Form Trigger',
-			programmaticName: 'convertkit_formtrigger'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'No modal, sticky bar or slide in forms exist in Kit',
-			text: 'Add a non-inline form to your Kit account, and then refresh this page to select a form.'
-		);
-	}
-
 	/**
 	 * Test the Form module works when no Form is selected.
 	 *
diff --git a/tests/EndToEnd/integrations/divi-theme/DiviThemeProductCest.php b/tests/EndToEnd/integrations/divi-theme/DiviThemeProductCest.php
index ec6e61edf..9691bb89f 100644
--- a/tests/EndToEnd/integrations/divi-theme/DiviThemeProductCest.php
+++ b/tests/EndToEnd/integrations/divi-theme/DiviThemeProductCest.php
@@ -63,77 +63,6 @@ public function testProductModule(EndToEndTester $I)
 		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
-	/**
-	 * Test the Product module displays the expected message when the Plugin has no credentials
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testProductModuleWhenNoCredentials(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No Credentials notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Create a Divi Page in the frontend editor.
-		$I->createDiviPageInFrontendEditor($I, 'Kit: Page: Product: Divi: Frontend: No Credentials', false);
-
-		// Insert the Product module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Product',
-			programmaticName: 'convertkit_product'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'Not connected to Kit',
-			text: 'Connect your Kit account at Settings > Kit, and then refresh this page to select a product.'
-		);
-	}
-
-	/**
-	 * Test the Product module displays the expected message when the Kit account
-	 * has no products.
-	 *
-	 * @since   2.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testProductModuleWhenNoProducts(EndToEndTester $I)
-	{
-		// Skip test until modules upgraded to Divi 5.
-		$I->useTheme('twentytwentytwo');
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-		$I->markTestSkipped('No resources notice cannot be displayed until modules upgraded to Divi 5.');
-
-		// Setup Plugin.
-		$I->setupKitPluginCredentialsNoData($I);
-		$I->setupKitPluginResourcesNoData($I);
-
-		// Create a Divi Page in the frontend editor.
-		$I->createDiviPageInFrontendEditor($I, 'Kit: Page: Product: Divi: Product: No Products');
-
-		// Insert the Product module.
-		$I->insertDiviRowWithModule(
-			$I,
-			name: 'Kit Product',
-			programmaticName: 'convertkit_product'
-		);
-
-		// Confirm the on screen message displays.
-		$I->seeTextInDiviModule(
-			$I,
-			title: 'No products exist in Kit',
-			text: 'Add a product to your Kit account, and then refresh this page to select a product.'
-		);
-	}
-
 	/**
 	 * Test the Product module works when no Product is selected.
 	 *
@@ -167,7 +96,6 @@ public function testProductModuleWithNoProductParameter(EndToEndTester $I)
 		$I->dontSeeProductOutput($I);
 	}
 
-
 	/**
 	 * Deactivate and reset Plugin(s) after each test, if the test passes.
 	 * We don't use _after, as this would provide a screenshot of the Plugin
diff --git a/tests/Support/Helper/Divi5Theme.php b/tests/Support/Helper/Divi5Theme.php
index 4a3077432..344bcdab9 100644
--- a/tests/Support/Helper/Divi5Theme.php
+++ b/tests/Support/Helper/Divi5Theme.php
@@ -12,39 +12,35 @@ class Divi5Theme extends \Codeception\Module
 	/**
 	 * Helper method to create a Divi Page in the WordPress Administration interface.
 	 *
-	 * @since   2.5.7
+	 * @since   3.2.1
 	 *
 	 * @param   EndToEndTester $I                 EndToEnd Tester.
 	 * @param   string         $title             Page Title.
-	 * @param   bool           $configureMetaBox  Configure Plugin's Meta Box to set Form = None (set to false if running a test with no credentials).
 	 */
-	public function createDivi5Page($I, $title, $configureMetaBox = true)
+	public function createDivi5Page($I, $title)
 	{
-		// Add a Page using the Gutenberg editor.
-		// We don't use addGutenbergPage(), as when the Divi Builder is used, the iframed Gutenberg editor is not used,
-		// and addGutenbergPage() may switch to an iframe based on the value of the WORDPRESS_V3_BLOCK_EDITOR_ENABLED environment variable.
-		// Navigate to Post Type (e.g. Pages / Posts) > Add New.
-		$I->amOnAdminPage('post-new.php?post_type=page');
-		$I->waitForElementVisible('body.post-new-php');
-
-		// Define the Title.
-		$I->fillField('.editor-post-title__input', $title);
-
-		// Configure metabox's Form setting = None, ensuring we only test the Divi block.
-		if ($configureMetaBox) {
-			$I->configureMetaboxSettings(
-				$I,
-				'wp-convertkit-meta-box',
-				[
-					'form' => [ 'select2', 'None' ],
-				]
-			);
-		}
-
-		// Publish Page.
-		$I->publishGutenbergPage($I);
-
-		// Click Divi Builder button.
+		// Create a Page.
+		$pageID = $I->havePostInDatabase(
+			[
+				'post_type'    => 'page',
+				'post_title'   => $title,
+				'post_content' => '',
+				'meta_input'   => [
+					// Configure Kit Plugin to not display a default Form.
+					'_wp_convertkit_post_meta' => [
+						'form'         => '0',
+						'landing_page' => '',
+						'tag'          => '',
+					],
+					'_et_pb_use_builder'       => 'on',
+				],
+			]
+		);
+
+		// Edit Page.
+		$I->amOnPage('/wp-admin/post.php?post=' . $pageID . '&action=edit');
+
+		// Click "Use The Divi Builder" button.
 		$I->click('#et-switch-to-divi');
 
 		// Wait for Divi Builder to load.
@@ -114,7 +110,8 @@ public function insertDivi5RowWithModule($I, $name, $programmaticName, $fieldNam
 	}
 
 	/**
-	 * Helper method to save a page created using Divi 5.
+	 * Helper method to save a page created using Divi 5, and view
+	 * it on the frontend site.
 	 *
 	 * @since   3.2.1
 	 *
@@ -127,10 +124,9 @@ public function saveDivi5PageAndViewOnFrontend($I)
 		$I->click('.et-vb-page-bar-dropdown-button.et-vb-page-bar-dropdown-button--fill button.et-vb-page-bar-action-button');
 		$I->waitForElementNotVisible('.et-vb-page-bar-dropdown-button--saving');
 
-		// Load the Page on the frontend site.
-		$I->click('div[aria-label="Exit Dropdown"]');
-		$I->waitForElementVisible('button[value="view-page"]');
-		$I->click('button[value="view-page"]');
+		// View page.
+		$url = $_ENV['WORDPRESS_URL'] . wp_parse_url($I->grabFromCurrentUrl(), PHP_URL_PATH);
+		$I->amOnUrl($url);
 
 		// Check that no PHP warnings or notices were output.
 		$I->checkNoWarningsAndNoticesOnScreen($I);
diff --git a/tests/Support/Helper/DiviBuilder.php b/tests/Support/Helper/DiviBuilder.php
index 5c7ff3402..e015fdca6 100644
--- a/tests/Support/Helper/DiviBuilder.php
+++ b/tests/Support/Helper/DiviBuilder.php
@@ -106,15 +106,24 @@ public function createDiviPageInFrontendEditor($I, $title, $configureMetaBox = t
 		// Publish Page.
 		$url = $I->publishGutenbergPage($I);
 
-		// Click Divi Builder button inside the Gutenberg editor.
-		$I->click('Use Divi Builder');
+		// Load page.
+		$I->amOnUrl($url);
 
-		// Reload page to dismiss modal.
-		$I->wait(5);
-		$I->amOnUrl($url . '?et_fb=1&PageSpeed=off');
+		// Enable the Divi Builder.
+		$I->waitForElementVisible('#wp-admin-bar-et-use-visual-builder');
+		$I->click('#wp-admin-bar-et-use-visual-builder a');
+
+		// Dismiss modal if displayed.
+		// May have been dismissed by other tests in the suite e.g. DiviFormCest.
+		try {
+			$I->waitForElementVisible('.et-core-modal-action-dont-restore');
+			$I->click('.et-core-modal-action-dont-restore');
+		} catch ( \Facebook\WebDriver\Exception\NoSuchElementException $e ) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
+			// No modal exists, so nothing to dismiss.
+		}
 
 		// Click Build from scratch button.
-		$I->waitForElementVisible('.et-fb-page-creation-card-build_from_scratch', 30);
+		$I->waitForElementVisible('.et-fb-page-creation-card-build_from_scratch');
 		$I->click('Start Building', '.et-fb-page-creation-card-build_from_scratch');
 
 		return $url;
diff --git a/tests/Support/Helper/KitPlugin.php b/tests/Support/Helper/KitPlugin.php
index 282d12184..05ce2056f 100644
--- a/tests/Support/Helper/KitPlugin.php
+++ b/tests/Support/Helper/KitPlugin.php
@@ -764,6 +764,10 @@ public function checkSelectOptionOrder($I, $selectElement, $values)
 				$nth = 'nth-child(' . ( $i + 1 ) . ')';
 			}
 
+			// Wait for the option to be visible.
+			$I->waitForElementVisible('select' . $selectElement . ' option:' . $nth);
+
+			// Assert that the option text matches the expected value.
 			$I->assertEquals(
 				$I->grabTextFrom('select' . $selectElement . ' option:' . $nth),
 				$value