From 3bfc54e9d70ecdaf09847787c143bb4511d30dad Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 16:43:45 +0800
Subject: [PATCH 01/18] Tests: Block Editor: Register Post Settings

---
 tests/Support/Helper/WPGutenberg.php | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/Support/Helper/WPGutenberg.php b/tests/Support/Helper/WPGutenberg.php
index e1ae82bf1..fe6017de3 100644
--- a/tests/Support/Helper/WPGutenberg.php
+++ b/tests/Support/Helper/WPGutenberg.php
@@ -611,6 +611,52 @@ 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.2.2
+	 *
+	 * @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)
+	{
+		// Click the Plugin sidebar button.
+		$I->waitForElementVisible('button[aria-controls="convertkit-post-settings:post-settings"]');
+		$I->click('button[aria-controls="convertkit-post-settings:post-settings"]');
+
+		// Wait for the Plugin sidebar to be fully loaded.
+		$I->waitForElementVisible('.editor-sidebar');
+
+		// Gutenberg doesn't expose the field names as IDs, so we need to use the index.
+		// Form.
+		if ( $form ) {
+			$I->waitForElementVisible('.editor-sidebar #inspector-select-control-0');
+			$I->selectOption('.editor-sidebar #inspector-select-control-0', $form);
+		}
+
+		// Landing Page.
+		if ( $landingPage ) {
+			$I->selectOption('#convertkit-post-settings:post-settings #inspector-select-control-1', $landingPage);
+		}
+
+		// Tag.
+		if ( $tag ) {
+			$I->selectOption('#convertkit-post-settings:post-settings #inspector-select-control-2', $tag);
+		}
+
+		// Restrict Content.
+		if ( $restrictContent ) {
+			$I->selectOption('#convertkit-post-settings:post-settings #inspector-select-control-3', $restrictContent);
+		}
+
+		// 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.

From ccf4d3e2b3b2dcb78e8f643090e423ebe9a96f03 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 16:43:53 +0800
Subject: [PATCH 02/18] Tests: Page Form

---
 .../forms/post-types/PageFormCest.php         | 137 ++++++------------
 1 file changed, 46 insertions(+), 91 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 7d58b1884..a75e66c1b 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -70,20 +70,17 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		// 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',
+			selectElement: '.editor-sidebar #inspector-select-control-0',
 			prependOptions: [
 				'Default',
 				'None',
 			]
 		);
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'Default' ],
-			]
+			form: 'Default'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -113,13 +110,10 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: Default'
 		);
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'Default' ],
-			]
+			form: 'Default'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -159,13 +153,10 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		// Add paragraph to Page.
 		$I->addGutenbergParagraphBlock($I, 'Page content');
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'Default' ],
-			]
+			form: 'Default'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -209,13 +200,10 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		// Add paragraph to Page.
 		$I->addGutenbergParagraphBlock($I, 'Page content');
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'Default' ],
-			]
+			form: 'Default'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -520,13 +508,10 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: Legacy: Default'
 		);
 
-		// Configure metabox's Form setting = Default.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'Default' ],
-			]
+			form: 'Default'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -559,13 +544,10 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: None'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = None.
+		$I->configurePluginSidebarSettings(
 			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
+			form: 'None'
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -595,13 +577,10 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar'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.
@@ -635,13 +614,10 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -683,13 +659,10 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -733,13 +706,10 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -782,13 +752,10 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -834,13 +801,10 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -888,13 +852,10 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -935,13 +896,10 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$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.
@@ -983,13 +941,10 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
 
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
+		// Configure Plugin Sidebar's Form setting = Legacy Form.
+		$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.

From 04ccb626b8003b495a1b311e241ba060d99baf3a Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 16:53:21 +0800
Subject: [PATCH 03/18] Create new cest for block editor pages

---
 .../post-types/PageFormBlockEditorCest.php    | 991 ++++++++++++++++++
 .../forms/post-types/PageFormCest.php         |   2 +-
 2 files changed, 992 insertions(+), 1 deletion(-)
 create mode 100644 tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php

diff --git a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
new file mode 100644
index 000000000..f06390cd1
--- /dev/null
+++ b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
@@ -0,0 +1,991 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests for Kit Forms on WordPress Pages when using the block editor.
+ *
+ * @since   3.2.2
+ */
+class PageFormBlockEditorCest
+{
+	/**
+	 * Run common actions before running the test functions in this class.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _before(EndToEndTester $I)
+	{
+		// Activate Kit plugin.
+		$I->activateKitPlugin($I);
+	}
+
+	/**
+	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and there is no Default Form specified in the Plugin
+	 * settings.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
+	{
+		// Setup Kit plugin with no default Forms configured.
+		$I->setupKitPluginNoDefaultForms($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default: None'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: 'Default'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: 'Default'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the Page content.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output before the Page content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form_position' => 'before_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default: Before Content'
+		);
+
+		// Add paragraph to Page.
+		$I->addGutenbergParagraphBlock($I, 'Page content');
+
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: 'Default'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM after the Page content.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_content'
+		);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to before and after the Page content.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output before and after the Page content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form_position' => 'before_after_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default: Before and After Content'
+		);
+
+		// Add paragraph to Page.
+		$I->addGutenbergParagraphBlock($I, 'Page content');
+
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: 'Default'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that two Kit Forms are output in the DOM before and after the Page content.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_after_content'
+		);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the third paragraph.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'p',
+			elementIndex: 3
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
+	 * result in a fatal error when creating and viewing a new WordPress Page, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Non-Inline Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the 2nd <h2> element.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 2nd <h2> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'h2',
+				'page_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 2nd H2 Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'h2',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the 2nd <img> element.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <img> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'img',
+				'page_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 2nd Image Element'
+		);
+
+		// View the Post on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <img> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'img',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to a number greater than the number of elements in the content.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 7rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 9,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the content, as
+		// the number of paragraphs is less than the position.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_content'
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Legacy Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Legacy: Default'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Default.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: 'Default'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Default Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+
+		// Confirm that the Legacy Form title's character encoding is correct.
+		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+	}
+
+	/**
+	 * Test that 'None' Form specified in the Page Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingNoForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: None'
+		);
+
+		// Configure Plugin Sidebar's Form setting = None.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: 'None'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
+	/**
+	 * Test that the Form specified in the Page Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
+		// Configure Plugin Sidebar's Form setting = Inline Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
+	}
+
+	/**
+	 * Test that the Modal Form is output once when the Autoptimize Plugin is active and
+	 * its "Defer JavaScript" setting is enabled.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester $I)
+	{
+		// Setup Plugin and Resources.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Autoptimize Plugin.
+		$I->activateThirdPartyPlugin($I, 'autoptimize');
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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,
+		// and that Autoptimize hasn't moved the script embed to the footer of the site.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate Autoptimize Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'autoptimize');
+	}
+
+	/**
+	 * Test that the Modal Form is output once when the Debloat Plugin is active and
+	 * its "Defer JavaScript" and "Delay All Scripts" settings are enabled.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin and Resources.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Debloat Plugin.
+		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
+		$I->activateThirdPartyPlugin($I, 'debloat');
+
+		// Enable Debloat's "Defer JavaScript" and "Delay All Scripts" settings.
+		$I->enableJSDeferDelayAllScriptsDebloatPlugin($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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,
+		// and that Debloat hasn't moved the script embed to the footer of the site.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate Debloat Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'debloat');
+		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
+	}
+
+	/**
+	 * Test that the Modal Form is output once when the Jetpack Boost Plugin is active and
+	 * its "Defer Non-Essential JavaScript" setting is enabled.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin and Resources.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Jetpack Boost Plugin.
+		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
+		$I->activateThirdPartyPlugin($I, 'jetpack-boost');
+
+		// Enable Jetpack Boost's "Defer Non-Essential JavaScript" setting.
+		$I->amOnAdminPage('admin.php?page=jetpack-boost');
+		$I->click('#inspector-toggle-control-1');
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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,
+		// and that Jetpack Boost hasn't moved the script embed to the footer of the site.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate Jetpack Boost Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'jetpack-boost');
+		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
+	}
+
+	/**
+	 * Test that the Modal Form is output once when the LiteSpeed Cache Plugin is active and
+	 * its "Load JS Deferred" setting is enabled.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate and enable LiteSpeed Cache Plugin.
+		$I->activateThirdPartyPlugin($I, 'litespeed-cache');
+		$I->enableCachingLiteSpeedCachePlugin($I);
+
+		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
+		$I->enableLiteSpeedCacheLoadJSDeferred($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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,
+		// and that LiteSpeed Cache hasn't moved the script embed to the footer of the site.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate LiteSpeed Cache Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'litespeed-cache');
+	}
+
+	/**
+	 * Test that the Modal Form <script> embed is output once when the Siteground Speed Optimizer Plugin is active
+	 * and its "Combine JavaScript Files" setting is enabled.
+	 *
+	 * @since   2.4.5
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin and Resources.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Siteground Speed Optimizer Plugin.
+		$I->activateThirdPartyPlugin($I, 'sg-cachepress');
+
+		// Configure Siteground Speed Optimizer's Heartbeat.
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_post_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_dashboard_interval', 120 );
+		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_frontend_interval', 120 );
+
+		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
+		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate Siteground Speed Optimizer Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'sg-cachepress');
+	}
+
+	/**
+	 * Test that the Modal Form is output once when the Perfmatters Plugin is active and its "Delay JavaScript"
+	 * setting is enabled.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin and Resources.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate Perfmatters Plugin.
+		$I->activateThirdPartyPlugin($I, 'perfmatters');
+
+		// Enable Defer and Delay JavaScript.
+		$I->haveOptionInDatabase(
+			'perfmatters_options',
+			[
+				'assets' => [
+					'defer_js'            => 1,
+					'delay_js'            => 1,
+					'delay_js_inclusions' => '',
+				],
+			]
+		);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM within the <main> element.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate Perfmatters Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'perfmatters');
+	}
+
+	/**
+	 * Test that the Modal Form is output once when the WP Rocket Plugin is active and its "Delay JavaScript execution"
+	 * setting is enabled.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin and Resources.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Activate WP Rocket Plugin.
+		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
+		$I->activateThirdPartyPlugin($I, 'wp-rocket');
+
+		// Configure WP Rocket.
+		$I->enableWPRocketDelayJS($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
+		);
+
+		// Configure Plugin Sidebar's Form setting = Modal Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM within the <main> element.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Deactivate WP Rocket Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'wp-rocket');
+		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
+	}
+
+	/**
+	 * Test that the Legacy Form specified in the Page Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'  => '',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+		);
+
+		// Configure Plugin Sidebar's Form setting = Legacy Form.
+		$I->configurePluginSidebarSettings(
+			$I,
+			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+
+		// Confirm that the Legacy Form title's character encoding is correct.
+		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+	}
+
+	/**
+	 * Test that the Default Form for Pages displays when an invalid Form ID is specified
+	 * for a Page.
+	 *
+	 * Whilst the on screen options won't permit selecting an invalid Form ID, a Page might
+	 * have an invalid Form ID because:
+	 * - the form belongs to another Kit account (i.e. API credentials were changed in the Plugin, but this Page's specified Form was not changed)
+	 * - the form was deleted from the Kit account.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Create Page, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
+		// a Form being deleted in Kit.
+		$pageID = $I->havePostInDatabase(
+			[
+				'post_type'  => 'page',
+				'post_title' => 'Kit: Page: Form: Specific: Invalid',
+				'meta_input' => [
+					'_wp_convertkit_post_meta' => [
+						'form'         => '11111',
+						'landing_page' => '',
+						'tag'          => '',
+					],
+				],
+			]
+		);
+
+		// Load the Page on the frontend site.
+		$I->amOnPage('/?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that the invalid Kit Form does not display.
+		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
+
+		// 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 and reset Plugin(s) after each test, if the test passes.
+	 * We don't use _after, as this would provide a screenshot of the Plugin
+	 * deactivation and not the true test error.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->deactivateKitPlugin($I);
+		$I->resetKitPlugin($I);
+	}
+}
diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index a75e66c1b..f2c7b44d0 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -70,7 +70,7 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		// Check the order of the Form resources are alphabetical, with the Default and None options prepending the Forms.
 		$I->checkSelectFormOptionOrder(
 			$I,
-			selectElement: '.editor-sidebar #inspector-select-control-0',
+			selectElement: '#wp-convertkit-form',
 			prependOptions: [
 				'Default',
 				'None',

From 060e577cc763438c39980cfeeab81ceb62139d56 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 16:53:41 +0800
Subject: [PATCH 04/18] Revert PageFormCest to original

---
 .../forms/post-types/PageFormCest.php         | 135 ++++++++++++------
 1 file changed, 90 insertions(+), 45 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index f2c7b44d0..7d58b1884 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -77,10 +77,13 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 			]
 		);
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = Default.
+		$I->configureMetaboxSettings(
 			$I,
-			form: 'Default'
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'Default' ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -110,10 +113,13 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: Default'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = Default.
+		$I->configureMetaboxSettings(
 			$I,
-			form: 'Default'
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'Default' ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -153,10 +159,13 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		// Add paragraph to Page.
 		$I->addGutenbergParagraphBlock($I, 'Page content');
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = Default.
+		$I->configureMetaboxSettings(
 			$I,
-			form: 'Default'
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'Default' ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -200,10 +209,13 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		// Add paragraph to Page.
 		$I->addGutenbergParagraphBlock($I, 'Page content');
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = Default.
+		$I->configureMetaboxSettings(
 			$I,
-			form: 'Default'
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'Default' ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -508,10 +520,13 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: Legacy: Default'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = Default.
+		$I->configureMetaboxSettings(
 			$I,
-			form: 'Default'
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'Default' ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -544,10 +559,13 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: None'
 		);
 
-		// Configure Plugin Sidebar's Form setting = None.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: 'None'
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'None' ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -577,10 +595,13 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
 
-		// Configure Plugin Sidebar's Form setting = Inline Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -614,10 +635,13 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -659,10 +683,13 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -706,10 +733,13 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -752,10 +782,13 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -801,10 +834,13 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -852,10 +888,13 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -896,10 +935,13 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.
@@ -941,10 +983,13 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
 
-		// Configure Plugin Sidebar's Form setting = Legacy Form.
-		$I->configurePluginSidebarSettings(
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
 			$I,
-			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
+			]
 		);
 
 		// Publish and view the Page on the frontend site.

From d1ad7f97a293a3b5e464735b8e4a921ba2ce0c7d Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 17:27:34 +0800
Subject: [PATCH 05/18] Page Form Tests

---
 .../post-types/PageFormBlockEditorCest.php    | 374 +-----------------
 .../forms/post-types/PageFormCest.php         |   2 +-
 2 files changed, 2 insertions(+), 374 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
index f06390cd1..999776940 100644
--- a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
@@ -5,7 +5,7 @@
 use Tests\Support\EndToEndTester;
 
 /**
- * Tests for Kit Forms on WordPress Pages when using the block editor.
+ * Tests the Form setting on WordPress Pages when using the block editor.
  *
  * @since   3.2.2
  */
@@ -559,329 +559,6 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
 	}
 
-	/**
-	 * Test that the Modal Form is output once when the Autoptimize Plugin is active and
-	 * its "Defer JavaScript" setting is enabled.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester $I)
-	{
-		// Setup Plugin and Resources.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate Autoptimize Plugin.
-		$I->activateThirdPartyPlugin($I, 'autoptimize');
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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,
-		// and that Autoptimize hasn't moved the script embed to the footer of the site.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate Autoptimize Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'autoptimize');
-	}
-
-	/**
-	 * Test that the Modal Form is output once when the Debloat Plugin is active and
-	 * its "Defer JavaScript" and "Delay All Scripts" settings are enabled.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin and Resources.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate Debloat Plugin.
-		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
-		$I->activateThirdPartyPlugin($I, 'debloat');
-
-		// Enable Debloat's "Defer JavaScript" and "Delay All Scripts" settings.
-		$I->enableJSDeferDelayAllScriptsDebloatPlugin($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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,
-		// and that Debloat hasn't moved the script embed to the footer of the site.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate Debloat Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'debloat');
-		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
-	}
-
-	/**
-	 * Test that the Modal Form is output once when the Jetpack Boost Plugin is active and
-	 * its "Defer Non-Essential JavaScript" setting is enabled.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin and Resources.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate Jetpack Boost Plugin.
-		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
-		$I->activateThirdPartyPlugin($I, 'jetpack-boost');
-
-		// Enable Jetpack Boost's "Defer Non-Essential JavaScript" setting.
-		$I->amOnAdminPage('admin.php?page=jetpack-boost');
-		$I->click('#inspector-toggle-control-1');
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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,
-		// and that Jetpack Boost hasn't moved the script embed to the footer of the site.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate Jetpack Boost Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'jetpack-boost');
-		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
-	}
-
-	/**
-	 * Test that the Modal Form is output once when the LiteSpeed Cache Plugin is active and
-	 * its "Load JS Deferred" setting is enabled.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate and enable LiteSpeed Cache Plugin.
-		$I->activateThirdPartyPlugin($I, 'litespeed-cache');
-		$I->enableCachingLiteSpeedCachePlugin($I);
-
-		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
-		$I->enableLiteSpeedCacheLoadJSDeferred($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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,
-		// and that LiteSpeed Cache hasn't moved the script embed to the footer of the site.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate LiteSpeed Cache Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'litespeed-cache');
-	}
-
-	/**
-	 * Test that the Modal Form <script> embed is output once when the Siteground Speed Optimizer Plugin is active
-	 * and its "Combine JavaScript Files" setting is enabled.
-	 *
-	 * @since   2.4.5
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin and Resources.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate Siteground Speed Optimizer Plugin.
-		$I->activateThirdPartyPlugin($I, 'sg-cachepress');
-
-		// Configure Siteground Speed Optimizer's Heartbeat.
-		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_post_interval', 120 );
-		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_dashboard_interval', 120 );
-		$I->haveOptionInDatabase('siteground_optimizer_heartbeat_frontend_interval', 120 );
-
-		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
-		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate Siteground Speed Optimizer Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'sg-cachepress');
-	}
-
-	/**
-	 * Test that the Modal Form is output once when the Perfmatters Plugin is active and its "Delay JavaScript"
-	 * setting is enabled.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin and Resources.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate Perfmatters Plugin.
-		$I->activateThirdPartyPlugin($I, 'perfmatters');
-
-		// Enable Defer and Delay JavaScript.
-		$I->haveOptionInDatabase(
-			'perfmatters_options',
-			[
-				'assets' => [
-					'defer_js'            => 1,
-					'delay_js'            => 1,
-					'delay_js_inclusions' => '',
-				],
-			]
-		);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM within the <main> element.
-		// This confirms that there is only one script on the page for this form, which renders the form.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate Perfmatters Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'perfmatters');
-	}
-
-	/**
-	 * Test that the Modal Form is output once when the WP Rocket Plugin is active and its "Delay JavaScript execution"
-	 * setting is enabled.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin and Resources.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Activate WP Rocket Plugin.
-		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
-		$I->activateThirdPartyPlugin($I, 'wp-rocket');
-
-		// Configure WP Rocket.
-		$I->enableWPRocketDelayJS($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
-		);
-
-		// Configure Plugin Sidebar's Form setting = Modal Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM within the <main> element.
-		// This confirms that there is only one script on the page for this form, which renders the form.
-		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Deactivate WP Rocket Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'wp-rocket');
-		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
-	}
-
 	/**
 	 * Test that the Legacy Form specified in the Page Settings works when
 	 * creating and viewing a new WordPress Page.
@@ -925,55 +602,6 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
 	}
 
-	/**
-	 * Test that the Default Form for Pages displays when an invalid Form ID is specified
-	 * for a Page.
-	 *
-	 * Whilst the on screen options won't permit selecting an invalid Form ID, a Page might
-	 * have an invalid Form ID because:
-	 * - the form belongs to another Kit account (i.e. API credentials were changed in the Plugin, but this Page's specified Form was not changed)
-	 * - the form was deleted from the Kit account.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Create Page, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
-		// a Form being deleted in Kit.
-		$pageID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'page',
-				'post_title' => 'Kit: Page: Form: Specific: Invalid',
-				'meta_input' => [
-					'_wp_convertkit_post_meta' => [
-						'form'         => '11111',
-						'landing_page' => '',
-						'tag'          => '',
-					],
-				],
-			]
-		);
-
-		// Load the Page on the frontend site.
-		$I->amOnPage('/?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that the invalid Kit Form does not display.
-		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
-
-		// 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 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 7d58b1884..a9ec49743 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -5,7 +5,7 @@
 use Tests\Support\EndToEndTester;
 
 /**
- * Tests for Kit Forms on WordPress Pages.
+ * Tests the Form setting on WordPress Pages when using the Classic Editor.
  *
  * @since   1.9.6
  */

From 13909f28508180c35e6aa42a6d46b5edcd3c3878 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 18:10:43 +0800
Subject: [PATCH 06/18] Remove configurePluginSidebarSettings = default

---
 .../post-types/PageFormBlockEditorCest.php    | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
index 999776940..fa5ad4293 100644
--- a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
@@ -45,12 +45,6 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 			title: 'Kit: Page: Form: Default: None'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: 'Default'
-		);
-
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
@@ -78,12 +72,6 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: Default'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: 'Default'
-		);
-
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
@@ -121,12 +109,6 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		// Add paragraph to Page.
 		$I->addGutenbergParagraphBlock($I, 'Page content');
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: 'Default'
-		);
-
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
@@ -168,12 +150,6 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		// Add paragraph to Page.
 		$I->addGutenbergParagraphBlock($I, 'Page content');
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: 'Default'
-		);
-
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 
@@ -476,12 +452,6 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 			title: 'Kit: Page: Form: Legacy: Default'
 		);
 
-		// Configure Plugin Sidebar's Form setting = Default.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: 'Default'
-		);
-
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
 

From 54f19f1f79ca972dd39b8bd1dbe9340d919385ba Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Wed, 11 Mar 2026 18:11:19 +0800
Subject: [PATCH 07/18] Page Form Tests: Use Classic Editor

---
 .../forms/post-types/PageFormCest.php         | 106 +++++++++---------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 07eede0f3..589e088e4 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -22,6 +22,7 @@ public function _before(EndToEndTester $I)
 	{
 		// Activate Kit plugin.
 		$I->activateKitPlugin($I);
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -61,8 +62,8 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		$I->setupKitPluginNoDefaultForms($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: Default: None'
 		);
@@ -78,7 +79,7 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		);
 
 		// 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]');
@@ -98,14 +99,14 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: Default'
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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.
@@ -132,17 +133,17 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: Default: Before Content'
 		);
 
 		// Add paragraph to Page.
-		$I->addGutenbergParagraphBlock($I, 'Page content');
+		$I->addClassicEditorParagraph($I, 'Page content');
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM after the Page content.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -173,17 +174,17 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: Default: Before and After Content'
 		);
 
 		// Add paragraph to Page.
-		$I->addGutenbergParagraphBlock($I, 'Page content');
+		$I->addClassicEditorParagraph($I, 'Page content');
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that two Kit Forms are output in the DOM before and after the Page content.
 		$I->seeFormOutput(
@@ -217,7 +218,7 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
+		$pageID = $I->addClassicEditorPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 3rd Paragraph Element'
 		);
@@ -271,7 +272,7 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
+		$pageID = $I->addClassicEditorPageToDatabase(
 			$I,
 			title: 'Kit: Page: Non-Inline Form: Default: After 3rd Paragraph Element'
 		);
@@ -320,7 +321,7 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
+		$pageID = $I->addClassicEditorPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 2nd H2 Element'
 		);
@@ -374,7 +375,7 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
+		$pageID = $I->addClassicEditorPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 2nd Image Element'
 		);
@@ -428,7 +429,7 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
+		$pageID = $I->addClassicEditorPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
 		);
@@ -478,14 +479,14 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: Legacy: Default'
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that the Kit Default Legacy Form displays.
 		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
@@ -508,8 +509,8 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: None'
 		);
@@ -524,7 +525,7 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		);
 
 		// 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]');
@@ -544,8 +545,8 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
@@ -560,7 +561,7 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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.
@@ -584,8 +585,8 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		// Activate Autoptimize Plugin.
 		$I->activateThirdPartyPlugin($I, 'autoptimize');
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
 		);
@@ -600,7 +601,7 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -632,8 +633,8 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		// Enable Debloat's "Defer JavaScript" and "Delay All Scripts" settings.
 		$I->enableJSDeferDelayAllScriptsDebloatPlugin($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
 		);
@@ -648,7 +649,7 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -682,8 +683,8 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		$I->amOnAdminPage('admin.php?page=jetpack-boost');
 		$I->click('#inspector-toggle-control-1');
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
 		);
@@ -698,7 +699,7 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -731,8 +732,8 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
 		$I->enableLiteSpeedCacheLoadJSDeferred($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
 		);
@@ -747,7 +748,7 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -783,8 +784,8 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
 		);
@@ -799,7 +800,7 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM.
 		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
@@ -837,8 +838,8 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 			]
 		);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
 		);
@@ -853,7 +854,7 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -884,8 +885,8 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		// Configure WP Rocket.
 		$I->enableWPRocketDelayJS($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
 		);
@@ -900,7 +901,7 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -932,8 +933,8 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
@@ -948,7 +949,7 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that the Kit Legacy Form displays.
 		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
@@ -1017,6 +1018,7 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 	 */
 	public function _passed(EndToEndTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 		$I->deactivateKitPlugin($I);
 		$I->resetKitPlugin($I);
 	}

From 63ed48e92b23ef360f74f0e9a7872c414fd6f141 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 14:06:35 +0800
Subject: [PATCH 08/18] Added `addClassicEditorParagraph` helper

---
 tests/Support/Helper/WPClassicEditor.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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).

From f3be0fde0d020cb68c4d56259d5e6eb286f9873d Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 15:10:20 +0800
Subject: [PATCH 09/18] Added editor switching test

---
 .../post-types/PageFormBlockEditorCest.php    |  83 +++++++++++
 tests/Support/Helper/WPGutenberg.php          | 134 ++++++++++++++++--
 2 files changed, 208 insertions(+), 9 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
index fa5ad4293..ab6c946d3 100644
--- a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
@@ -572,6 +572,89 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
 	}
 
+	/**
+	 * 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/Support/Helper/WPGutenberg.php b/tests/Support/Helper/WPGutenberg.php
index fe6017de3..1b5c4da27 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.
@@ -624,12 +670,8 @@ function($I) {
 	 */
 	public function configurePluginSidebarSettings($I, $form = false, $landingPage = false, $tag = false, $restrictContent = false)
 	{
-		// Click the Plugin sidebar button.
-		$I->waitForElementVisible('button[aria-controls="convertkit-post-settings:post-settings"]');
-		$I->click('button[aria-controls="convertkit-post-settings:post-settings"]');
-
-		// Wait for the Plugin sidebar to be fully loaded.
-		$I->waitForElementVisible('.editor-sidebar');
+		// Open the Plugin sidebar settings.
+		$I->openPluginSidebarSettings($I);
 
 		// Gutenberg doesn't expose the field names as IDs, so we need to use the index.
 		// Form.
@@ -640,19 +682,93 @@ public function configurePluginSidebarSettings($I, $form = false, $landingPage =
 
 		// Landing Page.
 		if ( $landingPage ) {
-			$I->selectOption('#convertkit-post-settings:post-settings #inspector-select-control-1', $landingPage);
+			$I->waitForElementVisible('.editor-sidebar #inspector-select-control1');
+			$I->selectOption('.editor-sidebar #inspector-select-control-1', $landingPage);
 		}
 
 		// Tag.
 		if ( $tag ) {
-			$I->selectOption('#convertkit-post-settings:post-settings #inspector-select-control-2', $tag);
+			$I->waitForElementVisible('.editor-sidebar #inspector-select-control-2');
+			$I->selectOption('.editor-sidebar #inspector-select-control-2', $tag);
 		}
 
 		// Restrict Content.
 		if ( $restrictContent ) {
-			$I->selectOption('#convertkit-post-settings:post-settings #inspector-select-control-3', $restrictContent);
+			$I->waitForElementVisible('.editor-sidebar #inspector-select-control-3');
+			$I->selectOption('.editor-sidebar #inspector-select-control-3', $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, so we need to use the index.
+		switch ($setting) {
+			case 'form':
+				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-0');
+				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-0', $value);
+				break;
+
+			case 'landing_page':
+				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-1');
+				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-1', $value);
+				break;
+
+			case 'tag':
+				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-2');
+				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-2', $value);
+				break;
+
+			case 'restrict_content':
+				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-3');
+				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-3', $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-controls="convertkit-post-settings:post-settings"]');
+		$I->click('button[aria-controls="convertkit-post-settings:post-settings"]');
+
+		// 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"]');
 	}

From f5e4c7ad02914a17ac7db9d812b1bd69300c9b74 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:12:43 +0800
Subject: [PATCH 10/18] Tests: Add FormBlockEditorCest

---
 .../forms/post-types/FormBlockEditorCest.php  | 778 ++++++++++++++++++
 .../post-types/PageFormBlockEditorCest.php    | 672 ---------------
 2 files changed, 778 insertions(+), 672 deletions(-)
 create mode 100644 tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php

diff --git a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
new file mode 100644
index 000000000..634307a37
--- /dev/null
+++ b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
@@ -0,0 +1,778 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests the Form setting on WordPress Pages, Posts and Custom Post Types when using the block editor.
+ *
+ * @since   3.2.2
+ */
+class FormBlockEditorCest
+{
+	/**
+	 * Post Types to test.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @var array
+	 */
+	private $postTypes = [
+		'page',
+		'post',
+		'article',
+	];
+
+	/**
+	 * Run common actions before running the test functions in this class.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _before(EndToEndTester $I)
+	{
+		// Activate Kit plugin.
+		$I->activateKitPlugin($I);
+
+		// Create Custom Post Types using the Custom Post Type UI Plugin.
+		$I->registerCustomPostTypes($I);
+	}
+
+	/**
+	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and there is no Default Form specified in the Plugin
+	 * settings.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
+	{
+		// Setup Kit plugin with no default Forms configured.
+		$I->setupKitPluginNoDefaultForms($I);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: None'
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($I);
+
+			// Confirm that no Kit Form is displayed.
+			$I->dontSeeElementInDOM('form[data-sv-form]');
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default'
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($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']);
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the Page content.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormBeforeContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output before the Page content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form_position' => 'before_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: Before Content'
+			);
+
+			// Add paragraph to Page.
+			$I->addGutenbergParagraphBlock($I, $postType . ' content');
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($I);
+
+			// Confirm that one Kit Form is output in the DOM after the Page content.
+			// This confirms that there is only one script on the page for this form, which renders the form.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'before_content'
+			);
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to before and after the Page content.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output before and after the Page content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form_position' => 'before_after_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: Before and After Content'
+			);
+
+			// Add paragraph to Page.
+			$I->addGutenbergParagraphBlock($I, $postType . ' content');
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($I);
+
+			// Confirm that two Kit Forms are output in the DOM before and after the Page content.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'before_after_content'
+			);
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 3,
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 3,
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'p',
+				'article_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addGutenbergPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 3rd Paragraph Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the third paragraph.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_element',
+				element: 'p',
+				elementIndex: 3
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
+	}
+
+	/**
+	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
+	 * result in a fatal error when creating and viewing a new WordPress Page, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 3,
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 3,
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'p',
+				'article_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addGutenbergPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Non-Inline Form: Default: After 3rd Paragraph Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the 2nd <h2> element.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 2nd <h2> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'h2',
+				'page_form_position_element_index' => 2,
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'h2',
+				'post_form_position_element_index' => 2,
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'h2',
+				'article_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addGutenbergPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 2nd H2 Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the second <h2> element.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_element',
+				element: 'h2',
+				elementIndex: 2
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to after the 2nd <img> element.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormAfterImageElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <img> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'img',
+				'page_form_position_element_index' => 2,
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'img',
+				'post_form_position_element_index' => 2,
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'img',
+				'article_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addGutenbergPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 2nd Image Element'
+			);
+
+			// View the Post on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the second <img> element.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_element',
+				element: 'img',
+				elementIndex: 2
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page, and its position is set
+	 * to a number greater than the number of elements in the content.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output after the 7rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 9,
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 9,
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'p',
+				'article_form_position_element_index' => 9,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addGutenbergPageToDatabase(
+				$I,
+				title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the content, as
+			// the number of paragraphs is less than the position.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_content'
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
+	}
+
+	/**
+	 * Test that the Default Legacy Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefaultLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'post_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'article_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Legacy: Default'
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($I);
+
+			// Confirm that the Kit Default Legacy Form displays.
+			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+
+			// Confirm that the Legacy Form title's character encoding is correct.
+			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+		}
+	}
+
+	/**
+	 * Test that 'None' Form specified in the Page Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingNoForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: None'
+			);
+
+			// Configure Plugin Sidebar's Form setting = None.
+			$I->configurePluginSidebarSettings(
+				$I,
+				form: 'None'
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($I);
+
+			// Confirm that no Kit Form is displayed.
+			$I->dontSeeElementInDOM('form[data-sv-form]');
+		}
+	}
+
+	/**
+	 * Test that the Form specified in the Page Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
+			);
+
+			// Configure Plugin Sidebar's Form setting = Inline Form.
+			$I->configurePluginSidebarSettings(
+				$I,
+				form: $_ENV['CONVERTKIT_API_FORM_NAME']
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($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']);
+		}
+	}
+
+	/**
+	 * Test that the Legacy Form specified in the Page Settings works when
+	 * creating and viewing a new WordPress Page.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewUsingDefinedLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'  => '',
+				'post_form'  => '',
+				'article_form'  => '',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Gutenberg editor.
+			$I->addGutenbergPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+			);
+
+			// Configure Plugin Sidebar's Form setting = Legacy Form.
+			$I->configurePluginSidebarSettings(
+				$I,
+				form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewGutenbergPage($I);
+
+			// Confirm that the Kit Legacy Form displays.
+			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+
+			// Confirm that the Legacy Form title's character encoding is correct.
+			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+		}
+	}
+
+	/**
+	 * 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);
+
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Activate Classic Editor Plugin.
+			$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': 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
+	 * deactivation and not the true test error.
+	 *
+	 * @since   3.2.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->unregisterCustomPostTypes($I);
+		$I->deactivateKitPlugin($I);
+		$I->resetKitPlugin($I);
+	}
+}
diff --git a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
deleted file mode 100644
index ab6c946d3..000000000
--- a/tests/EndToEnd/forms/post-types/PageFormBlockEditorCest.php
+++ /dev/null
@@ -1,672 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests the Form setting on WordPress Pages when using the block editor.
- *
- * @since   3.2.2
- */
-class PageFormBlockEditorCest
-{
-	/**
-	 * Run common actions before running the test functions in this class.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _before(EndToEndTester $I)
-	{
-		// Activate Kit plugin.
-		$I->activateKitPlugin($I);
-	}
-
-	/**
-	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and there is no Default Form specified in the Plugin
-	 * settings.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
-	{
-		// Setup Kit plugin with no default Forms configured.
-		$I->setupKitPluginNoDefaultForms($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default: None'
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default'
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the Page content.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output before the Page content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form_position' => 'before_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default: Before Content'
-		);
-
-		// Add paragraph to Page.
-		$I->addGutenbergParagraphBlock($I, 'Page content');
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM after the Page content.
-		// This confirms that there is only one script on the page for this form, which renders the form.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_content'
-		);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to before and after the Page content.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output before and after the Page content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form_position' => 'before_after_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default: Before and After Content'
-		);
-
-		// Add paragraph to Page.
-		$I->addGutenbergParagraphBlock($I, 'Page content');
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that two Kit Forms are output in the DOM before and after the Page content.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_after_content'
-		);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the third paragraph.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'p',
-			elementIndex: 3
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
-	 * result in a fatal error when creating and viewing a new WordPress Page, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Non-Inline Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the 2nd <h2> element.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 2nd <h2> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'h2',
-				'page_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 2nd H2 Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'h2',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the 2nd <img> element.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <img> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'img',
-				'page_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 2nd Image Element'
-		);
-
-		// View the Post on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <img> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'img',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to a number greater than the number of elements in the content.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 7rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 9,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the content, as
-		// the number of paragraphs is less than the position.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_content'
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Legacy Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Legacy: Default'
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Default Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-
-		// Confirm that the Legacy Form title's character encoding is correct.
-		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
-	}
-
-	/**
-	 * Test that 'None' Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingNoForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: None'
-		);
-
-		// Configure Plugin Sidebar's Form setting = None.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: 'None'
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-	}
-
-	/**
-	 * Test that the Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
-		);
-
-		// Configure Plugin Sidebar's Form setting = Inline Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_FORM_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
-	}
-
-	/**
-	 * Test that the Legacy Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'  => '',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-		);
-
-		// Configure Plugin Sidebar's Form setting = Legacy Form.
-		$I->configurePluginSidebarSettings(
-			$I,
-			form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-
-		// Confirm that the Legacy Form title's character encoding is correct.
-		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
-	}
-
-	/**
-	 * 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
-	 * deactivation and not the true test error.
-	 *
-	 * @since   3.2.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _passed(EndToEndTester $I)
-	{
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-	}
-}

From 0ff7a4a8983792d5b23b6ec5c1e16eb79bb73ccf Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:14:12 +0800
Subject: [PATCH 11/18] Revert PageFormCest

---
 .../forms/post-types/PageFormCest.php         | 108 +++++++++---------
 1 file changed, 53 insertions(+), 55 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 589e088e4..90873aa8c 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -5,7 +5,7 @@
 use Tests\Support\EndToEndTester;
 
 /**
- * Tests the Form setting on WordPress Pages when using the Classic Editor.
+ * Tests for Kit Forms on WordPress Pages.
  *
  * @since   1.9.6
  */
@@ -22,7 +22,6 @@ public function _before(EndToEndTester $I)
 	{
 		// Activate Kit plugin.
 		$I->activateKitPlugin($I);
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
@@ -62,8 +61,8 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		$I->setupKitPluginNoDefaultForms($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: Default: None'
 		);
@@ -79,7 +78,7 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that no Kit Form is displayed.
 		$I->dontSeeElementInDOM('form[data-sv-form]');
@@ -99,14 +98,14 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: Default'
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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.
@@ -133,17 +132,17 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: Default: Before Content'
 		);
 
 		// Add paragraph to Page.
-		$I->addClassicEditorParagraph($I, 'Page content');
+		$I->addGutenbergParagraphBlock($I, 'Page content');
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM after the Page content.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -174,17 +173,17 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: Default: Before and After Content'
 		);
 
 		// Add paragraph to Page.
-		$I->addClassicEditorParagraph($I, 'Page content');
+		$I->addGutenbergParagraphBlock($I, 'Page content');
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that two Kit Forms are output in the DOM before and after the Page content.
 		$I->seeFormOutput(
@@ -218,7 +217,7 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addClassicEditorPageToDatabase(
+		$pageID = $I->addGutenbergPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 3rd Paragraph Element'
 		);
@@ -272,7 +271,7 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addClassicEditorPageToDatabase(
+		$pageID = $I->addGutenbergPageToDatabase(
 			$I,
 			title: 'Kit: Page: Non-Inline Form: Default: After 3rd Paragraph Element'
 		);
@@ -321,7 +320,7 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addClassicEditorPageToDatabase(
+		$pageID = $I->addGutenbergPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 2nd H2 Element'
 		);
@@ -375,7 +374,7 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addClassicEditorPageToDatabase(
+		$pageID = $I->addGutenbergPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 2nd Image Element'
 		);
@@ -429,7 +428,7 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 		$I->setupKitPluginResources($I);
 
 		// Setup Page with placeholder content.
-		$pageID = $I->addClassicEditorPageToDatabase(
+		$pageID = $I->addGutenbergPageToDatabase(
 			$I,
 			title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
 		);
@@ -479,14 +478,14 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: Legacy: Default'
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that the Kit Default Legacy Form displays.
 		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
@@ -509,8 +508,8 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: None'
 		);
@@ -525,7 +524,7 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that no Kit Form is displayed.
 		$I->dontSeeElementInDOM('form[data-sv-form]');
@@ -545,8 +544,8 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
 		);
@@ -561,7 +560,7 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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.
@@ -585,8 +584,8 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		// Activate Autoptimize Plugin.
 		$I->activateThirdPartyPlugin($I, 'autoptimize');
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
 		);
@@ -601,7 +600,7 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -633,8 +632,8 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		// Enable Debloat's "Defer JavaScript" and "Delay All Scripts" settings.
 		$I->enableJSDeferDelayAllScriptsDebloatPlugin($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
 		);
@@ -649,7 +648,7 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -683,8 +682,8 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		$I->amOnAdminPage('admin.php?page=jetpack-boost');
 		$I->click('#inspector-toggle-control-1');
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
 		);
@@ -699,7 +698,7 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -732,8 +731,8 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
 		$I->enableLiteSpeedCacheLoadJSDeferred($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
 		);
@@ -748,7 +747,7 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -784,8 +783,8 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
 		);
@@ -800,7 +799,7 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM.
 		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
@@ -838,8 +837,8 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 			]
 		);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
 		);
@@ -854,7 +853,7 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -885,8 +884,8 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		// Configure WP Rocket.
 		$I->enableWPRocketDelayJS($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
 		);
@@ -901,7 +900,7 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -933,8 +932,8 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 		);
@@ -949,7 +948,7 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that the Kit Legacy Form displays.
 		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
@@ -1018,7 +1017,6 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 	 */
 	public function _passed(EndToEndTester $I)
 	{
-		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 		$I->deactivateKitPlugin($I);
 		$I->resetKitPlugin($I);
 	}

From 09328ed4abd760dad7022a3e6f3a717284608ec1 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:24:12 +0800
Subject: [PATCH 12/18] Added FormClassicEditorCest

---
 .../EndToEnd/forms/post-types/CPTFormCest.php | 775 ------------------
 .../forms/post-types/FormBlockEditorCest.php  |  47 +-
 ...FormCest.php => FormClassicEditorCest.php} | 770 +++++++++--------
 .../forms/post-types/PostFormCest.php         | 685 ----------------
 tests/Support/Helper/WPGutenberg.php          |   2 +-
 5 files changed, 476 insertions(+), 1803 deletions(-)
 delete mode 100644 tests/EndToEnd/forms/post-types/CPTFormCest.php
 rename tests/EndToEnd/forms/post-types/{PageFormCest.php => FormClassicEditorCest.php} (55%)
 delete mode 100644 tests/EndToEnd/forms/post-types/PostFormCest.php

diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
deleted file mode 100644
index fbefdf635..000000000
--- a/tests/EndToEnd/forms/post-types/CPTFormCest.php
+++ /dev/null
@@ -1,775 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for WordPress Custom Post Types (CPTs).
- *
- * @since   2.3.5
- */
-class CPTFormCest
-{
-	/**
-	 * Run common actions before running the test functions in this class.
-	 *
-	 * @since   2.3.5
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _before(EndToEndTester $I)
-	{
-		// Activate Kit plugin.
-		$I->activateKitPlugin($I);
-
-		// Setup Kit plugin .
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Create Custom Post Types using the Custom Post Type UI Plugin.
-		$I->registerCustomPostTypes($I);
-	}
-
-	/**
-	 * Test that the Articles > Add New screen has expected a11y output, such as label[for].
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAccessibility(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Navigate to Post Type (e.g. Pages / Posts) > Add New.
-		$I->amOnAdminPage('post-new.php?post_type=article');
-
-		// Confirm that settings have label[for] attributes.
-		$I->seeInSource('<label for="wp-convertkit-form">');
-		$I->seeInSource('<label for="wp-convertkit-tag">');
-	}
-
-	/**
-	 * Tests that:
-	 * - no Kit options are displayed when adding a new private Custom Post Type,
-	 * - no debug output is displayed when viewing a private Custom Post Type.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testNoOptionsOrOutputOnPrivateCustomPostType(EndToEndTester $I)
-	{
-		// Add a Private CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'private',
-			title: 'Kit: Private: Form: None'
-		);
-
-		// Check that the metabox is not displayed.
-		$I->dontSeeElementInDOM('#wp-convertkit-meta-box');
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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()');
-	}
-
-	/**
-	 * Tests that no Kit options are display when quick or bulk editing in a private Custom Post Type.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testNoBulkOrQuickEditOptionsOnPrivateCustomPostType(EndToEndTester $I)
-	{
-		// Programmatically create two Private CPTs.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'private',
-					'post_title' => 'Kit: Private: #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'private',
-					'post_title' => 'Kit: Private: #2',
-				]
-			),
-		);
-
-		// Navigate to Private CPT.
-		$I->amOnAdminPage('edit.php?post_type=private');
-
-		// Confirm no Bulk or Quick Edit settings are available.
-		$I->dontSeeElementInDOM('#convertkit-bulk-edit');
-		$I->dontSeeElementInDOM('#convertkit-quick-edit');
-	}
-
-	/**
-	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and there is no Default Form specified in the Plugin
-	 * settings.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin, without defining default Forms.
-		$I->setupKitPluginNoDefaultForms($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			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);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default'
-		);
-
-		// Publish and view the CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and its position is set
-	 * to after the CPT content.
-	 *
-	 * @since   2.5.8
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormBeforeContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output before the CPT content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'          => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position' => 'before_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default: Before Content'
-		);
-
-		// Add paragraph to CPT.
-		$I->addGutenbergParagraphBlock($I, 'CPT content');
-
-		// Publish and view the CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM after the CPT content.
-		// This confirms that there is only one script on the CPT for this form, which renders the form.
-		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID'], 'before_content');
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and its position is set
-	 * to before and after the CPT content.
-	 *
-	 * @since   2.5.9
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output before and after the CPT content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'          => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position' => 'before_after_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default: Before and After Content'
-		);
-
-		// Add paragraph to CPT.
-		$I->addGutenbergParagraphBlock($I, 'CPT content');
-
-		// Publish and view the CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that two Kit Forms are output in the DOM before and after the CPT content.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_after_content'
-		);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Article with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the CPT on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the third paragraph.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'p',
-			elementIndex: 3
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
-	 * result in a fatal error when creating and viewing a new WordPress CPT, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   2.6.8
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup CPT with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Non-Inline Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and its position is set
-	 * to after the 2nd <h2> element.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output after the 2nd <h2> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'h2',
-				'article_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Article with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default: After 2nd H2 Element'
-		);
-
-		// View the CPT on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'h2',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and its position is set
-	 * to after the 2nd <img> element.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormAfterImageElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output after the 2nd <img> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'img',
-				'article_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Article with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default: After 2nd Image Element'
-		);
-
-		// View the CPT on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <img> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'img',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT, and its position is set
-	 * to a number greater than the number of elements in the content.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for CPTs set to be output after the 7th paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 9,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Article with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Default: After 9th Paragraph Element'
-		);
-
-		// View the CPT on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the content, as
-		// the number of paragraphs is less than the position.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_content'
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Legacy Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress CPT.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefaultLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
-				'article_form' => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: Legacy: Default'
-		);
-
-		// Publish and view the CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Default Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-	}
-
-	/**
-	 * Test that 'None' Form specified in the CPT Settings works when
-	 * creating and viewing a new WordPress CPT.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingNoForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: None'
-		);
-
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
-		);
-
-		// Publish and view the CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-	}
-
-	/**
-	 * Test that the Form specified in the CPT Settings works when
-	 * creating and viewing a new WordPress CPT.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: ' . $_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 CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
-	}
-
-	/**
-	 * Test that the Legacy Form specified in the CPT Settings works when
-	 * creating and viewing a new WordPress CPT.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingDefinedLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
-				'article_form' => '',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a CPT using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'article',
-			title: 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-		);
-
-		// Configure metabox's Form setting = Legacy Form.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
-		);
-
-		// Publish and view the CPT on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-	}
-
-	/**
-	 * Test that the Default Form for CPTs displays when an invalid Form ID is specified
-	 * for a CPT.
-	 *
-	 * Whilst the on screen options won't permit selecting an invalid Form ID, a CPT might
-	 * have an invalid Form ID because:
-	 * - the form belongs to another Kit account (i.e. API credentials were changed in the Plugin, but this CPT's specified Form was not changed)
-	 * - the form was deleted from the Kit account.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewCPTUsingInvalidDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Create CPT, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
-		// a Form being deleted in Kit.
-		$postID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'article',
-				'post_title' => 'Kit: CPT: Form: Specific: Invalid',
-				'meta_input' => [
-					'_wp_convertkit_post_meta' => [
-						'form'         => '11111',
-						'landing_page' => '',
-						'tag'          => '',
-					],
-				],
-			]
-		);
-
-		// Load the CPT on the frontend site.
-		$I->amOnPage('/?p=' . $postID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that the invalid Kit Form does not display.
-		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
-
-		// 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 and reset Plugin(s) after each test, if the test passes.
-	 * We don't use _after, as this would provide a screenshot of the Plugin
-	 * deactivation and not the true test error.
-	 *
-	 * @since   2.4.3.7
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _passed(EndToEndTester $I)
-	{
-		$I->unregisterCustomPostTypes($I);
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-	}
-}
diff --git a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
index 634307a37..783ce4444 100644
--- a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
@@ -7,14 +7,14 @@
 /**
  * Tests the Form setting on WordPress Pages, Posts and Custom Post Types when using the block editor.
  *
- * @since   3.2.2
+ * @since   3.3.0
  */
 class FormBlockEditorCest
 {
 	/**
 	 * Post Types to test.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @var array
 	 */
@@ -27,7 +27,7 @@ class FormBlockEditorCest
 	/**
 	 * Run common actions before running the test functions in this class.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -45,7 +45,7 @@ public function _before(EndToEndTester $I)
 	 * creating and viewing a new WordPress Page, and there is no Default Form specified in the Plugin
 	 * settings.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -76,7 +76,7 @@ public function testAddNewUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(End
 	 * Test that the Default Form specified in the Plugin Settings works when
 	 * creating and viewing a new WordPress Page.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -109,7 +109,7 @@ public function testAddNewUsingDefaultForm(EndToEndTester $I)
 	 * creating and viewing a new WordPress Page, and its position is set
 	 * to after the Page content.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -154,7 +154,7 @@ public function testAddNewUsingDefaultFormBeforeContent(EndToEndTester $I)
 	 * creating and viewing a new WordPress Page, and its position is set
 	 * to before and after the Page content.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -198,7 +198,7 @@ public function testAddNewUsingDefaultFormBeforeAndAfterContent(EndToEndTester $
 	 * creating and viewing a new WordPress Page, and its position is set
 	 * to after the 3rd paragraph.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -212,9 +212,11 @@ public function testAddNewUsingDefaultFormAfterParagraphElement(EndToEndTester $
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'p',
 				'page_form_position_element_index' => 3,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'post_form_position'               => 'after_element',
 				'post_form_position_element'       => 'p',
 				'post_form_position_element_index' => 3,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'article_form_position'            => 'after_element',
 				'article_form_position_element'    => 'p',
 				'article_form_position_element_index' => 3,
@@ -262,7 +264,7 @@ public function testAddNewUsingDefaultFormAfterParagraphElement(EndToEndTester $
 	 * result in a fatal error when creating and viewing a new WordPress Page, and its position is set
 	 * to after the 3rd paragraph.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -276,9 +278,11 @@ public function testAddNewUsingDefaultNonInlineFormAfterParagraphElement(EndToEn
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'p',
 				'page_form_position_element_index' => 3,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
 				'post_form_position'               => 'after_element',
 				'post_form_position_element'       => 'p',
 				'post_form_position_element_index' => 3,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
 				'article_form_position'            => 'after_element',
 				'article_form_position_element'    => 'p',
 				'article_form_position_element_index' => 3,
@@ -321,7 +325,7 @@ public function testAddNewUsingDefaultNonInlineFormAfterParagraphElement(EndToEn
 	 * creating and viewing a new WordPress Page, and its position is set
 	 * to after the 2nd <h2> element.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -335,9 +339,11 @@ public function testAddNewUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'h2',
 				'page_form_position_element_index' => 2,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'post_form_position'               => 'after_element',
 				'post_form_position_element'       => 'h2',
 				'post_form_position_element_index' => 2,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'article_form_position'            => 'after_element',
 				'article_form_position_element'    => 'h2',
 				'article_form_position_element_index' => 2,
@@ -385,7 +391,7 @@ public function testAddNewUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
 	 * creating and viewing a new WordPress Page, and its position is set
 	 * to after the 2nd <img> element.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -399,9 +405,11 @@ public function testAddNewUsingDefaultFormAfterImageElement(EndToEndTester $I)
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'img',
 				'page_form_position_element_index' => 2,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'post_form_position'               => 'after_element',
 				'post_form_position_element'       => 'img',
 				'post_form_position_element_index' => 2,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'article_form_position'            => 'after_element',
 				'article_form_position_element'    => 'img',
 				'article_form_position_element_index' => 2,
@@ -449,7 +457,7 @@ public function testAddNewUsingDefaultFormAfterImageElement(EndToEndTester $I)
 	 * creating and viewing a new WordPress Page, and its position is set
 	 * to a number greater than the number of elements in the content.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -463,9 +471,11 @@ public function testAddNewUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'p',
 				'page_form_position_element_index' => 9,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'post_form_position'               => 'after_element',
 				'post_form_position_element'       => 'p',
 				'post_form_position_element_index' => 9,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
 				'article_form_position'            => 'after_element',
 				'article_form_position_element'    => 'p',
 				'article_form_position_element_index' => 9,
@@ -478,7 +488,8 @@ public function testAddNewUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester
 			// Setup Page with placeholder content.
 			$pageID = $I->addGutenbergPageToDatabase(
 				$I,
-				title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 9th Paragraph Element'
 			);
 
 			// View the Page on the frontend site.
@@ -510,7 +521,7 @@ public function testAddNewUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester
 	 * Test that the Default Legacy Form specified in the Plugin Settings works when
 	 * creating and viewing a new WordPress Page.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -553,7 +564,7 @@ public function testAddNewUsingDefaultLegacyForm(EndToEndTester $I)
 	 * Test that 'None' Form specified in the Page Settings works when
 	 * creating and viewing a new WordPress Page.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -590,7 +601,7 @@ public function testAddNewUsingNoForm(EndToEndTester $I)
 	 * Test that the Form specified in the Page Settings works when
 	 * creating and viewing a new WordPress Page.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -628,7 +639,7 @@ public function testAddNewUsingDefinedForm(EndToEndTester $I)
 	 * Test that the Legacy Form specified in the Page Settings works when
 	 * creating and viewing a new WordPress Page.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
@@ -765,7 +776,7 @@ public function testFormSettingsPreservedWhenSwitchingEditors(EndToEndTester $I)
 	 * We don't use _after, as this would provide a screenshot of the Plugin
 	 * deactivation and not the true test error.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
similarity index 55%
rename from tests/EndToEnd/forms/post-types/PageFormCest.php
rename to tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
index 90873aa8c..83e40e9cf 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
@@ -5,12 +5,25 @@
 use Tests\Support\EndToEndTester;
 
 /**
- * Tests for Kit Forms on WordPress Pages.
+ * Tests the Form setting on WordPress Pages, Posts and Custom Post Types when using the Classic Editor.
  *
  * @since   1.9.6
  */
-class PageFormCest
+class FormClassicEditorCest
 {
+	/**
+	 * Post Types to test.
+	 *
+	 * @since   3.3.0
+	 *
+	 * @var array
+	 */
+	private $postTypes = [
+		'page',
+		'post',
+		'article',
+	];
+
 	/**
 	 * Run common actions before running the test functions in this class.
 	 *
@@ -22,6 +35,12 @@ public function _before(EndToEndTester $I)
 	{
 		// Activate Kit plugin.
 		$I->activateKitPlugin($I);
+
+		// Activate Classic Editor Plugin.
+		$I->activateThirdPartyPlugin($I, 'classic-editor');
+
+		// Create Custom Post Types using the Custom Post Type UI Plugin.
+		$I->registerCustomPostTypes($I);
 	}
 
 	/**
@@ -61,27 +80,31 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		$I->setupKitPluginNoDefaultForms($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			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);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': 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->publishAndViewClassicEditorPage($I);
+
+			// Confirm that no Kit Form is displayed.
+			$I->dontSeeElementInDOM('form[data-sv-form]');
+		}
 	}
 
 	/**
@@ -98,18 +121,22 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default'
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default'
+			);
+
+			// 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']);
+		}
 	}
 
 	/**
@@ -132,25 +159,29 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default: Before Content'
-		);
-
-		// Add paragraph to Page.
-		$I->addGutenbergParagraphBlock($I, 'Page content');
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM after the Page content.
-		// This confirms that there is only one script on the page for this form, which renders the form.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_content'
-		);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: Before Content'
+			);
+
+			// Add paragraph to Page.
+			$I->addClassicEditorParagraph($I, $postType . ' content');
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewClassicEditorPage($I);
+
+			// Confirm that one Kit Form is output in the DOM after the Page content.
+			// This confirms that there is only one script on the page for this form, which renders the form.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'before_content'
+			);
+		}
 	}
 
 	/**
@@ -169,28 +200,34 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 			$I,
 			[
 				'page_form_position' => 'before_after_content',
+				'post_form_position' => 'before_after_content',
+				'article_form_position' => 'before_after_content',
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Default: Before and After Content'
-		);
-
-		// Add paragraph to Page.
-		$I->addGutenbergParagraphBlock($I, 'Page content');
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that two Kit Forms are output in the DOM before and after the Page content.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_after_content'
-		);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: Before and After Content'
+			);
+
+			// Add paragraph to Page.
+			$I->addClassicEditorParagraph($I, $postType . ' content');
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewClassicEditorPage($I);
+
+			// Confirm that two Kit Forms are output in the DOM before and after the Page content.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'before_after_content'
+			);
+		}
 	}
 
 	/**
@@ -212,39 +249,51 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'p',
 				'page_form_position_element_index' => 3,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 3,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'p',
+				'article_form_position_element_index' => 3,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the third paragraph.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'p',
-			elementIndex: 3
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addClassicEditorPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 3rd Paragraph Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the third paragraph.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_element',
+				element: 'p',
+				elementIndex: 3
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
 	}
 
 	/**
@@ -266,34 +315,46 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'p',
 				'page_form_position_element_index' => 3,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 3,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'p',
+				'article_form_position_element_index' => 3,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Non-Inline Form: Default: After 3rd Paragraph Element'
-		);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addClassicEditorPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Non-Inline Form: Default: After 3rd Paragraph Element'
+			);
 
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
 
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+			// 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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
 
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
 
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
 
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
 	}
 
 	/**
@@ -315,39 +376,51 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'h2',
 				'page_form_position_element_index' => 2,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'h2',
+				'post_form_position_element_index' => 2,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'h2',
+				'article_form_position_element_index' => 2,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 2nd H2 Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'h2',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addClassicEditorPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 2nd H2 Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the second <h2> element.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_element',
+				element: 'h2',
+				elementIndex: 2
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
 	}
 
 	/**
@@ -369,39 +442,51 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'img',
 				'page_form_position_element_index' => 2,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'img',
+				'post_form_position_element_index' => 2,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'img',
+				'article_form_position_element_index' => 2,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 2nd Image Element'
-		);
-
-		// View the Post on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <img> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'img',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addClassicEditorPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Default: After 2nd Image Element'
+			);
+
+			// View the Post on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the second <img> element.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_element',
+				element: 'img',
+				elementIndex: 2
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
 	}
 
 	/**
@@ -423,38 +508,50 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 				'page_form_position'               => 'after_element',
 				'page_form_position_element'       => 'p',
 				'page_form_position_element_index' => 9,
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 9,
+				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'            => 'after_element',
+				'article_form_position_element'    => 'p',
+				'article_form_position_element_index' => 9,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Setup Page with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the content, as
-		// the number of paragraphs is less than the position.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_content'
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Setup Page with placeholder content.
+			$pageID = $I->addClassicEditorPageToDatabase(
+				$I,
+				postType: $postType,
+				title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
+			);
+
+			// View the Page on the frontend site.
+			$I->amOnPage('?p=' . $pageID);
+
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
+
+			// Confirm that one Kit Form is output in the DOM after the content, as
+			// the number of paragraphs is less than the position.
+			$I->seeFormOutput(
+				$I,
+				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+				position: 'after_content'
+			);
+
+			// Confirm character encoding is not broken due to using DOMDocument.
+			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+			// Confirm no meta tag exists within the content.
+			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+		}
 	}
 
 	/**
@@ -474,24 +571,30 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
 				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
 				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'post_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'article_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: Legacy: Default'
-		);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: Legacy: Default'
+			);
 
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewClassicEditorPage($I);
 
-		// Confirm that the Kit Default Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+			// Confirm that the Kit Default Legacy Form displays.
+			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
 
-		// Confirm that the Legacy Form title's character encoding is correct.
-		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+			// Confirm that the Legacy Form title's character encoding is correct.
+			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+		}
 	}
 
 	/**
@@ -508,26 +611,30 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: None'
-		);
-
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: None'
+			);
+
+			// Configure metabox's Form setting = None.
+			$I->configureMetaboxSettings(
+				$I,
+				metabox: 'wp-convertkit-meta-box',
+				configuration: [
+					'form' => [ 'select2', 'None' ],
+				]
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewClassicEditorPage($I);
+
+			// Confirm that no Kit Form is displayed.
+			$I->dontSeeElementInDOM('form[data-sv-form]');
+		}
 	}
 
 	/**
@@ -544,27 +651,31 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_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->publishAndViewGutenbergPage($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']);
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: ' . $_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']);
+		}
 	}
 
 	/**
@@ -584,8 +695,8 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		// Activate Autoptimize Plugin.
 		$I->activateThirdPartyPlugin($I, 'autoptimize');
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
 		);
@@ -600,7 +711,7 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -632,8 +743,8 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		// Enable Debloat's "Defer JavaScript" and "Delay All Scripts" settings.
 		$I->enableJSDeferDelayAllScriptsDebloatPlugin($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
 		);
@@ -648,7 +759,7 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -682,8 +793,8 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		$I->amOnAdminPage('admin.php?page=jetpack-boost');
 		$I->click('#inspector-toggle-control-1');
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
 		);
@@ -698,7 +809,7 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -731,8 +842,8 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
 		$I->enableLiteSpeedCacheLoadJSDeferred($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
 		);
@@ -747,7 +858,7 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$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,
@@ -783,8 +894,8 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
 		);
@@ -799,7 +910,7 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM.
 		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
@@ -837,8 +948,8 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 			]
 		);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
 		);
@@ -853,7 +964,7 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -884,8 +995,8 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		// Configure WP Rocket.
 		$I->enableWPRocketDelayJS($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
+		// Add a Page using the Classic Editor.
+		$I->addClassicEditorPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
 		);
@@ -900,7 +1011,7 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
+		$I->publishAndViewClassicEditorPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -928,33 +1039,39 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
 				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
 				'page_form'  => '',
+				'post_form'  => '',
+				'article_form'  => '',
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Add a Page using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-		);
-
-		// Configure metabox's Form setting = Legacy Form.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
-		);
-
-		// Publish and view the Page on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-
-		// Confirm that the Legacy Form title's character encoding is correct.
-		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Add a Page using the Classic Editor.
+			$I->addClassicEditorPage(
+				$I,
+				postType: $postType,
+				title: 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+			);
+
+			// Configure metabox's Form setting = Legacy Form.
+			$I->configureMetaboxSettings(
+				$I,
+				metabox: 'wp-convertkit-meta-box',
+				configuration: [
+					'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
+				]
+			);
+
+			// Publish and view the Page on the frontend site.
+			$I->publishAndViewClassicEditorPage($I);
+
+			// Confirm that the Kit Legacy Form displays.
+			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+
+			// Confirm that the Legacy Form title's character encoding is correct.
+			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
+		}
 	}
 
 	/**
@@ -976,34 +1093,37 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Create Page, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
-		// a Form being deleted in Kit.
-		$pageID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'page',
-				'post_title' => 'Kit: Page: Form: Specific: Invalid',
-				'meta_input' => [
-					'_wp_convertkit_post_meta' => [
-						'form'         => '11111',
-						'landing_page' => '',
-						'tag'          => '',
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Create Page, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
+			// a Form being deleted in Kit.
+			$pageID = $I->havePostInDatabase(
+				[
+					'post_type'  => $postType,
+					'post_title' => 'Kit: ' . $postType . ': Form: Specific: Invalid',
+					'meta_input' => [
+						'_wp_convertkit_post_meta' => [
+							'form'         => '11111',
+							'landing_page' => '',
+							'tag'          => '',
+						],
 					],
-				],
-			]
-		);
+				]
+			);
 
-		// Load the Page on the frontend site.
-		$I->amOnPage('/?p=' . $pageID);
+			// Load the Page on the frontend site.
+			$I->amOnPage('/?p=' . $pageID);
 
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
+			// Check that no PHP warnings or notices were output.
+			$I->checkNoWarningsAndNoticesOnScreen($I);
 
-		// Confirm that the invalid Kit Form does not display.
-		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
+			// Confirm that the invalid Kit Form does not display.
+			$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
 
-		// 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']);
+			// 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']);
+		}
 	}
 
 	/**
@@ -1017,6 +1137,8 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 	 */
 	public function _passed(EndToEndTester $I)
 	{
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
+		$I->unregisterCustomPostTypes($I);
 		$I->deactivateKitPlugin($I);
 		$I->resetKitPlugin($I);
 	}
diff --git a/tests/EndToEnd/forms/post-types/PostFormCest.php b/tests/EndToEnd/forms/post-types/PostFormCest.php
deleted file mode 100644
index 698d1870f..000000000
--- a/tests/EndToEnd/forms/post-types/PostFormCest.php
+++ /dev/null
@@ -1,685 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for Kit Forms on WordPress Posts.
- *
- * @since   1.9.6
- */
-class PostFormCest
-{
-	/**
-	 * Run common actions before running the test functions in this class.
-	 *
-	 * @since   1.9.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _before(EndToEndTester $I)
-	{
-		// Activate and Setup Kit plugin.
-		$I->activateKitPlugin($I);
-	}
-
-	/**
-	 * Test that the Posts > Add New screen has expected a11y output, such as label[for].
-	 *
-	 * @since   1.9.7.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAccessibility(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Navigate to Post Type (e.g. Pages / Posts) > Add New.
-		$I->amOnAdminPage('post-new.php?post_type=post');
-
-		// Confirm that settings have label[for] attributes.
-		$I->seeInSource('<label for="wp-convertkit-form">');
-		$I->seeInSource('<label for="wp-convertkit-tag">');
-	}
-
-	/**
-	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and there is no Default Form specified in the Plugin
-	 * settings.
-	 *
-	 * @since   1.9.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
-	{
-		// Setup Plugin, without defining default Forms.
-		$I->setupKitPluginNoDefaultForms($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			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);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post.
-	 *
-	 * @since   1.9.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default'
-		);
-
-		// Publish and view the Post on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and its position is set
-	 * to after the Post content.
-	 *
-	 * @since   2.5.8
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormBeforeContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output before the Post content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form_position' => 'before_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default: Before Content'
-		);
-
-		// Add paragraph to Post.
-		$I->addGutenbergParagraphBlock($I, 'Post content');
-
-		// Publish and view the Post on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that one Kit Form is output in the DOM after the Post content.
-		// This confirms that there is only one script on the post for this form, which renders the form.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_content'
-		);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and its position is set
-	 * to before and after the Post content.
-	 *
-	 * @since   2.5.9
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output before and after the Post content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form_position' => 'before_after_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default: Before and After Content'
-		);
-
-		// Add paragraph to Post.
-		$I->addGutenbergParagraphBlock($I, 'Post content');
-
-		// Publish and view the Post on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that two Kit Forms are output in the DOM before and after the Post content.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'before_after_content'
-		);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Post with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the Post on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the third paragraph.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'p',
-			elementIndex: 3
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
-	 * result in a fatal error when creating and viewing a new WordPress Post, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   2.6.8
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Post with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Non-Inline Form: Default: After 3rd Paragraph Element'
-		);
-
-		// View the Page on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and its position is set
-	 * to after the 2nd <h2> element.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <h2> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'h2',
-				'post_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Post with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default: After 2nd H2 Element'
-		);
-
-		// View the Post on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'h2',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and its position is set
-	 * to after the 2nd <img> element.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormAfterImageElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <img> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'img',
-				'post_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Post with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default: After 2nd Image Element'
-		);
-
-		// View the Post on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the second <img> element.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_element',
-			element: 'img',
-			elementIndex: 2
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post, and its position is set
-	 * to a number greater than the number of elements in the content.
-	 *
-	 * @since   2.6.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 7rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 9,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Setup Post with placeholder content.
-		$pageID = $I->addGutenbergPageToDatabase(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Default: After 9th Paragraph Element'
-		);
-
-		// View the Post on the frontend site.
-		$I->amOnPage('?p=' . $pageID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that one Kit Form is output in the DOM after the content, as
-		// the number of paragraphs is less than the position.
-		$I->seeFormOutput(
-			$I,
-			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-			position: 'after_content'
-		);
-
-		// Confirm character encoding is not broken due to using DOMDocument.
-		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-		// Confirm no meta tag exists within the content.
-		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-	}
-
-	/**
-	 * Test that the Default Legacy Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Post.
-	 *
-	 * @since   1.9.6.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefaultLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'post_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: Legacy: Default'
-		);
-
-		// Publish and view the Post on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Default Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-	}
-
-	/**
-	 * Test that 'None' Form specified in the Post Settings works when
-	 * creating and viewing a new WordPress Post.
-	 *
-	 * @since   1.9.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingNoForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: None'
-		);
-
-		// Configure metabox's Form setting = None.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', 'None' ],
-			]
-		);
-
-		// Publish and view the Post on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-	}
-
-	/**
-	 * Test that the Form specified in the Post Settings works when
-	 * creating and viewing a new WordPress Post.
-	 *
-	 * @since   1.9.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: ' . $_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 Post on the frontend site.
-		$I->publishAndViewGutenbergPage($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']);
-	}
-
-	/**
-	 * Test that the Legacy Form specified in the Post Settings works when
-	 * creating and viewing a new WordPress Post.
-	 *
-	 * @since   1.9.6.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingDefinedLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'post_form'  => '',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Add a Post using the Gutenberg editor.
-		$I->addGutenbergPage(
-			$I,
-			postType: 'post',
-			title: 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-		);
-
-		// Configure metabox's Form setting = Legacy Form.
-		$I->configureMetaboxSettings(
-			$I,
-			metabox: 'wp-convertkit-meta-box',
-			configuration: [
-				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-			]
-		);
-
-		// Publish and view the Post on the frontend site.
-		$I->publishAndViewGutenbergPage($I);
-
-		// Confirm that the Kit Legacy Form displays.
-		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-	}
-
-	/**
-	 * Test that the Default Form for Posts displays when an invalid Form ID is specified
-	 * for a Post.
-	 *
-	 * Whilst the on screen options won't permit selecting an invalid Form ID, a Post might
-	 * have an invalid Form ID because:
-	 * - the form belongs to another Kit account (i.e. API credentials were changed in the Plugin, but this Post's specified Form was not changed)
-	 * - the form was deleted from the Kit account.
-	 *
-	 * @since   1.9.7.2
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewPostUsingInvalidDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Create Post, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
-		// a Form being deleted in Kit.
-		$postID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'post',
-				'post_title' => 'Kit: Post: Form: Specific: Invalid',
-				'meta_input' => [
-					'_wp_convertkit_post_meta' => [
-						'form'         => '11111',
-						'landing_page' => '',
-						'tag'          => '',
-					],
-				],
-			]
-		);
-
-		// Load the Post on the frontend site.
-		$I->amOnPage('/?p=' . $postID);
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Confirm that the invalid Kit Form does not display.
-		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
-
-		// 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 and reset Plugin(s) after each test, if the test passes.
-	 * We don't use _after, as this would provide a screenshot of the Plugin
-	 * deactivation and not the true test error.
-	 *
-	 * @since   1.9.6.7
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _passed(EndToEndTester $I)
-	{
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-	}
-}
diff --git a/tests/Support/Helper/WPGutenberg.php b/tests/Support/Helper/WPGutenberg.php
index 1b5c4da27..2755de9ad 100644
--- a/tests/Support/Helper/WPGutenberg.php
+++ b/tests/Support/Helper/WPGutenberg.php
@@ -660,7 +660,7 @@ function($I) {
 	/**
 	 * Configure the settings for the Plugin sidebar in Gutenberg.
 	 *
-	 * @since   3.2.2
+	 * @since   3.3.0
 	 *
 	 * @param   EndToEndTester $I                EndToEnd Tester.
 	 * @param   string         $form             Form ID.

From 8cc994f2b4f7cb30d5113d82e7d6f0d0963dfd60 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:38:22 +0800
Subject: [PATCH 13/18] Replace configureMetaboxSettings with
 configurePluginSidebarSettings

---
 .../PageBlockFormBuilderCest.php              |  84 ++++---------
 .../blocks-shortcodes/PageBlockFormCest.php   | 119 +++++-------------
 .../PageBlockFormTriggerCest.php              |  21 +---
 .../PageBlockFormatterFormTriggerCest.php     |  21 +---
 .../forms/general/EditFormLinkCest.php        |  28 ++---
 .../forms/general/NonInlineFormCest.php       |  49 +++-----
 .../general/other/ReviewRequestCest.php       |  18 +--
 .../landing-pages/PageLandingPageCest.php     |  70 +++--------
 .../PageBlockFormatterProductLinkCest.php     |  21 +---
 .../products/PageBlockProductCest.php         |  42 ++-----
 .../general/RestrictContentCacheCest.php      |  54 +++-----
 .../general/RestrictContentFormCest.php       |  27 ++--
 .../general/RestrictContentTagCest.php        |  64 ++++------
 .../RestrictContentProductCPTCest.php         |  47 +++----
 .../RestrictContentProductPageCest.php        |  74 ++++-------
 .../RestrictContentProductPostCest.php        |  57 +++------
 tests/EndToEnd/tags/PageTagCest.php           |  21 +---
 17 files changed, 250 insertions(+), 567 deletions(-)

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/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..7e420c4df 100644
--- a/tests/EndToEnd/landing-pages/PageLandingPageCest.php
+++ b/tests/EndToEnd/landing-pages/PageLandingPageCest.php
@@ -54,12 +54,9 @@ public function testAddNewPageUsingNoLandingPage(EndToEndTester $I)
 		);
 
 		// 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 +84,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 +131,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 +173,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 +208,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 +248,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 +350,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 +414,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 +469,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 +543,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/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..1f199da20 100644
--- a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
+++ b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
@@ -113,13 +113,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 +158,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 +208,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 +255,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 +308,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..c504f454d 100644
--- a/tests/EndToEnd/tags/PageTagCest.php
+++ b/tests/EndToEnd/tags/PageTagCest.php
@@ -62,12 +62,9 @@ public function testAddNewPageUsingNoTag(EndToEndTester $I)
 		);
 
 		// 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 +105,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 +145,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.

From 7721d25b42c331b37199363287f583e60c8ab4f9 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:39:15 +0800
Subject: [PATCH 14/18] Coding standards

---
 .../forms/post-types/FormBlockEditorCest.php  | 130 ++++++++---------
 .../post-types/FormClassicEditorCest.php      | 134 +++++++++---------
 2 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
index 783ce4444..f59fdc49b 100644
--- a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
@@ -208,17 +208,17 @@ public function testAddNewUsingDefaultFormAfterParagraphElement(EndToEndTester $
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 3,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 3,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'p',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'p',
+				'page_form_position_element_index'    => 3,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'p',
+				'post_form_position_element_index'    => 3,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
 				'article_form_position_element_index' => 3,
 			]
 		);
@@ -274,17 +274,17 @@ public function testAddNewUsingDefaultNonInlineFormAfterParagraphElement(EndToEn
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 3,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 3,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'p',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'p',
+				'page_form_position_element_index'    => 3,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'p',
+				'post_form_position_element_index'    => 3,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
 				'article_form_position_element_index' => 3,
 			]
 		);
@@ -335,17 +335,17 @@ public function testAddNewUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'h2',
-				'page_form_position_element_index' => 2,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'h2',
-				'post_form_position_element_index' => 2,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'h2',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'h2',
+				'page_form_position_element_index'    => 2,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'h2',
+				'post_form_position_element_index'    => 2,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'h2',
 				'article_form_position_element_index' => 2,
 			]
 		);
@@ -401,17 +401,17 @@ public function testAddNewUsingDefaultFormAfterImageElement(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'img',
-				'page_form_position_element_index' => 2,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'img',
-				'post_form_position_element_index' => 2,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'img',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'img',
+				'page_form_position_element_index'    => 2,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'img',
+				'post_form_position_element_index'    => 2,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'img',
 				'article_form_position_element_index' => 2,
 			]
 		);
@@ -467,17 +467,17 @@ public function testAddNewUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 9,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 9,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'p',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'p',
+				'page_form_position_element_index'    => 9,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'p',
+				'post_form_position_element_index'    => 9,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
 				'article_form_position_element_index' => 9,
 			]
 		);
@@ -531,11 +531,11 @@ public function testAddNewUsingDefaultLegacyForm(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'post_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'article_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'post_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'article_form' => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
 			]
 		);
 		$I->setupKitPluginResources($I);
@@ -649,11 +649,11 @@ public function testAddNewUsingDefinedLegacyForm(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'  => '',
-				'post_form'  => '',
-				'article_form'  => '',
+				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'    => '',
+				'post_form'    => '',
+				'article_form' => '',
 			]
 		);
 		$I->setupKitPluginResources($I);
diff --git a/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php b/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
index 83e40e9cf..ba7ab5e2a 100644
--- a/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
@@ -199,8 +199,8 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form_position' => 'before_after_content',
-				'post_form_position' => 'before_after_content',
+				'page_form_position'    => 'before_after_content',
+				'post_form_position'    => 'before_after_content',
 				'article_form_position' => 'before_after_content',
 			]
 		);
@@ -245,17 +245,17 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 3,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 3,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'p',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'p',
+				'page_form_position_element_index'    => 3,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'p',
+				'post_form_position_element_index'    => 3,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
 				'article_form_position_element_index' => 3,
 			]
 		);
@@ -311,17 +311,17 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 3,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 3,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'p',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'p',
+				'page_form_position_element_index'    => 3,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'p',
+				'post_form_position_element_index'    => 3,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
 				'article_form_position_element_index' => 3,
 			]
 		);
@@ -372,17 +372,17 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'h2',
-				'page_form_position_element_index' => 2,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'h2',
-				'post_form_position_element_index' => 2,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'h2',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'h2',
+				'page_form_position_element_index'    => 2,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'h2',
+				'post_form_position_element_index'    => 2,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'h2',
 				'article_form_position_element_index' => 2,
 			]
 		);
@@ -438,17 +438,17 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'img',
-				'page_form_position_element_index' => 2,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'img',
-				'post_form_position_element_index' => 2,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'img',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'img',
+				'page_form_position_element_index'    => 2,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'img',
+				'post_form_position_element_index'    => 2,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'img',
 				'article_form_position_element_index' => 2,
 			]
 		);
@@ -504,17 +504,17 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'               => 'after_element',
-				'page_form_position_element'       => 'p',
-				'page_form_position_element_index' => 9,
-				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'               => 'after_element',
-				'post_form_position_element'       => 'p',
-				'post_form_position_element_index' => 9,
-				'article_form'                     => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'            => 'after_element',
-				'article_form_position_element'    => 'p',
+				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'                  => 'after_element',
+				'page_form_position_element'          => 'p',
+				'page_form_position_element_index'    => 9,
+				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'                  => 'after_element',
+				'post_form_position_element'          => 'p',
+				'post_form_position_element_index'    => 9,
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
 				'article_form_position_element_index' => 9,
 			]
 		);
@@ -568,11 +568,11 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'post_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'article_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'post_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'article_form' => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
 			]
 		);
 		$I->setupKitPluginResources($I);
@@ -1036,11 +1036,11 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'  => '',
-				'post_form'  => '',
-				'article_form'  => '',
+				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'    => '',
+				'post_form'    => '',
+				'article_form' => '',
 			]
 		);
 		$I->setupKitPluginResources($I);

From d3b2327ecdd833029fbdfd226fb77ed36d196e51 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:42:59 +0800
Subject: [PATCH 15/18] Revert forms/post-types tests

---
 .../EndToEnd/forms/post-types/CPTFormCest.php | 775 ++++++++++++++++
 .../forms/post-types/FormBlockEditorCest.php  | 789 -----------------
 ...ClassicEditorCest.php => PageFormCest.php} | 824 ++++++++----------
 .../forms/post-types/PostFormCest.php         | 685 +++++++++++++++
 4 files changed, 1811 insertions(+), 1262 deletions(-)
 create mode 100644 tests/EndToEnd/forms/post-types/CPTFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
 rename tests/EndToEnd/forms/post-types/{FormClassicEditorCest.php => PageFormCest.php} (51%)
 create mode 100644 tests/EndToEnd/forms/post-types/PostFormCest.php

diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
new file mode 100644
index 000000000..fbefdf635
--- /dev/null
+++ b/tests/EndToEnd/forms/post-types/CPTFormCest.php
@@ -0,0 +1,775 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests for WordPress Custom Post Types (CPTs).
+ *
+ * @since   2.3.5
+ */
+class CPTFormCest
+{
+	/**
+	 * Run common actions before running the test functions in this class.
+	 *
+	 * @since   2.3.5
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _before(EndToEndTester $I)
+	{
+		// Activate Kit plugin.
+		$I->activateKitPlugin($I);
+
+		// Setup Kit plugin .
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Create Custom Post Types using the Custom Post Type UI Plugin.
+		$I->registerCustomPostTypes($I);
+	}
+
+	/**
+	 * Test that the Articles > Add New screen has expected a11y output, such as label[for].
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAccessibility(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Navigate to Post Type (e.g. Pages / Posts) > Add New.
+		$I->amOnAdminPage('post-new.php?post_type=article');
+
+		// Confirm that settings have label[for] attributes.
+		$I->seeInSource('<label for="wp-convertkit-form">');
+		$I->seeInSource('<label for="wp-convertkit-tag">');
+	}
+
+	/**
+	 * Tests that:
+	 * - no Kit options are displayed when adding a new private Custom Post Type,
+	 * - no debug output is displayed when viewing a private Custom Post Type.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testNoOptionsOrOutputOnPrivateCustomPostType(EndToEndTester $I)
+	{
+		// Add a Private CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'private',
+			title: 'Kit: Private: Form: None'
+		);
+
+		// Check that the metabox is not displayed.
+		$I->dontSeeElementInDOM('#wp-convertkit-meta-box');
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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()');
+	}
+
+	/**
+	 * Tests that no Kit options are display when quick or bulk editing in a private Custom Post Type.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testNoBulkOrQuickEditOptionsOnPrivateCustomPostType(EndToEndTester $I)
+	{
+		// Programmatically create two Private CPTs.
+		$postIDs = array(
+			$I->havePostInDatabase(
+				[
+					'post_type'  => 'private',
+					'post_title' => 'Kit: Private: #1',
+				]
+			),
+			$I->havePostInDatabase(
+				[
+					'post_type'  => 'private',
+					'post_title' => 'Kit: Private: #2',
+				]
+			),
+		);
+
+		// Navigate to Private CPT.
+		$I->amOnAdminPage('edit.php?post_type=private');
+
+		// Confirm no Bulk or Quick Edit settings are available.
+		$I->dontSeeElementInDOM('#convertkit-bulk-edit');
+		$I->dontSeeElementInDOM('#convertkit-quick-edit');
+	}
+
+	/**
+	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and there is no Default Form specified in the Plugin
+	 * settings.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin, without defining default Forms.
+		$I->setupKitPluginNoDefaultForms($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			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);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default'
+		);
+
+		// Publish and view the CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and its position is set
+	 * to after the CPT content.
+	 *
+	 * @since   2.5.8
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormBeforeContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output before the CPT content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'          => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position' => 'before_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default: Before Content'
+		);
+
+		// Add paragraph to CPT.
+		$I->addGutenbergParagraphBlock($I, 'CPT content');
+
+		// Publish and view the CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM after the CPT content.
+		// This confirms that there is only one script on the CPT for this form, which renders the form.
+		$I->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID'], 'before_content');
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and its position is set
+	 * to before and after the CPT content.
+	 *
+	 * @since   2.5.9
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output before and after the CPT content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'          => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position' => 'before_after_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default: Before and After Content'
+		);
+
+		// Add paragraph to CPT.
+		$I->addGutenbergParagraphBlock($I, 'CPT content');
+
+		// Publish and view the CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that two Kit Forms are output in the DOM before and after the CPT content.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_after_content'
+		);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
+				'article_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Article with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the CPT on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the third paragraph.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'p',
+			elementIndex: 3
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
+	 * result in a fatal error when creating and viewing a new WordPress CPT, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   2.6.8
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
+				'article_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup CPT with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Non-Inline Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and its position is set
+	 * to after the 2nd <h2> element.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output after the 2nd <h2> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'h2',
+				'article_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Article with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default: After 2nd H2 Element'
+		);
+
+		// View the CPT on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'h2',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and its position is set
+	 * to after the 2nd <img> element.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormAfterImageElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output after the 2nd <img> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'img',
+				'article_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Article with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default: After 2nd Image Element'
+		);
+
+		// View the CPT on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <img> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'img',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT, and its position is set
+	 * to a number greater than the number of elements in the content.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for CPTs set to be output after the 7th paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'article_form_position'               => 'after_element',
+				'article_form_position_element'       => 'p',
+				'article_form_position_element_index' => 9,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Article with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Default: After 9th Paragraph Element'
+		);
+
+		// View the CPT on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the content, as
+		// the number of paragraphs is less than the position.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_content'
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Legacy Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress CPT.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefaultLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
+				'article_form' => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: Legacy: Default'
+		);
+
+		// Publish and view the CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Default Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+	}
+
+	/**
+	 * Test that 'None' Form specified in the CPT Settings works when
+	 * creating and viewing a new WordPress CPT.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingNoForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: None'
+		);
+
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'None' ],
+			]
+		);
+
+		// Publish and view the CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
+	/**
+	 * Test that the Form specified in the CPT Settings works when
+	 * creating and viewing a new WordPress CPT.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: ' . $_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 CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
+	}
+
+	/**
+	 * Test that the Legacy Form specified in the CPT Settings works when
+	 * creating and viewing a new WordPress CPT.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingDefinedLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
+				'article_form' => '',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a CPT using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'article',
+			title: 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+		);
+
+		// Configure metabox's Form setting = Legacy Form.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
+			]
+		);
+
+		// Publish and view the CPT on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+	}
+
+	/**
+	 * Test that the Default Form for CPTs displays when an invalid Form ID is specified
+	 * for a CPT.
+	 *
+	 * Whilst the on screen options won't permit selecting an invalid Form ID, a CPT might
+	 * have an invalid Form ID because:
+	 * - the form belongs to another Kit account (i.e. API credentials were changed in the Plugin, but this CPT's specified Form was not changed)
+	 * - the form was deleted from the Kit account.
+	 *
+	 * @since   2.4.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewCPTUsingInvalidDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Create CPT, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
+		// a Form being deleted in Kit.
+		$postID = $I->havePostInDatabase(
+			[
+				'post_type'  => 'article',
+				'post_title' => 'Kit: CPT: Form: Specific: Invalid',
+				'meta_input' => [
+					'_wp_convertkit_post_meta' => [
+						'form'         => '11111',
+						'landing_page' => '',
+						'tag'          => '',
+					],
+				],
+			]
+		);
+
+		// Load the CPT on the frontend site.
+		$I->amOnPage('/?p=' . $postID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that the invalid Kit Form does not display.
+		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
+
+		// 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 and reset Plugin(s) after each test, if the test passes.
+	 * We don't use _after, as this would provide a screenshot of the Plugin
+	 * deactivation and not the true test error.
+	 *
+	 * @since   2.4.3.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->unregisterCustomPostTypes($I);
+		$I->deactivateKitPlugin($I);
+		$I->resetKitPlugin($I);
+	}
+}
diff --git a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php b/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
deleted file mode 100644
index f59fdc49b..000000000
--- a/tests/EndToEnd/forms/post-types/FormBlockEditorCest.php
+++ /dev/null
@@ -1,789 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests the Form setting on WordPress Pages, Posts and Custom Post Types when using the block editor.
- *
- * @since   3.3.0
- */
-class FormBlockEditorCest
-{
-	/**
-	 * Post Types to test.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @var array
-	 */
-	private $postTypes = [
-		'page',
-		'post',
-		'article',
-	];
-
-	/**
-	 * Run common actions before running the test functions in this class.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _before(EndToEndTester $I)
-	{
-		// Activate Kit plugin.
-		$I->activateKitPlugin($I);
-
-		// Create Custom Post Types using the Custom Post Type UI Plugin.
-		$I->registerCustomPostTypes($I);
-	}
-
-	/**
-	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and there is no Default Form specified in the Plugin
-	 * settings.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
-	{
-		// Setup Kit plugin with no default Forms configured.
-		$I->setupKitPluginNoDefaultForms($I);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: None'
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($I);
-
-			// Confirm that no Kit Form is displayed.
-			$I->dontSeeElementInDOM('form[data-sv-form]');
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default'
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($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']);
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the Page content.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormBeforeContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output before the Page content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form_position' => 'before_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: Before Content'
-			);
-
-			// Add paragraph to Page.
-			$I->addGutenbergParagraphBlock($I, $postType . ' content');
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($I);
-
-			// Confirm that one Kit Form is output in the DOM after the Page content.
-			// This confirms that there is only one script on the page for this form, which renders the form.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'before_content'
-			);
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to before and after the Page content.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output before and after the Page content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form_position' => 'before_after_content',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: Before and After Content'
-			);
-
-			// Add paragraph to Page.
-			$I->addGutenbergParagraphBlock($I, $postType . ' content');
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($I);
-
-			// Confirm that two Kit Forms are output in the DOM before and after the Page content.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'before_after_content'
-			);
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'p',
-				'page_form_position_element_index'    => 3,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'p',
-				'post_form_position_element_index'    => 3,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addGutenbergPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 3rd Paragraph Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the third paragraph.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_element',
-				element: 'p',
-				elementIndex: 3
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
-	}
-
-	/**
-	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
-	 * result in a fatal error when creating and viewing a new WordPress Page, and its position is set
-	 * to after the 3rd paragraph.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 3rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'p',
-				'page_form_position_element_index'    => 3,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'p',
-				'post_form_position_element_index'    => 3,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 3,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addGutenbergPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Non-Inline Form: Default: After 3rd Paragraph Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the 2nd <h2> element.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 2nd <h2> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'h2',
-				'page_form_position_element_index'    => 2,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'h2',
-				'post_form_position_element_index'    => 2,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'h2',
-				'article_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addGutenbergPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 2nd H2 Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the second <h2> element.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_element',
-				element: 'h2',
-				elementIndex: 2
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to after the 2nd <img> element.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormAfterImageElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <img> of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'img',
-				'page_form_position_element_index'    => 2,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'img',
-				'post_form_position_element_index'    => 2,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'img',
-				'article_form_position_element_index' => 2,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addGutenbergPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 2nd Image Element'
-			);
-
-			// View the Post on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the second <img> element.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_element',
-				element: 'img',
-				elementIndex: 2
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
-	}
-
-	/**
-	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
-	 * to a number greater than the number of elements in the content.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
-	{
-		// Setup Kit plugin with Default Form for Pages set to be output after the 7rd paragraph of content.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'p',
-				'page_form_position_element_index'    => 9,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'p',
-				'post_form_position_element_index'    => 9,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 9,
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addGutenbergPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 9th Paragraph Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the content, as
-			// the number of paragraphs is less than the position.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_content'
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
-	}
-
-	/**
-	 * Test that the Default Legacy Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefaultLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'post_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'article_form' => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Legacy: Default'
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($I);
-
-			// Confirm that the Kit Default Legacy Form displays.
-			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-
-			// Confirm that the Legacy Form title's character encoding is correct.
-			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
-		}
-	}
-
-	/**
-	 * Test that 'None' Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingNoForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: None'
-			);
-
-			// Configure Plugin Sidebar's Form setting = None.
-			$I->configurePluginSidebarSettings(
-				$I,
-				form: 'None'
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($I);
-
-			// Confirm that no Kit Form is displayed.
-			$I->dontSeeElementInDOM('form[data-sv-form]');
-		}
-	}
-
-	/**
-	 * Test that the Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME']
-			);
-
-			// Configure Plugin Sidebar's Form setting = Inline Form.
-			$I->configurePluginSidebarSettings(
-				$I,
-				form: $_ENV['CONVERTKIT_API_FORM_NAME']
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($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']);
-		}
-	}
-
-	/**
-	 * Test that the Legacy Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAddNewUsingDefinedLegacyForm(EndToEndTester $I)
-	{
-		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'    => '',
-				'post_form'    => '',
-				'article_form' => '',
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
-			$I->addGutenbergPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-			);
-
-			// Configure Plugin Sidebar's Form setting = Legacy Form.
-			$I->configurePluginSidebarSettings(
-				$I,
-				form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewGutenbergPage($I);
-
-			// Confirm that the Kit Legacy Form displays.
-			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-
-			// Confirm that the Legacy Form title's character encoding is correct.
-			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
-		}
-	}
-
-	/**
-	 * 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);
-
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Activate Classic Editor Plugin.
-			$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': 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
-	 * deactivation and not the true test error.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _passed(EndToEndTester $I)
-	{
-		$I->unregisterCustomPostTypes($I);
-		$I->deactivateKitPlugin($I);
-		$I->resetKitPlugin($I);
-	}
-}
diff --git a/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
similarity index 51%
rename from tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
rename to tests/EndToEnd/forms/post-types/PageFormCest.php
index ba7ab5e2a..90873aa8c 100644
--- a/tests/EndToEnd/forms/post-types/FormClassicEditorCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -5,25 +5,12 @@
 use Tests\Support\EndToEndTester;
 
 /**
- * Tests the Form setting on WordPress Pages, Posts and Custom Post Types when using the Classic Editor.
+ * Tests for Kit Forms on WordPress Pages.
  *
  * @since   1.9.6
  */
-class FormClassicEditorCest
+class PageFormCest
 {
-	/**
-	 * Post Types to test.
-	 *
-	 * @since   3.3.0
-	 *
-	 * @var array
-	 */
-	private $postTypes = [
-		'page',
-		'post',
-		'article',
-	];
-
 	/**
 	 * Run common actions before running the test functions in this class.
 	 *
@@ -35,12 +22,6 @@ public function _before(EndToEndTester $I)
 	{
 		// Activate Kit plugin.
 		$I->activateKitPlugin($I);
-
-		// Activate Classic Editor Plugin.
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-		// Create Custom Post Types using the Custom Post Type UI Plugin.
-		$I->registerCustomPostTypes($I);
 	}
 
 	/**
@@ -80,31 +61,27 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 		$I->setupKitPluginNoDefaultForms($I);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': 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->publishAndViewClassicEditorPage($I);
-
-			// Confirm that no Kit Form is displayed.
-			$I->dontSeeElementInDOM('form[data-sv-form]');
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			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);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
 	}
 
 	/**
@@ -121,22 +98,18 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default'
-			);
-
-			// 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']);
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default'
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
 	}
 
 	/**
@@ -159,29 +132,25 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: Before Content'
-			);
-
-			// Add paragraph to Page.
-			$I->addClassicEditorParagraph($I, $postType . ' content');
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewClassicEditorPage($I);
-
-			// Confirm that one Kit Form is output in the DOM after the Page content.
-			// This confirms that there is only one script on the page for this form, which renders the form.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'before_content'
-			);
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default: Before Content'
+		);
+
+		// Add paragraph to Page.
+		$I->addGutenbergParagraphBlock($I, 'Page content');
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM after the Page content.
+		// This confirms that there is only one script on the page for this form, which renders the form.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_content'
+		);
 	}
 
 	/**
@@ -199,35 +168,29 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form_position'    => 'before_after_content',
-				'post_form_position'    => 'before_after_content',
-				'article_form_position' => 'before_after_content',
+				'page_form_position' => 'before_after_content',
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: Before and After Content'
-			);
-
-			// Add paragraph to Page.
-			$I->addClassicEditorParagraph($I, $postType . ' content');
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewClassicEditorPage($I);
-
-			// Confirm that two Kit Forms are output in the DOM before and after the Page content.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'before_after_content'
-			);
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Default: Before and After Content'
+		);
+
+		// Add paragraph to Page.
+		$I->addGutenbergParagraphBlock($I, 'Page content');
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that two Kit Forms are output in the DOM before and after the Page content.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_after_content'
+		);
 	}
 
 	/**
@@ -245,55 +208,43 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'p',
-				'page_form_position_element_index'    => 3,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'p',
-				'post_form_position_element_index'    => 3,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 3,
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 3,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addClassicEditorPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 3rd Paragraph Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the third paragraph.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_element',
-				element: 'p',
-				elementIndex: 3
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the third paragraph.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'p',
+			elementIndex: 3
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
 	}
 
 	/**
@@ -311,50 +262,38 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'p',
-				'page_form_position_element_index'    => 3,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'p',
-				'post_form_position_element_index'    => 3,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 3,
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 3,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addClassicEditorPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Non-Inline Form: Default: After 3rd Paragraph Element'
-			);
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Non-Inline Form: Default: After 3rd Paragraph Element'
+		);
 
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
 
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+		// 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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
 
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
 
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
 
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
 	}
 
 	/**
@@ -372,55 +311,43 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'h2',
-				'page_form_position_element_index'    => 2,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'h2',
-				'post_form_position_element_index'    => 2,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'h2',
-				'article_form_position_element_index' => 2,
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'h2',
+				'page_form_position_element_index' => 2,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addClassicEditorPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 2nd H2 Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the second <h2> element.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_element',
-				element: 'h2',
-				elementIndex: 2
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 2nd H2 Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'h2',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
 	}
 
 	/**
@@ -438,55 +365,43 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'img',
-				'page_form_position_element_index'    => 2,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'img',
-				'post_form_position_element_index'    => 2,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'img',
-				'article_form_position_element_index' => 2,
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'img',
+				'page_form_position_element_index' => 2,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addClassicEditorPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Default: After 2nd Image Element'
-			);
-
-			// View the Post on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the second <img> element.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_element',
-				element: 'img',
-				elementIndex: 2
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 2nd Image Element'
+		);
+
+		// View the Post on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <img> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'img',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
 	}
 
 	/**
@@ -504,54 +419,42 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'page_form_position'                  => 'after_element',
-				'page_form_position_element'          => 'p',
-				'page_form_position_element_index'    => 9,
-				'post_form'                           => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'post_form_position'                  => 'after_element',
-				'post_form_position_element'          => 'p',
-				'post_form_position_element_index'    => 9,
-				'article_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
-				'article_form_position'               => 'after_element',
-				'article_form_position_element'       => 'p',
-				'article_form_position_element_index' => 9,
+				'page_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'page_form_position'               => 'after_element',
+				'page_form_position_element'       => 'p',
+				'page_form_position_element_index' => 9,
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
-			$pageID = $I->addClassicEditorPageToDatabase(
-				$I,
-				postType: $postType,
-				title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
-			);
-
-			// View the Page on the frontend site.
-			$I->amOnPage('?p=' . $pageID);
-
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
-
-			// Confirm that one Kit Form is output in the DOM after the content, as
-			// the number of paragraphs is less than the position.
-			$I->seeFormOutput(
-				$I,
-				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
-				position: 'after_content'
-			);
-
-			// Confirm character encoding is not broken due to using DOMDocument.
-			$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
-
-			// Confirm no meta tag exists within the content.
-			$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
-
-			// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
-			$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
-		}
+		// Setup Page with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			title: 'Kit: Page: Form: Default: After 9th Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the content, as
+		// the number of paragraphs is less than the position.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_content'
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
 	}
 
 	/**
@@ -568,33 +471,27 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'post_form'    => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
-				'article_form' => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: Legacy: Default'
-			);
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: Legacy: Default'
+		);
 
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewClassicEditorPage($I);
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
 
-			// Confirm that the Kit Default Legacy Form displays.
-			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+		// Confirm that the Kit Default Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
 
-			// Confirm that the Legacy Form title's character encoding is correct.
-			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
-		}
+		// Confirm that the Legacy Form title's character encoding is correct.
+		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
 	}
 
 	/**
@@ -611,30 +508,26 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: None'
-			);
-
-			// Configure metabox's Form setting = None.
-			$I->configureMetaboxSettings(
-				$I,
-				metabox: 'wp-convertkit-meta-box',
-				configuration: [
-					'form' => [ 'select2', 'None' ],
-				]
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewClassicEditorPage($I);
-
-			// Confirm that no Kit Form is displayed.
-			$I->dontSeeElementInDOM('form[data-sv-form]');
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: None'
+		);
+
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'None' ],
+			]
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
 	}
 
 	/**
@@ -651,31 +544,27 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: ' . $_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']);
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_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->publishAndViewGutenbergPage($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']);
 	}
 
 	/**
@@ -695,8 +584,8 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		// Activate Autoptimize Plugin.
 		$I->activateThirdPartyPlugin($I, 'autoptimize');
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Autoptimize'
 		);
@@ -711,7 +600,7 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -743,8 +632,8 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		// Enable Debloat's "Defer JavaScript" and "Delay All Scripts" settings.
 		$I->enableJSDeferDelayAllScriptsDebloatPlugin($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Debloat'
 		);
@@ -759,7 +648,7 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -793,8 +682,8 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		$I->amOnAdminPage('admin.php?page=jetpack-boost');
 		$I->click('#inspector-toggle-control-1');
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
 		);
@@ -809,7 +698,7 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -842,8 +731,8 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
 		$I->enableLiteSpeedCacheLoadJSDeferred($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
 		);
@@ -858,7 +747,7 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($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,
@@ -894,8 +783,8 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		// Enable Siteground Speed Optimizer's "Combine JavaScript Files" setting.
 		$I->haveOptionInDatabase('siteground_optimizer_combine_javascript', '1');
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
 		);
@@ -910,7 +799,7 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM.
 		$I->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
@@ -948,8 +837,8 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 			]
 		);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': Perfmatters'
 		);
@@ -964,7 +853,7 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -995,8 +884,8 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		// Configure WP Rocket.
 		$I->enableWPRocketDelayJS($I);
 
-		// Add a Page using the Classic Editor.
-		$I->addClassicEditorPage(
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
 			$I,
 			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'] . ': WP Rocket'
 		);
@@ -1011,7 +900,7 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 		);
 
 		// Publish and view the Page on the frontend site.
-		$I->publishAndViewClassicEditorPage($I);
+		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that one Kit Form is output in the DOM within the <main> element.
 		// This confirms that there is only one script on the page for this form, which renders the form.
@@ -1036,42 +925,36 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 		$I->setupKitPlugin(
 			$I,
 			[
-				'api_key'      => $_ENV['CONVERTKIT_API_KEY'],
-				'api_secret'   => $_ENV['CONVERTKIT_API_SECRET'],
-				'page_form'    => '',
-				'post_form'    => '',
-				'article_form' => '',
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'page_form'  => '',
 			]
 		);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Classic Editor.
-			$I->addClassicEditorPage(
-				$I,
-				postType: $postType,
-				title: 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
-			);
-
-			// Configure metabox's Form setting = Legacy Form.
-			$I->configureMetaboxSettings(
-				$I,
-				metabox: 'wp-convertkit-meta-box',
-				configuration: [
-					'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
-				]
-			);
-
-			// Publish and view the Page on the frontend site.
-			$I->publishAndViewClassicEditorPage($I);
-
-			// Confirm that the Kit Legacy Form displays.
-			$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
-
-			// Confirm that the Legacy Form title's character encoding is correct.
-			$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
-		}
+		// Add a Page using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			title: 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+		);
+
+		// Configure metabox's Form setting = Legacy Form.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
+			]
+		);
+
+		// Publish and view the Page on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+
+		// Confirm that the Legacy Form title's character encoding is correct.
+		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
 	}
 
 	/**
@@ -1093,37 +976,34 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
-		// Test each Post Type.
-		foreach ( $this->postTypes as $postType ) {
-			// Create Page, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
-			// a Form being deleted in Kit.
-			$pageID = $I->havePostInDatabase(
-				[
-					'post_type'  => $postType,
-					'post_title' => 'Kit: ' . $postType . ': Form: Specific: Invalid',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => '11111',
-							'landing_page' => '',
-							'tag'          => '',
-						],
+		// Create Page, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
+		// a Form being deleted in Kit.
+		$pageID = $I->havePostInDatabase(
+			[
+				'post_type'  => 'page',
+				'post_title' => 'Kit: Page: Form: Specific: Invalid',
+				'meta_input' => [
+					'_wp_convertkit_post_meta' => [
+						'form'         => '11111',
+						'landing_page' => '',
+						'tag'          => '',
 					],
-				]
-			);
+				],
+			]
+		);
 
-			// Load the Page on the frontend site.
-			$I->amOnPage('/?p=' . $pageID);
+		// Load the Page on the frontend site.
+		$I->amOnPage('/?p=' . $pageID);
 
-			// Check that no PHP warnings or notices were output.
-			$I->checkNoWarningsAndNoticesOnScreen($I);
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
 
-			// Confirm that the invalid Kit Form does not display.
-			$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
+		// Confirm that the invalid Kit Form does not display.
+		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
 
-			// 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']);
-		}
+		// 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']);
 	}
 
 	/**
@@ -1137,8 +1017,6 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 	 */
 	public function _passed(EndToEndTester $I)
 	{
-		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
-		$I->unregisterCustomPostTypes($I);
 		$I->deactivateKitPlugin($I);
 		$I->resetKitPlugin($I);
 	}
diff --git a/tests/EndToEnd/forms/post-types/PostFormCest.php b/tests/EndToEnd/forms/post-types/PostFormCest.php
new file mode 100644
index 000000000..698d1870f
--- /dev/null
+++ b/tests/EndToEnd/forms/post-types/PostFormCest.php
@@ -0,0 +1,685 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests for Kit Forms on WordPress Posts.
+ *
+ * @since   1.9.6
+ */
+class PostFormCest
+{
+	/**
+	 * Run common actions before running the test functions in this class.
+	 *
+	 * @since   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _before(EndToEndTester $I)
+	{
+		// Activate and Setup Kit plugin.
+		$I->activateKitPlugin($I);
+	}
+
+	/**
+	 * Test that the Posts > Add New screen has expected a11y output, such as label[for].
+	 *
+	 * @since   1.9.7.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAccessibility(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Navigate to Post Type (e.g. Pages / Posts) > Add New.
+		$I->amOnAdminPage('post-new.php?post_type=post');
+
+		// Confirm that settings have label[for] attributes.
+		$I->seeInSource('<label for="wp-convertkit-form">');
+		$I->seeInSource('<label for="wp-convertkit-tag">');
+	}
+
+	/**
+	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and there is no Default Form specified in the Plugin
+	 * settings.
+	 *
+	 * @since   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
+	{
+		// Setup Plugin, without defining default Forms.
+		$I->setupKitPluginNoDefaultForms($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			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);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post.
+	 *
+	 * @since   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default'
+		);
+
+		// Publish and view the Post on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and its position is set
+	 * to after the Post content.
+	 *
+	 * @since   2.5.8
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormBeforeContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output before the Post content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form_position' => 'before_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default: Before Content'
+		);
+
+		// Add paragraph to Post.
+		$I->addGutenbergParagraphBlock($I, 'Post content');
+
+		// Publish and view the Post on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that one Kit Form is output in the DOM after the Post content.
+		// This confirms that there is only one script on the post for this form, which renders the form.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_content'
+		);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and its position is set
+	 * to before and after the Post content.
+	 *
+	 * @since   2.5.9
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages set to be output before and after the Post content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form_position' => 'before_after_content',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default: Before and After Content'
+		);
+
+		// Add paragraph to Post.
+		$I->addGutenbergParagraphBlock($I, 'Post content');
+
+		// Publish and view the Post on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that two Kit Forms are output in the DOM before and after the Post content.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'before_after_content'
+		);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Post with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the Post on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the third paragraph.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'p',
+			elementIndex: 3
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that specifying a non-inline Form specified in the Plugin Settings does not
+	 * result in a fatal error when creating and viewing a new WordPress Post, and its position is set
+	 * to after the 3rd paragraph.
+	 *
+	 * @since   2.6.8
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 3rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 3,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Post with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Non-Inline Form: Default: After 3rd Paragraph Element'
+		);
+
+		// View the Page on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($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->seeNumberOfElementsInDOM('form[data-sv-form="' . $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_ID'] . '"]', 1);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and its position is set
+	 * to after the 2nd <h2> element.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <h2> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'h2',
+				'post_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Post with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default: After 2nd H2 Element'
+		);
+
+		// View the Post on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <h2> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'h2',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and its position is set
+	 * to after the 2nd <img> element.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormAfterImageElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 2nd <img> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'img',
+				'post_form_position_element_index' => 2,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Post with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default: After 2nd Image Element'
+		);
+
+		// View the Post on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the second <img> element.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_element',
+			element: 'img',
+			elementIndex: 2
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post, and its position is set
+	 * to a number greater than the number of elements in the content.
+	 *
+	 * @since   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Posts set to be output after the 7rd paragraph of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'post_form'                        => $_ENV['CONVERTKIT_API_FORM_ID'],
+				'post_form_position'               => 'after_element',
+				'post_form_position_element'       => 'p',
+				'post_form_position_element_index' => 9,
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Setup Post with placeholder content.
+		$pageID = $I->addGutenbergPageToDatabase(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Default: After 9th Paragraph Element'
+		);
+
+		// View the Post on the frontend site.
+		$I->amOnPage('?p=' . $pageID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that one Kit Form is output in the DOM after the content, as
+		// the number of paragraphs is less than the position.
+		$I->seeFormOutput(
+			$I,
+			formID: $_ENV['CONVERTKIT_API_FORM_ID'],
+			position: 'after_content'
+		);
+
+		// Confirm character encoding is not broken due to using DOMDocument.
+		$I->seeInSource('Adhaésionés altéram improbis mi pariendarum sit stulti triarium');
+
+		// Confirm no meta tag exists within the content.
+		$I->dontSeeInSource('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
+
+		// Confirm no extra <html>, <head> or <body> tags are output i.e. injecting the form doesn't result in DOMDocument adding tags.
+		$I->seeNoExtraHtmlHeadBodyTagsOutput($I);
+	}
+
+	/**
+	 * Test that the Default Legacy Form specified in the Plugin Settings works when
+	 * creating and viewing a new WordPress Post.
+	 *
+	 * @since   1.9.6.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefaultLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'post_form'  => $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'],
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: Legacy: Default'
+		);
+
+		// Publish and view the Post on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Default Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+	}
+
+	/**
+	 * Test that 'None' Form specified in the Post Settings works when
+	 * creating and viewing a new WordPress Post.
+	 *
+	 * @since   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingNoForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: None'
+		);
+
+		// Configure metabox's Form setting = None.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', 'None' ],
+			]
+		);
+
+		// Publish and view the Post on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that no Kit Form is displayed.
+		$I->dontSeeElementInDOM('form[data-sv-form]');
+	}
+
+	/**
+	 * Test that the Form specified in the Post Settings works when
+	 * creating and viewing a new WordPress Post.
+	 *
+	 * @since   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: ' . $_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 Post on the frontend site.
+		$I->publishAndViewGutenbergPage($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']);
+	}
+
+	/**
+	 * Test that the Legacy Form specified in the Post Settings works when
+	 * creating and viewing a new WordPress Post.
+	 *
+	 * @since   1.9.6.3
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingDefinedLegacyForm(EndToEndTester $I)
+	{
+		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'api_key'    => $_ENV['CONVERTKIT_API_KEY'],
+				'api_secret' => $_ENV['CONVERTKIT_API_SECRET'],
+				'post_form'  => '',
+			]
+		);
+		$I->setupKitPluginResources($I);
+
+		// Add a Post using the Gutenberg editor.
+		$I->addGutenbergPage(
+			$I,
+			postType: 'post',
+			title: 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
+		);
+
+		// Configure metabox's Form setting = Legacy Form.
+		$I->configureMetaboxSettings(
+			$I,
+			metabox: 'wp-convertkit-meta-box',
+			configuration: [
+				'form' => [ 'select2', $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME'] ],
+			]
+		);
+
+		// Publish and view the Post on the frontend site.
+		$I->publishAndViewGutenbergPage($I);
+
+		// Confirm that the Kit Legacy Form displays.
+		$I->seeInSource('<form id="ck_subscribe_form" class="ck_subscribe_form" action="https://api.kit.com/landing_pages/' . $_ENV['CONVERTKIT_API_LEGACY_FORM_ID'] . '/subscribe" data-remote="true">');
+	}
+
+	/**
+	 * Test that the Default Form for Posts displays when an invalid Form ID is specified
+	 * for a Post.
+	 *
+	 * Whilst the on screen options won't permit selecting an invalid Form ID, a Post might
+	 * have an invalid Form ID because:
+	 * - the form belongs to another Kit account (i.e. API credentials were changed in the Plugin, but this Post's specified Form was not changed)
+	 * - the form was deleted from the Kit account.
+	 *
+	 * @since   1.9.7.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPostUsingInvalidDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit Plugin.
+		$I->setupKitPlugin($I);
+		$I->setupKitPluginResources($I);
+
+		// Create Post, with an invalid Form ID, as if it were created prior to API credentials being changed and/or
+		// a Form being deleted in Kit.
+		$postID = $I->havePostInDatabase(
+			[
+				'post_type'  => 'post',
+				'post_title' => 'Kit: Post: Form: Specific: Invalid',
+				'meta_input' => [
+					'_wp_convertkit_post_meta' => [
+						'form'         => '11111',
+						'landing_page' => '',
+						'tag'          => '',
+					],
+				],
+			]
+		);
+
+		// Load the Post on the frontend site.
+		$I->amOnPage('/?p=' . $postID);
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Confirm that the invalid Kit Form does not display.
+		$I->dontSeeElementInDOM('form[data-sv-form="11111"]');
+
+		// 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 and reset Plugin(s) after each test, if the test passes.
+	 * We don't use _after, as this would provide a screenshot of the Plugin
+	 * deactivation and not the true test error.
+	 *
+	 * @since   1.9.6.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->deactivateKitPlugin($I);
+		$I->resetKitPlugin($I);
+	}
+}

From dee076cb9aae6ae812d2732a8a793b8a46f6fba5 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 16:48:16 +0800
Subject: [PATCH 16/18] Updates tests to use configurePluginSidebarSettings;
 add `testFormSettingsPreservedWhenSwitchingEditors`

---
 .../EndToEnd/forms/post-types/CPTFormCest.php | 105 ++++++++++--
 .../forms/post-types/PageFormCest.php         | 153 ++++++++++++------
 .../forms/post-types/PostFormCest.php         | 105 ++++++++++--
 3 files changed, 283 insertions(+), 80 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
index fbefdf635..bcab9e827 100644
--- a/tests/EndToEnd/forms/post-types/CPTFormCest.php
+++ b/tests/EndToEnd/forms/post-types/CPTFormCest.php
@@ -601,12 +601,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 +640,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 +682,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 +748,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..878979286 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -515,12 +515,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 +548,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 +585,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 +630,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 +677,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 +723,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 +772,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 +823,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 +867,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 +912,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 +976,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/PostFormCest.php b/tests/EndToEnd/forms/post-types/PostFormCest.php
index 698d1870f..f821af6f0 100644
--- a/tests/EndToEnd/forms/post-types/PostFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PostFormCest.php
@@ -522,12 +522,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 +556,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 +598,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 +659,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

From 8786c9c052dd62b339d13ea58e30dd7a85f3f08d Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 17:14:30 +0800
Subject: [PATCH 17/18] Fix tests

---
 tests/EndToEnd/forms/post-types/CPTFormCest.php | 17 +++++++++++++++--
 .../EndToEnd/forms/post-types/PageFormCest.php  |  9 ++++++++-
 .../forms/post-types/PageNoFormCest.php         |  6 ++++++
 .../EndToEnd/forms/post-types/PostFormCest.php  |  9 ++++++++-
 tests/EndToEnd/general/other/PageCest.php       |  6 ++++++
 tests/EndToEnd/general/other/PostCest.php       |  6 ++++++
 .../landing-pages/PostLandingPageCest.php       |  8 +++++++-
 .../RestrictContentProductCPTCest.php           |  8 +++++++-
 tests/Support/Helper/Divi5Theme.php             |  7 ++-----
 tests/Support/Helper/DiviBuilder.php            |  7 ++-----
 10 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
index bcab9e827..82a08d8d3 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'
@@ -81,6 +91,9 @@ public function testNoOptionsOrOutputOnPrivateCustomPostType(EndToEndTester $I)
 
 		// 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');
 	}
 
 	/**
diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 878979286..1dfa5d127 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');
 	}
 
 	/**
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 f821af6f0..22fab8b4c 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');
 	}
 
 	/**
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/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/restrict-content/post-types/RestrictContentProductCPTCest.php b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
index 1f199da20..1afc26e8e 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'
@@ -89,6 +92,9 @@ public function testNoRestrictContentOnPrivateCPT(EndToEndTester $I)
 
 		// Publish and view the Page on the frontend site.
 		$I->publishAndViewGutenbergPage($I);
+
+		// Deactivate Classic Editor Plugin.
+		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
 	}
 
 	/**
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'
 			);
 		}
 

From 7b4d9b8c26e243d22a2f9750ba65fb16dfd3821d Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 12 Mar 2026 17:36:00 +0800
Subject: [PATCH 18/18] Fix tests

---
 .../EndToEnd/forms/post-types/CPTFormCest.php | 12 +-----
 .../forms/post-types/PageFormCest.php         | 10 -----
 .../forms/post-types/PostFormCest.php         | 10 -----
 .../other/RefreshResourcesButtonCest.php      | 35 ++--------------
 .../landing-pages/PageLandingPageCest.php     |  9 ----
 .../RestrictContentProductCPTCest.php         |  2 +-
 tests/EndToEnd/tags/PageTagCest.php           |  9 ----
 tests/Support/Helper/WPGutenberg.php          | 42 ++++++++++---------
 8 files changed, 27 insertions(+), 102 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
index 82a08d8d3..4fd14c8f1 100644
--- a/tests/EndToEnd/forms/post-types/CPTFormCest.php
+++ b/tests/EndToEnd/forms/post-types/CPTFormCest.php
@@ -84,7 +84,7 @@ 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]');
@@ -151,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);
 
diff --git a/tests/EndToEnd/forms/post-types/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
index 1dfa5d127..5a2229603 100644
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PageFormCest.php
@@ -74,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);
 
diff --git a/tests/EndToEnd/forms/post-types/PostFormCest.php b/tests/EndToEnd/forms/post-types/PostFormCest.php
index 22fab8b4c..d26277e9d 100644
--- a/tests/EndToEnd/forms/post-types/PostFormCest.php
+++ b/tests/EndToEnd/forms/post-types/PostFormCest.php
@@ -74,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);
 
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/landing-pages/PageLandingPageCest.php b/tests/EndToEnd/landing-pages/PageLandingPageCest.php
index 7e420c4df..5371501c2 100644
--- a/tests/EndToEnd/landing-pages/PageLandingPageCest.php
+++ b/tests/EndToEnd/landing-pages/PageLandingPageCest.php
@@ -44,15 +44,6 @@ 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->configurePluginSidebarSettings(
 			$I,
diff --git a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
index 1afc26e8e..4ac891328 100644
--- a/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
+++ b/tests/EndToEnd/restrict-content/post-types/RestrictContentProductCPTCest.php
@@ -91,7 +91,7 @@ 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');
diff --git a/tests/EndToEnd/tags/PageTagCest.php b/tests/EndToEnd/tags/PageTagCest.php
index c504f454d..ac9615b0f 100644
--- a/tests/EndToEnd/tags/PageTagCest.php
+++ b/tests/EndToEnd/tags/PageTagCest.php
@@ -52,15 +52,6 @@ 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->configurePluginSidebarSettings(
 			$I,
diff --git a/tests/Support/Helper/WPGutenberg.php b/tests/Support/Helper/WPGutenberg.php
index 2755de9ad..3022b32ee 100644
--- a/tests/Support/Helper/WPGutenberg.php
+++ b/tests/Support/Helper/WPGutenberg.php
@@ -673,29 +673,30 @@ public function configurePluginSidebarSettings($I, $form = false, $landingPage =
 		// Open the Plugin sidebar settings.
 		$I->openPluginSidebarSettings($I);
 
-		// Gutenberg doesn't expose the field names as IDs, so we need to use the index.
+		// Gutenberg doesn't expose the field names as IDs.
+		// The index (#inspector-select-control-*) also changes between WordPress versions.
 		// Form.
 		if ( $form ) {
-			$I->waitForElementVisible('.editor-sidebar #inspector-select-control-0');
-			$I->selectOption('.editor-sidebar #inspector-select-control-0', $form);
+			$I->waitForElementVisible('//label[text()="Form"]/following::select[1]');
+			$I->selectOption('//label[text()="Form"]/following::select[1]', $form);
 		}
 
 		// Landing Page.
 		if ( $landingPage ) {
-			$I->waitForElementVisible('.editor-sidebar #inspector-select-control1');
-			$I->selectOption('.editor-sidebar #inspector-select-control-1', $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('.editor-sidebar #inspector-select-control-2');
-			$I->selectOption('.editor-sidebar #inspector-select-control-2', $tag);
+			$I->waitForElementVisible('//label[text()="Tag"]/following::select[1]');
+			$I->selectOption('//label[text()="Tag"]/following::select[1]', $tag);
 		}
 
 		// Restrict Content.
 		if ( $restrictContent ) {
-			$I->waitForElementVisible('.editor-sidebar #inspector-select-control-3');
-			$I->selectOption('.editor-sidebar #inspector-select-control-3', $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.
@@ -716,26 +717,27 @@ public function seePluginSidebarSetting($I, $setting, $value)
 		// Open the Plugin sidebar settings.
 		$I->openPluginSidebarSettings($I);
 
-		// Gutenberg doesn't expose the field names as IDs, so we need to use the index.
+		// 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('.editor-sidebar #inspector-select-control-0');
-				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-0', $value);
+				$I->waitForElementVisible('//label[text()="Form"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Form"]/following::select[1]', $value);
 				break;
 
 			case 'landing_page':
-				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-1');
-				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-1', $value);
+				$I->waitForElementVisible('//label[text()="Landing Page"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Landing Page"]/following::select[1]', $value);
 				break;
 
 			case 'tag':
-				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-2');
-				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-2', $value);
+				$I->waitForElementVisible('//label[text()="Tag"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Tag"]/following::select[1]', $value);
 				break;
 
 			case 'restrict_content':
-				$I->waitForElementVisible('.editor-sidebar #inspector-select-control-3');
-				$I->seeOptionIsSelected('.editor-sidebar #inspector-select-control-3', $value);
+				$I->waitForElementVisible('//label[text()="Restrict Content"]/following::select[1]');
+				$I->seeOptionIsSelected('//label[text()="Restrict Content"]/following::select[1]', $value);
 				break;
 		}
 
@@ -753,8 +755,8 @@ public function seePluginSidebarSetting($I, $setting, $value)
 	public function openPluginSidebarSettings($I)
 	{
 		// Click the Plugin sidebar button.
-		$I->waitForElementVisible('button[aria-controls="convertkit-post-settings:post-settings"]');
-		$I->click('button[aria-controls="convertkit-post-settings:post-settings"]');
+		$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');