diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormBuilderCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormBuilderCest.php
index 3ba66bd14..2f02ca7da 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormBuilderCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormBuilderCest.php
@@ -84,12 +84,9 @@ public function testFormBuilderBlockWithDefaultConfiguration(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -188,12 +185,9 @@ public function testFormBuilderBlockWithTextCustomization(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -304,12 +298,9 @@ public function testFormBuilderBlockWithFormEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -412,12 +403,9 @@ public function testFormBuilderBlockWithTaggingEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -519,12 +507,9 @@ public function testFormBuilderBlockWithSequenceEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -625,12 +610,9 @@ public function testFormBuilderBlockWithCustomField(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -761,12 +743,9 @@ public function testFormBuilderBlockWithRedirectOption(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -915,12 +894,9 @@ public function testFormBuilderFieldsCanOnlyBeInsertedToFormBuilderBlock(EndToEn
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Confirm the Form Field blocks cannot be added, as we are not within the Form Builder block.
@@ -974,12 +950,9 @@ public function testFormBuilderSupportsCoreBlocks(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add the Form Builder block.
@@ -1031,12 +1004,9 @@ public function testFormBuilderWithRecaptchaEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -1098,12 +1068,9 @@ public function testFormBuilderWithRecaptchaEnabledAndHighMinimumScore(EndToEndT
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -1154,12 +1121,9 @@ public function testFormBuilderWithStoreEntriesEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php
index fef694c58..6c77321b4 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormCest.php
@@ -43,12 +43,9 @@ public function testFormBlockWithValidFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -98,12 +95,9 @@ public function testFormBlockWithValidLegacyFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -144,12 +138,9 @@ public function testFormBlockWithValidModalFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -198,12 +189,9 @@ public function testFormBlocksWithValidModalFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -262,12 +250,9 @@ public function testFormBlockWithValidSlideInFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -316,12 +301,9 @@ public function testFormBlocksWithValidSlideInFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -380,12 +362,9 @@ public function testFormBlockWithValidStickyBarFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -434,12 +413,9 @@ public function testFormBlocksWithValidStickyBarFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -497,12 +473,9 @@ public function testFormBlockWithNoFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -662,12 +635,9 @@ public function testFormBlockWithAutoptimizePlugin(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -720,12 +690,9 @@ public function testFormBlockWithDebloatPlugin(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -779,12 +746,9 @@ public function testFormBlockWithJetpackBoostPlugin(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -842,12 +806,9 @@ public function testFormBlockWithSitegroundSpeedOptimizerPlugin(EndToEndTester $
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -899,12 +860,9 @@ public function testFormBlockWithLiteSpeedCachePlugin(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -965,12 +923,9 @@ public function testFormBlockWithPerfmattersPlugin(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -1022,12 +977,9 @@ public function testFormBlockWithWPRocketPluginDelayJS(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -1086,12 +1038,9 @@ public function testFormBlockWithWPRocketPluginMinifyJS(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormTriggerCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormTriggerCest.php
index bb51a118f..9046ecbde 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormTriggerCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormTriggerCest.php
@@ -43,12 +43,9 @@ public function testFormTriggerBlockWithValidFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -93,12 +90,9 @@ public function testFormTriggerBlocksWithValidFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -157,12 +151,9 @@ public function testFormTriggerBlockWithNoFormParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormatterFormTriggerCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormatterFormTriggerCest.php
index f5f57ab9e..e96e4e00e 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormatterFormTriggerCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormatterFormTriggerCest.php
@@ -43,12 +43,9 @@ public function testFormTriggerFormatterWithModalForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add paragraph to Page.
@@ -104,12 +101,9 @@ public function testFormTriggerFormatterToggleFormSelection(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add paragraph to Page.
@@ -167,12 +161,9 @@ public function testFormTriggerFormatterWithNoForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add paragraph to Page.
diff --git a/tests/EndToEnd/forms/general/EditFormLinkCest.php b/tests/EndToEnd/forms/general/EditFormLinkCest.php
index acea99ae5..0be4b40e0 100644
--- a/tests/EndToEnd/forms/general/EditFormLinkCest.php
+++ b/tests/EndToEnd/forms/general/EditFormLinkCest.php
@@ -77,12 +77,9 @@ public function testEditFormLinkOnPageWithNoForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -177,12 +174,9 @@ public function testEditFormLinkOnPageWithLegacyForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Legacy.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -218,12 +212,9 @@ public function testEditFormLinkOnPageWithFormBlock(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
@@ -270,12 +261,9 @@ public function testEditFormLinkOnPageWithFormBlockSpecifyingNonInlineForm(EndTo
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Form setting to the value specified in the .env file.
diff --git a/tests/EndToEnd/forms/general/NonInlineFormCest.php b/tests/EndToEnd/forms/general/NonInlineFormCest.php
index 13fbfa037..c626e82b4 100644
--- a/tests/EndToEnd/forms/general/NonInlineFormCest.php
+++ b/tests/EndToEnd/forms/general/NonInlineFormCest.php
@@ -234,12 +234,9 @@ public function testDefaultNonInlineFormIgnoredWhenPageNonInlineFormDefined(EndT
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -278,12 +275,9 @@ public function testPageLevelNoneSettingIgnored(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -323,12 +317,9 @@ public function testPageLevelNoneSettingHonored(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -366,12 +357,9 @@ public function testDefaultNonInlineFormIgnoredWhenPageNonInlineFormDefinedInBlo
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add Form block to the Page set to the Modal Form.
@@ -513,12 +501,9 @@ public function testDefaultNonInlineFormIgnoredWhenPostNonInlineFormDefined(EndT
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Post on the frontend site.
@@ -615,12 +600,9 @@ public function testPostLevelNoneSettingIgnored(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Post on the frontend site.
@@ -661,12 +643,9 @@ public function testPostLevelNoneSettingHonored(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Post on the frontend site.
diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
index fbefdf635..4fd14c8f1 100644
--- a/tests/EndToEnd/forms/post-types/CPTFormCest.php
+++ b/tests/EndToEnd/forms/post-types/CPTFormCest.php
@@ -32,7 +32,8 @@ public function _before(EndToEndTester $I)
 	}
 
 	/**
-	 * Test that the Articles > Add New screen has expected a11y output, such as label[for].
+	 * Test that the Articles > Add New screen has expected a11y output, such as label[for],
+	 * when using the Classic Editor.
 	 *
 	 * @since   2.4.3
 	 *
@@ -40,6 +41,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testAccessibility(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Setup Kit Plugin.
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
@@ -50,6 +54,9 @@ public function testAccessibility(EndToEndTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="wp-convertkit-form">');
 		$I->seeInSource('<label for="wp-convertkit-tag">');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -63,8 +70,11 @@ public function testAccessibility(EndToEndTester $I)
 	 */
 	public function testNoOptionsOrOutputOnPrivateCustomPostType(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Add a Private CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
+		$I->addClassicEditorPage(
 			$I,
 			postType: 'private',
 			title: 'Kit: Private: Form: None'
@@ -74,13 +84,16 @@ public function testNoOptionsOrOutputOnPrivateCustomPostType(EndToEndTester $I)
 		$I->dontSeeElementInDOM('#wp-convertkit-meta-box');
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that no Kit Form is displayed.
 		$I->dontSeeElementInDOM('form[data-sv-form]');
 
 		// Confirm that no debug data is output, as this isn't a supported Post Type.
 		$I->dontSeeInSource('<!-- Kit append_form_to_content()');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -138,16 +151,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);
 
@@ -601,12 +604,9 @@ public function testAddNewCPTUsingNoForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None',
 		);
 
 		// Publish and view the CPT on the frontend site.
@@ -643,12 +643,9 @@ public function testAddNewCPTUsingDefinedForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Inline Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Publish and view the CPT on the frontend site.
@@ -688,12 +685,9 @@ public function testAddNewCPTUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Legacy Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
 
 		// Publish and view the CPT on the frontend site.
@@ -757,6 +751,90 @@ public function testAddNewCPTUsingInvalidDefinedForm(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 	}
 
+	/**
+	 * Test that the Form Settings are preserved when switching between the Classic Editor
+	 * and Gutenberg.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSettingsPreservedWhenSwitchingEditors(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: Article: Form: Editor Switching: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
+		// Configure metabox's Form setting = Inline Form.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
+			]
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Grab the edit page URL.
+		$editPageURL = $I->grabAttributeFrom('#wp-admin-bar-edit a', 'href');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+
+		$I->wait(2);
+
+		// Edit the page in the Gutenberg editor.
+		$I->amOnUrl($editPageURL);
+
+		// Confirm the Form setting is set to Inline Form.
+		$I->seePluginSidebarSetting($I, 'form', $_ENV['CONVERTKIT_API_FORM_NAME']);
+
+		// Add a paragraph, so the Save button can be used.
+		$I->addGutenbergParagraphBlock($I, 'This is a test paragraph.');
+
+		// Save (update) and view the Page on the frontend site.
+		$I->saveAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Edit the page in the Classic Editor.
+		$I->amOnUrl($editPageURL);
+
+		// Add a paragraph, so the Save button can be used.
+		$I->addClassicEditorParagraph($I, 'This is a test paragraph.');
+
+		// Save (update) and view the Page on the frontend site.
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+	}
+
 	/**
 	 * 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/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 90873aa8c..5a2229603 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -25,7 +25,8 @@ public function _before(EndToEndTester $I)
 	}
 
 	/**
-	 * Test that the Pages > Add New screen has expected a11y output, such as label[for].
+	 * Test that the Pages > Add New screen has expected a11y output, such as label[for],
+	 * when using the Classic Editor.
 	 *
 	 * @since   1.9.7.6
 	 *
@@ -33,6 +34,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testAccessibility(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Setup Kit plugin.
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
@@ -44,6 +48,9 @@ public function testAccessibility(EndToEndTester $I)
 		$I->seeInSource('<label for="wp-convertkit-form">');
 		$I->seeInSource('<label for="wp-convertkit-landing_page">');
 		$I->seeInSource('<label for="wp-convertkit-tag">');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -67,16 +74,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);
 
@@ -515,12 +512,9 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None',
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -551,12 +545,9 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Inline Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -591,12 +582,9 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -639,12 +627,9 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -689,12 +674,9 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -738,12 +720,9 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -790,12 +769,9 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -844,12 +820,9 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -891,12 +864,9 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		);
 
 		// Configure metabox's Form setting = Modal Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -939,12 +909,9 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Legacy Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -1006,6 +973,89 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 	}
 
+	/**
+	 * Test that the Form Settings are preserved when switching between the Classic Editor
+	 * and Gutenberg.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSettingsPreservedWhenSwitchingEditors(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
+			$I,
+			title: 'Kit: Page: Form: Editor Switching: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
+		// Configure metabox's Form setting = Inline Form.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
+			]
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Grab the edit page URL.
+		$editPageURL = $I->grabAttributeFrom('#wp-admin-bar-edit a', 'href');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+
+		$I->wait(2);
+
+		// Edit the page in the Gutenberg editor.
+		$I->amOnUrl($editPageURL);
+
+		// Confirm the Form setting is set to Inline Form.
+		$I->seePluginSidebarSetting($I, 'form', $_ENV['CONVERTKIT_API_FORM_NAME']);
+
+		// Add a paragraph, so the Save button can be used.
+		$I->addGutenbergParagraphBlock($I, 'This is a test paragraph.');
+
+		// Save (update) and view the Page on the frontend site.
+		$I->saveAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Edit the page in the Classic Editor.
+		$I->amOnUrl($editPageURL);
+
+		// Add a paragraph, so the Save button can be used.
+		$I->addClassicEditorParagraph($I, 'This is a test paragraph.');
+
+		// Save (update) and view the Page on the frontend site.
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+	}
+
 	/**
 	 * 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/forms/post-types/PageNoFormCest.php b/tests/EndToEnd/forms/post-types/PageNoFormCest.php
index 3c3300a09..1938d805d 100644
--- a/tests/EndToEnd/forms/post-types/PageNoFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageNoFormCest.php
@@ -42,6 +42,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testUTMParametersExist(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Check that no PHP warnings or notices were output.
 		$I->checkNoWarningsAndNoticesOnScreen($I);
 
@@ -50,6 +53,9 @@ public function testUTMParametersExist(EndToEndTester $I)
 
 		// Confirm that UTM parameters exist for the 'sign in to Kit' link.
 		$I->seeInSource('<a href="https://app.kit.com/?utm_source=wordpress&amp;utm_term=en_US&amp;utm_content=convertkit" target="_blank">sign in to Kit</a>');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
diff --git a/tests/EndToEnd/forms/post-types/PostFormCest.php b/tests/EndToEnd/forms/post-types/PostFormCest.php
index 698d1870f..d26277e9d 100644
--- a/tests/EndToEnd/forms/post-types/PostFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PostFormCest.php
@@ -25,7 +25,8 @@ public function _before(EndToEndTester $I)
 	}
 
 	/**
-	 * Test that the Posts > Add New screen has expected a11y output, such as label[for].
+	 * Test that the Posts > Add New screen has expected a11y output, such as label[for],
+	 * when using the Classic Editor.
 	 *
 	 * @since   1.9.7.6
 	 *
@@ -33,6 +34,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testAccessibility(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Setup Kit Plugin.
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
@@ -43,6 +47,9 @@ public function testAccessibility(EndToEndTester $I)
 		// Confirm that settings have label[for] attributes.
 		$I->seeInSource('<label for="wp-convertkit-form">');
 		$I->seeInSource('<label for="wp-convertkit-tag">');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -67,16 +74,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);
 
@@ -522,12 +519,9 @@ public function testAddNewPostUsingNoForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Post on the frontend site.
@@ -559,12 +553,9 @@ public function testAddNewPostUsingDefinedForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Inline Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Publish and view the Post on the frontend site.
@@ -604,12 +595,9 @@ public function testAddNewPostUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = Legacy Form.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
 
 		// Publish and view the Post on the frontend site.
@@ -668,6 +656,90 @@ public function testAddNewPostUsingInvalidDefinedForm(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 	}
 
+	/**
+	 * Test that the Form Settings are preserved when switching between the Classic Editor
+	 * and Gutenberg.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testFormSettingsPreservedWhenSwitchingEditors(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Editor Switching: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
+		// Configure metabox's Form setting = Inline Form.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
+			]
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Grab the edit page URL.
+		$editPageURL = $I->grabAttributeFrom('#wp-admin-bar-edit a', 'href');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+
+		$I->wait(2);
+
+		// Edit the page in the Gutenberg editor.
+		$I->amOnUrl($editPageURL);
+
+		// Confirm the Form setting is set to Inline Form.
+		$I->seePluginSidebarSetting($I, 'form', $_ENV['CONVERTKIT_API_FORM_NAME']);
+
+		// Add a paragraph, so the Save button can be used.
+		$I->addGutenbergParagraphBlock($I, 'This is a test paragraph.');
+
+		// Save (update) and view the Page on the frontend site.
+		$I->saveAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Edit the page in the Classic Editor.
+		$I->amOnUrl($editPageURL);
+
+		// Add a paragraph, so the Save button can be used.
+		$I->addClassicEditorParagraph($I, 'This is a test paragraph.');
+
+		// Save (update) and view the Page on the frontend site.
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+	}
+
 	/**
 	 * 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/general/other/PageCest.php b/tests/EndToEnd/general/other/PageCest.php
index dd0d9fd6d..79ae92fed 100644
--- a/tests/EndToEnd/general/other/PageCest.php
+++ b/tests/EndToEnd/general/other/PageCest.php
@@ -33,6 +33,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testAddNewPageShowsLinkToPluginSettingsWhenNoCredentialsSpecified(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Navigate to Pages > Add New.
 		$I->amOnAdminPage('post-new.php?post_type=page');
 
@@ -63,6 +66,9 @@ public function testAddNewPageShowsLinkToPluginSettingsWhenNoCredentialsSpecifie
 		// Confirm the Kit hosted OAuth login screen is displayed.
 		$I->waitForElementVisible('body.sessions');
 		$I->seeInSource('oauth/authorize?client_id=' . $_ENV['CONVERTKIT_OAUTH_CLIENT_ID']);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
diff --git a/tests/EndToEnd/general/other/PostCest.php b/tests/EndToEnd/general/other/PostCest.php
index 177aae9aa..85d4ac515 100644
--- a/tests/EndToEnd/general/other/PostCest.php
+++ b/tests/EndToEnd/general/other/PostCest.php
@@ -33,6 +33,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testAddNewPostShowsLinkToPluginSettingsWhenNoAPICredentialsSpecified(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Navigate to Posts > Add New.
 		$I->amOnAdminPage('post-new.php');
 
@@ -63,6 +66,9 @@ public function testAddNewPostShowsLinkToPluginSettingsWhenNoAPICredentialsSpeci
 		// Confirm the Kit hosted OAuth login screen is displayed.
 		$I->waitForElementVisible('body.sessions');
 		$I->seeInSource('oauth/authorize?client_id=' . $_ENV['CONVERTKIT_OAUTH_CLIENT_ID']);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
diff --git a/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php b/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
index 83862bfa2..0c4dc7644 100644
--- a/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
+++ b/tests/EndToEnd/general/other/RefreshResourcesButtonCest.php
@@ -36,6 +36,9 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testRefreshResourcesOnPage(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Setup Kit Plugin.
 		$I->setupKitPlugin($I);
 
@@ -917,38 +920,6 @@ public function testRefreshResourcesOnProductShortcodeUsingTextEditor(EndToEndTe
 		$I->publishAndViewClassicEditorPage($I);
 	}
 
-	/**
-	 * Test that the refresh button triggers an error message when the AJAX request fails,
-	 * or the Kit API returns an error, when adding a Page using the Gutenberg editor.
-	 *
-	 * @since   1.9.8.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testRefreshResourcesErrorNoticeOnPage(EndToEndTester $I)
-	{
-		// Setup Kit Plugin with invalid API credentials, so that the AJAX request returns an error.
-		$I->setupKitPluginFakeAPIKey($I);
-
-		// Navigate to Pages > Add New.
-		$I->amOnAdminPage('post-new.php?post_type=page');
-
-		// Click the Forms refresh button.
-		$I->click('button.wp-convertkit-refresh-resources[data-resource="forms"]');
-
-		// Wait for button to change its state from disabled.
-		$I->waitForElementVisible('button.wp-convertkit-refresh-resources[data-resource="forms"]:not(:disabled)');
-
-		// Confirm that an error notification is displayed on screen, with the expected error message.
-		$I->seeElementInDOM('div.components-notice-list div.is-error');
-		$I->see('Kit: The access token is invalid');
-
-		// Confirm that the notice is dismissible.
-		$I->click('div.components-notice-list div.is-error button.components-notice__dismiss');
-		$I->wait(1);
-		$I->dontSeeElementInDOM('div.components-notice-list div.is-error');
-	}
-
 	/**
 	 * Test that the refresh button triggers an error message when the AJAX request fails,
 	 * or the Kit API returns an error, when adding a Page using the Classic Editor.
diff --git a/tests/EndToEnd/general/other/ReviewRequestCest.php b/tests/EndToEnd/general/other/ReviewRequestCest.php
index d1ba91e5f..8f34351c3 100644
--- a/tests/EndToEnd/general/other/ReviewRequestCest.php
+++ b/tests/EndToEnd/general/other/ReviewRequestCest.php
@@ -112,13 +112,10 @@ public function testReviewRequestOnSavePageWithFormSpecified(EndToEndTester $I)
 			title: 'Kit: Page: Test Review Request on Save with Form Specified'
 		);
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure metabox's Form setting = Inline Form.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -155,13 +152,10 @@ public function testReviewRequestOnSavePageWithLandingPageSpecified(EndToEndTest
 			title: 'Kit: Page: Test Review Request on Save with Landing Page Specified'
 		);
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure metabox's Landing Page setting.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Publish and view the Page on the frontend site.
diff --git a/tests/EndToEnd/landing-pages/PageLandingPageCest.php b/tests/EndToEnd/landing-pages/PageLandingPageCest.php
index 7d31404ad..5371501c2 100644
--- a/tests/EndToEnd/landing-pages/PageLandingPageCest.php
+++ b/tests/EndToEnd/landing-pages/PageLandingPageCest.php
@@ -44,22 +44,10 @@ public function testAddNewPageUsingNoLandingPage(EndToEndTester $I)
 			title: 'Kit: Page: Landing Page: 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',
-			]
-		);
-
 		// Configure metabox's Landing Page setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', 'None' ],
-			]
+			landingPage: 'None'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -87,12 +75,9 @@ public function testAddNewPageUsingDefinedLandingPage(EndToEndTester $I)
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -137,12 +122,9 @@ public function testLandingPageSiteIcon(EndToEndTester $I)
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -182,12 +164,9 @@ public function testLandingPageCharacterEncoding(EndToEndTester $I)
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_CHARACTER_ENCODING_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_CHARACTER_ENCODING_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -220,12 +199,9 @@ public function testAddNewPageUsingDefinedLegacyLandingPage(EndToEndTester $I)
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LEGACY_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -263,12 +239,9 @@ public function testLegacyLandingPageSiteIcon(EndToEndTester $I)
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LEGACY_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -368,12 +341,9 @@ public function testAddNewPageUsingDefinedLandingPageWithAutoptimizePlugin(EndTo
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -435,12 +405,9 @@ public function testAddNewPageUsingDefinedLandingPageWithPerfmattersPlugin(EndTo
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -493,12 +460,9 @@ public function testAddNewPageUsingDefinedLandingPageWithWPRocket(EndToEndTester
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
@@ -570,12 +534,9 @@ public function testAddNewPageUsingDefinedLandingPageWithRocketLazyLoadPlugin(En
 		);
 
 		// Configure metabox's Landing Page setting to value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'landing_page' => [ 'select2', $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME'] ],
-			]
+			landingPage: $_ENV['CONVERTKIT_API_LANDING_PAGE_NAME']
 		);
 
 		// Get Landing Page ID.
diff --git a/tests/EndToEnd/landing-pages/PostLandingPageCest.php b/tests/EndToEnd/landing-pages/PostLandingPageCest.php
index 2f262f41c..785ae503b 100644
--- a/tests/EndToEnd/landing-pages/PostLandingPageCest.php
+++ b/tests/EndToEnd/landing-pages/PostLandingPageCest.php
@@ -39,8 +39,11 @@ public function _before(EndToEndTester $I)
 	 */
 	public function testAddNewPostDoesNotDisplayLandingPageOption(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
+		$I->addClassicEditorPage(
 			$I,
 			postType: 'post',
 			title: 'Kit: Post: Landing Page'
@@ -57,6 +60,9 @@ public function testAddNewPostDoesNotDisplayLandingPageOption(EndToEndTester $I)
 
 		// Confirm that no Kit Form is displayed.
 		$I->dontSeeElementInDOM('form[data-sv-form]');
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
diff --git a/tests/EndToEnd/products/PageBlockFormatterProductLinkCest.php b/tests/EndToEnd/products/PageBlockFormatterProductLinkCest.php
index c3b3945ed..c3002beb2 100644
--- a/tests/EndToEnd/products/PageBlockFormatterProductLinkCest.php
+++ b/tests/EndToEnd/products/PageBlockFormatterProductLinkCest.php
@@ -43,12 +43,9 @@ public function testProductLinkFormatter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add paragraph to Page.
@@ -96,12 +93,9 @@ public function testProductLinkFormatterToggleProductSelection(EndToEndTester $I
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add paragraph to Page.
@@ -159,12 +153,9 @@ public function testProductLinkFormatterWithNoProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add paragraph to Page.
diff --git a/tests/EndToEnd/products/PageBlockProductCest.php b/tests/EndToEnd/products/PageBlockProductCest.php
index 6653ae5a0..e278b37bd 100644
--- a/tests/EndToEnd/products/PageBlockProductCest.php
+++ b/tests/EndToEnd/products/PageBlockProductCest.php
@@ -43,12 +43,9 @@ public function testProductBlockWithValidProductParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Product setting to the value specified in the .env file.
@@ -93,12 +90,9 @@ public function testProductBlockWithNoProductParameter(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page.
@@ -222,12 +216,9 @@ public function testProductBlockWithValidDiscountCodeParameter(EndToEndTester $I
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Product setting to the value specified in the .env file.
@@ -281,12 +272,9 @@ public function testProductBlockWithInvalidDiscountCodeParameter(EndToEndTester
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Product setting to the value specified in the .env file.
@@ -341,12 +329,9 @@ public function testProductBlockWithCheckoutParameterEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Product setting to the value specified in the .env file.
@@ -401,12 +386,9 @@ public function testProductBlockWithDisableModalOnMobileParameterEnabled(EndToEn
 		);
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Add block to Page, setting the Product setting to the value specified in the .env file.
diff --git a/tests/EndToEnd/restrict-content/general/RestrictContentCacheCest.php b/tests/EndToEnd/restrict-content/general/RestrictContentCacheCest.php
index 2c0abccc0..347d3315d 100644
--- a/tests/EndToEnd/restrict-content/general/RestrictContentCacheCest.php
+++ b/tests/EndToEnd/restrict-content/general/RestrictContentCacheCest.php
@@ -58,13 +58,10 @@ public function testRestrictContentLiteSpeedCache(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -146,13 +143,10 @@ public function testRestrictContentW3TotalCache(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -240,13 +234,10 @@ public function testRestrictContentWPFastestCache(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -333,13 +324,10 @@ public function testRestrictContentWPOptimize(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -419,13 +407,10 @@ public function testRestrictContentWPSuperCache(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -503,13 +488,10 @@ public function testRestrictContentWPRocketCache(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
diff --git a/tests/EndToEnd/restrict-content/general/RestrictContentFormCest.php b/tests/EndToEnd/restrict-content/general/RestrictContentFormCest.php
index a9934245d..44dd9499e 100644
--- a/tests/EndToEnd/restrict-content/general/RestrictContentFormCest.php
+++ b/tests/EndToEnd/restrict-content/general/RestrictContentFormCest.php
@@ -45,13 +45,10 @@ public function testRestrictContentByForm(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Form name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Add blocks.
@@ -95,13 +92,10 @@ public function testRestrictContentByFormWithLoginModal(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Form name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration:[
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Add blocks.
@@ -187,13 +181,10 @@ public function testRestrictContentContainerCSSClasses(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Form name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
 		// Add blocks.
diff --git a/tests/EndToEnd/restrict-content/general/RestrictContentTagCest.php b/tests/EndToEnd/restrict-content/general/RestrictContentTagCest.php
index 2762a9e56..5351b0169 100644
--- a/tests/EndToEnd/restrict-content/general/RestrictContentTagCest.php
+++ b/tests/EndToEnd/restrict-content/general/RestrictContentTagCest.php
@@ -45,13 +45,10 @@ public function testRestrictContentByTag(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
@@ -106,13 +103,9 @@ public function testRestrictContentByTagWithRequireLoginEnabled(EndToEndTester $
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+		$I->configurePluginSidebarSettings(
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
@@ -177,13 +170,10 @@ public function testRestrictContentByTagWithRecaptchaAndRequireLoginEnabled(EndT
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
@@ -242,13 +232,10 @@ public function testRestrictContentByTagUsingLoginModal(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
@@ -334,13 +321,10 @@ public function testRestrictContentContainerCSSClasses(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			'wp-convertkit-meta-box',
-			[
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
@@ -398,13 +382,10 @@ public function testRestrictContentByTagWithRecaptchaEnabled(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
@@ -459,13 +440,10 @@ public function testRestrictContentByTagWithRecaptchaEnabledWithHighMinimumScore
 		);
 
 		// Configure metabox's Restrict Content setting = Tag name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Add blocks.
diff --git a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
index a630481f3..4ac891328 100644
--- a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
+++ b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
@@ -74,11 +74,14 @@ public function testRestrictContentWhenDisabled(EndToEndTester $I)
 	 */
 	public function testNoRestrictContentOnPrivateCPT(EndToEndTester $I)
 	{
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
 		// Setup Kit Plugin, disabling JS.
 		$I->setupKitPluginDisableJS($I);
 
 		// Add the CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
+		$I->addClassicEditorPage(
 			$I,
 			postType: 'private',
 			title: 'Kit: Private: Restrict Content'
@@ -88,7 +91,10 @@ public function testNoRestrictContentOnPrivateCPT(EndToEndTester $I)
 		$I->dontSeeElementInDOM('#wp-convertkit-meta-box');
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -113,13 +119,10 @@ public function testRestrictContentByProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -161,14 +164,11 @@ public function testRestrictContentByProductWithAddTag(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'tag'              => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			tag: $_ENV['CONVERTKIT_API_TAG_NAME'],
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -214,13 +214,10 @@ public function testRestrictContentByProductWithGeneratedExcerpt(EndToEndTester
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -264,13 +261,10 @@ public function testRestrictContentModalByProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -320,13 +314,10 @@ public function testRestrictContentContainerCSSClasses(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
diff --git a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPageCest.php b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPageCest.php
index 9f14baba4..f6179b2be 100644
--- a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPageCest.php
+++ b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPageCest.php
@@ -81,13 +81,10 @@ public function testRestrictContentByProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -128,14 +125,11 @@ public function testRestrictContentByProductWithAddTag(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'tag'              => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			tag: $_ENV['CONVERTKIT_API_TAG_NAME'],
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -180,13 +174,10 @@ public function testRestrictContentByProductWithGeneratedExcerpt(EndToEndTester
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -229,13 +220,10 @@ public function testRestrictContentModalByProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -284,13 +272,10 @@ public function testRestrictContentContainerCSSClasses(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -338,13 +323,10 @@ public function testRestrictContentDisplaysNoticeWhenNoAccess(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -434,13 +416,10 @@ public function testRestrictContentWhenEditingWithFrontendPageBuilder(EndToEndTe
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Publish Page.
@@ -500,13 +479,10 @@ public function testRestrictContentUsingCrawler(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
diff --git a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPostCest.php b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPostCest.php
index 786f8d3bf..ce3f190ec 100644
--- a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPostCest.php
+++ b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductPostCest.php
@@ -83,13 +83,10 @@ public function testRestrictContentByProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -131,14 +128,11 @@ public function testRestrictContentByProductWithAddTag(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'tag'              => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			tag: $_ENV['CONVERTKIT_API_TAG_NAME'],
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -184,13 +178,9 @@ public function testRestrictContentByProductWithGeneratedExcerpt(EndToEndTester
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+		$I->configurePluginSidebarSettings(
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -240,13 +230,10 @@ public function testRestrictContentByProductWithDefinedExcerpt(EndToEndTester $I
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add member content only as a block.
@@ -302,13 +289,10 @@ public function testRestrictContentModalByProduct(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
@@ -358,13 +342,10 @@ public function testRestrictContentContainerCSSClasses(EndToEndTester $I)
 		);
 
 		// Configure metabox's Restrict Content setting = Product name.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form'             => [ 'select2', 'None' ],
-				'restrict_content' => [ 'select2', $_ENV['CONVERTKIT_API_PRODUCT_NAME'] ],
-			]
+			form: 'None',
+			restrictContent: $_ENV['CONVERTKIT_API_PRODUCT_NAME']
 		);
 
 		// Add blocks.
diff --git a/tests/EndToEnd/tags/PageTagCest.php b/tests/EndToEnd/tags/PageTagCest.php
index a696e4763..ac9615b0f 100644
--- a/tests/EndToEnd/tags/PageTagCest.php
+++ b/tests/EndToEnd/tags/PageTagCest.php
@@ -52,22 +52,10 @@ public function testAddNewPageUsingNoTag(EndToEndTester $I)
 			title: 'Kit: Page: Tag: 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',
-			]
-		);
-
 		// Configure metabox's Tag setting = None.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'tag' => [ 'select2', 'None' ],
-			]
+			tag: 'None',
 		);
 
 		// Publish Page.
@@ -108,12 +96,9 @@ public function testAddNewPageUsingDefinedTag(EndToEndTester $I)
 		);
 
 		// Configure metabox's Tag setting to the value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'tag' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			tag: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Publish Page.
@@ -151,12 +136,9 @@ public function testAddNewPageUsingDefinedTagWithInvalidSubscriberID(EndToEndTes
 		);
 
 		// Configure metabox's Tag setting to the value specified in the .env file.
-		$I->configureMetaboxSettings(
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'tag' => [ 'select2', $_ENV['CONVERTKIT_API_TAG_NAME'] ],
-			]
+			tag: $_ENV['CONVERTKIT_API_TAG_NAME']
 		);
 
 		// Publish Page.
diff --git a/tests/Support/Helper/Divi5Theme.php b/tests/Support/Helper/Divi5Theme.php
index 4a3077432..abbe61ad3 100644
--- a/tests/Support/Helper/Divi5Theme.php
+++ b/tests/Support/Helper/Divi5Theme.php
@@ -32,12 +32,9 @@ public function createDivi5Page($I, $title, $configureMetaBox = true)
 
 		// Configure metabox's Form setting = None, ensuring we only test the Divi block.
 		if ($configureMetaBox) {
-			$I->configureMetaboxSettings(
+			$I->configurePluginSidebarSettings(
 				$I,
-				'wp-convertkit-meta-box',
-				[
-					'form' => [ 'select2', 'None' ],
-				]
+				form: 'None'
 			);
 		}
 
diff --git a/tests/Support/Helper/DiviBuilder.php b/tests/Support/Helper/DiviBuilder.php
index 5c7ff3402..7b26f76c2 100644
--- a/tests/Support/Helper/DiviBuilder.php
+++ b/tests/Support/Helper/DiviBuilder.php
@@ -94,12 +94,9 @@ public function createDiviPageInFrontendEditor($I, $title, $configureMetaBox = t
 
 		// Configure metabox's Form setting = None, ensuring we only test the block in Gutenberg.
 		if ($configureMetaBox) {
-			$I->configureMetaboxSettings(
+			$I->configurePluginSidebarSettings(
 				$I,
-				'wp-convertkit-meta-box',
-				[
-					'form' => [ 'select2', 'None' ],
-				]
+				form: 'None'
 			);
 		}
 
diff --git a/tests/Support/Helper/WPClassicEditor.php b/tests/Support/Helper/WPClassicEditor.php
index 7972470a3..88efae643 100644
--- a/tests/Support/Helper/WPClassicEditor.php
+++ b/tests/Support/Helper/WPClassicEditor.php
@@ -30,6 +30,23 @@ public function addClassicEditorPage($I, $postType = 'page', $title = 'Classic E
 		$I->fillField('#title', $title);
 	}
 
+	/**
+	 * Adds a paragraph block when adding or editing a Page, Post or Custom Post Type
+	 * in the Classic Editor.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I      EndToEnd Tester.
+	 * @param   string         $text   Paragraph Text.
+	 * @param   string         $editor Target TinyMCE editor instance.
+	 */
+	public function addClassicEditorParagraph($I, $text, $editor = 'content')
+	{
+		// There's no way for Codeception to fill an iframe's contenteditable using fillField(),
+		// so use JS instead.
+		$I->executeJS("tinymce.get('" . $editor . "').insertContent('<p>" . $text . "</p>');");
+	}
+
 	/**
 	 * Add the given shortcode when adding or editing a Page, Post or Custom Post Type
 	 * in the Visual Editor (TinyMCE).
diff --git a/tests/Support/Helper/WPGutenberg.php b/tests/Support/Helper/WPGutenberg.php
index e1ae82bf1..3022b32ee 100644
--- a/tests/Support/Helper/WPGutenberg.php
+++ b/tests/Support/Helper/WPGutenberg.php
@@ -584,6 +584,52 @@ public function publishGutenbergPage($I)
 		return $I->clickPublishOnPrePublishChecksForGutenbergPage($I);
 	}
 
+	/**
+	 * Saves an existing published Page, Post or Custom Post Type,
+	 * loading it on the frontend web site.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I     EndToEnd Tester.
+	 * @return  string           $url   Page / Post URL.
+	 */
+	public function saveAndViewGutenbergPage($I)
+	{
+		// Save Gutenberg Page.
+		$url = $I->saveGutenbergPage($I);
+
+		// Load the Page on the frontend site.
+		$I->amOnUrl($url);
+
+		// Wait for frontend web site to load.
+		$I->waitForElementVisible('body');
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Return URL.
+		return $url;
+	}
+
+	/**
+	 * Save an existing published Page, Post or Custom Post Type.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I                      EndToEnd Tester.
+	 */
+	public function saveGutenbergPage($I)
+	{
+		// Click the Save button.
+		$I->click('.editor-post-publish-button__button');
+
+		// Wait for confirmation that the Page saved.
+		$I->waitForElementVisible('.components-external-link.components-snackbar__action', 30);
+
+		// Return URL from 'View page' link.
+		return $I->grabAttributeFrom('.components-external-link.components-snackbar__action', 'href');
+	}
+
 	/**
 	 * Clicks the Publish button the pre-publish checks sidebar, confirming the Page, Post or Custom Post Type
 	 * published and returning its URL.
@@ -611,6 +657,124 @@ function($I) {
 		return $I->grabAttributeFrom('.post-publish-panel__postpublish-buttons a.components-button', 'href');
 	}
 
+	/**
+	 * Configure the settings for the Plugin sidebar in Gutenberg.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I                EndToEnd Tester.
+	 * @param   string         $form             Form ID.
+	 * @param   string         $landingPage      Landing Page ID.
+	 * @param   string         $tag              Tag ID.
+	 * @param   string         $restrictContent  Restrict Content ID.
+	 */
+	public function configurePluginSidebarSettings($I, $form = false, $landingPage = false, $tag = false, $restrictContent = false)
+	{
+		// Open the Plugin sidebar settings.
+		$I->openPluginSidebarSettings($I);
+
+		// Gutenberg doesn't expose the field names as IDs.
+		// The index (#inspector-select-control-*) also changes between WordPress versions.
+		// Form.
+		if ( $form ) {
+			$I->waitForElementVisible('//label[text()="Form"]/following::select[1]');
+			$I->selectOption('//label[text()="Form"]/following::select[1]', $form);
+		}
+
+		// Landing Page.
+		if ( $landingPage ) {
+			$I->waitForElementVisible('//label[text()="Landing Page"]/following::select[1]');
+			$I->selectOption('//label[text()="Landing Page"]/following::select[1]', $landingPage);
+		}
+
+		// Tag.
+		if ( $tag ) {
+			$I->waitForElementVisible('//label[text()="Tag"]/following::select[1]');
+			$I->selectOption('//label[text()="Tag"]/following::select[1]', $tag);
+		}
+
+		// Restrict Content.
+		if ( $restrictContent ) {
+			$I->waitForElementVisible('//label[text()="Restrict Content"]/following::select[1]');
+			$I->selectOption('//label[text()="Restrict Content"]/following::select[1]', $restrictContent);
+		}
+
+		// Close the Plugin sidebar settings.
+		$I->closePluginSidebarSettings($I);
+	}
+
+	/**
+	 * Asserts that the given plugin sidebar setting is set to the given value.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I                      EndToEnd Tester.
+	 * @param   string         $setting                Setting Name (e.g. 'form').
+	 * @param   string         $value                  Setting Value (e.g. '12345').
+	 */
+	public function seePluginSidebarSetting($I, $setting, $value)
+	{
+		// Open the Plugin sidebar settings.
+		$I->openPluginSidebarSettings($I);
+
+		// Gutenberg doesn't expose the field names as IDs.
+		// The index (#inspector-select-control-*) also changes between WordPress versions.
+		switch ($setting) {
+			case 'form':
+				$I->waitForElementVisible('//label[text()="Form"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Form"]/following::select[1]', $value);
+				break;
+
+			case 'landing_page':
+				$I->waitForElementVisible('//label[text()="Landing Page"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Landing Page"]/following::select[1]', $value);
+				break;
+
+			case 'tag':
+				$I->waitForElementVisible('//label[text()="Tag"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Tag"]/following::select[1]', $value);
+				break;
+
+			case 'restrict_content':
+				$I->waitForElementVisible('//label[text()="Restrict Content"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Restrict Content"]/following::select[1]', $value);
+				break;
+		}
+
+		// Close the Plugin sidebar settings.
+		$I->closePluginSidebarSettings($I);
+	}
+
+	/**
+	 * Opens the Plugin sidebar settings.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I                      EndToEnd Tester.
+	 */
+	public function openPluginSidebarSettings($I)
+	{
+		// Click the Plugin sidebar button.
+		$I->waitForElementVisible('button[aria-label="Kit"]');
+		$I->click('button[aria-label="Kit"]');
+
+		// Wait for the Plugin sidebar to be fully loaded.
+		$I->waitForElementVisible('.editor-sidebar');
+	}
+
+	/**
+	 * Closes the Plugin sidebar settings.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @param   EndToEndTester $I                      EndToEnd Tester.
+	 */
+	public function closePluginSidebarSettings($I)
+	{
+		// Close the Plugin sidebar by opening the Page sidebar.
+		$I->click('.interface-pinned-items button[aria-label="Settings"]');
+	}
+
 	/**
 	 * Add a Page, Post or Custom Post Type directly to the WordPress database,
 	 * with dummy content used for testing.