From 0bd621e34af794f3cb881c9920b7b739d6ecb466 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 26 Mar 2026 12:47:38 +0800
Subject: [PATCH 1/7] Tests: Block Editor: Form Setting: Refactor Tests

---
 .../forms/post-types/BlockEditorFormCest.php  | 1183 +++++++++++++++++
 .../EndToEnd/forms/post-types/CPTFormCest.php |  853 ------------
 .../forms/post-types/PageFormCest.php         | 1073 ---------------
 .../forms/post-types/PostFormCest.php         |  757 -----------
 4 files changed, 1183 insertions(+), 2683 deletions(-)
 create mode 100644 tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/CPTFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/PageFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/PostFormCest.php

diff --git a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
new file mode 100644
index 000000000..d3acb36c7
--- /dev/null
+++ b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
@@ -0,0 +1,1183 @@
+<?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   1.9.6
+ */
+class BlockEditorFormCest
+{
+	/**
+	 * 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   1.9.6
+	 *
+	 * @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   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(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   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultForm(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   2.5.8
+	 *
+	 * @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);
+
+		// 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, '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   2.5.9
+	 *
+	 * @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);
+
+		// 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, '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   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles 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   2.6.8
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles 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   2.6.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles 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   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output after the 2nd <img> of content.
+		$I->setupKitPlugin(
+			$I,
+			[
+				'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,
+				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   2.6.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
+	{
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output after the 9th 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   1.9.6.3
+	 *
+	 * @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'],
+				'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   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingNoForm(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 metabox'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   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingDefinedForm(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 metabox'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   2.4.9
+	 *
+	 * @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');
+
+		// 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_FORMAT_MODAL_NAME'] . ': Autoptimize'
+			);
+
+			// Configure metabox'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   2.8.6
+	 *
+	 * @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);
+
+		// 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_FORMAT_MODAL_NAME'] . ': Debloat'
+			);
+
+			// Configure metabox'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   2.4.5
+	 *
+	 * @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');
+
+		// 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_FORMAT_MODAL_NAME'] . ': Jetpack Boost'
+			);
+
+			// Configure metabox'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   2.4.5
+	 *
+	 * @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);
+
+		// 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_FORMAT_MODAL_NAME'] . ': LiteSpeed Cache'
+			);
+
+			// Configure metabox'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');
+
+		// 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_FORMAT_MODAL_NAME'] . ': Siteground Speed Optimizer'
+			);
+
+			// Configure metabox'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   2.4.7
+	 *
+	 * @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' => '',
+				],
+			]
+		);
+
+		// 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_FORMAT_MODAL_NAME'] . ': Perfmatters'
+			);
+
+			// Configure metabox'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   2.4.7
+	 *
+	 * @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);
+
+		// 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_FORMAT_MODAL_NAME'] . ': WP Rocket'
+			);
+
+			// Configure metabox'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   1.9.6.3
+	 *
+	 * @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'    => '',
+				'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 metabox'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   1.9.7.2
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
+	{
+		// Setup Kit plugin.
+		$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'          => '',
+						],
+					],
+				]
+			);
+
+			// 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']);
+		}
+	}
+
+	/**
+	 * 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   1.9.6.7
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function _passed(EndToEndTester $I)
+	{
+		$I->deactivateKitPlugin($I);
+		$I->resetKitPlugin($I);
+	}
+}
diff --git a/tests/EndToEnd/forms/post-types/CPTFormCest.php b/tests/EndToEnd/forms/post-types/CPTFormCest.php
deleted file mode 100644
index 4fd14c8f1..000000000
--- a/tests/EndToEnd/forms/post-types/CPTFormCest.php
+++ /dev/null
@@ -1,853 +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],
-	 * when using the Classic Editor.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAccessibility(EndToEndTester $I)
-	{
-		// Activate Classic Editor Plugin.
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-		// 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">');
-
-		// Deactivate Classic Editor Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
-	}
-
-	/**
-	 * 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)
-	{
-		// Activate Classic Editor Plugin.
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-		// Add a Private CPT using the Gutenberg editor.
-		$I->addClassicEditorPage(
-			$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->publishAndViewClassicEditorPage($I);
-
-		// Confirm that no Kit Form is displayed.
-		$I->dontSeeElementInDOM('form[data-sv-form]');
-
-		// Confirm that no debug data is output, as this isn't a supported Post Type.
-		$I->dontSeeInSource('<!-- Kit append_form_to_content()');
-
-		// Deactivate Classic Editor Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
-	}
-
-	/**
-	 * 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'
-		);
-
-		// 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->configurePluginSidebarSettings(
-			$I,
-			form: '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->configurePluginSidebarSettings(
-			$I,
-			form: $_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->configurePluginSidebarSettings(
-			$I,
-			form: $_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']);
-	}
-
-	/**
-	 * 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
-	 * 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/PageFormCest.php b/tests/EndToEnd/forms/post-types/PageFormCest.php
deleted file mode 100644
index 5a2229603..000000000
--- a/tests/EndToEnd/forms/post-types/PageFormCest.php
+++ /dev/null
@@ -1,1073 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for Kit Forms on WordPress Pages.
- *
- * @since   1.9.6
- */
-class PageFormCest
-{
-	/**
-	 * 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 Kit plugin.
-		$I->activateKitPlugin($I);
-	}
-
-	/**
-	 * 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
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAccessibility(EndToEndTester $I)
-	{
-		// Activate Classic Editor Plugin.
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-		// 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=page');
-
-		// Confirm that settings have label[for] attributes.
-		$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');
-	}
-
-	/**
-	 * 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   1.9.6
-	 *
-	 * @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   1.9.6
-	 *
-	 * @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   2.5.8
-	 *
-	 * @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   2.5.9
-	 *
-	 * @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   2.6.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   2.6.8
-	 *
-	 * @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   2.6.6
-	 *
-	 * @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   2.6.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   2.6.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   1.9.6.3
-	 *
-	 * @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   1.9.6
-	 *
-	 * @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 metabox'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   1.9.6
-	 *
-	 * @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 metabox'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   2.4.9
-	 *
-	 * @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 metabox'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   2.8.6
-	 *
-	 * @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 metabox'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   2.4.5
-	 *
-	 * @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 metabox'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   2.4.5
-	 *
-	 * @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 metabox'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 metabox'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   2.4.7
-	 *
-	 * @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 metabox'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   2.4.7
-	 *
-	 * @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 metabox'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   1.9.6.3
-	 *
-	 * @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 metabox'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   1.9.7.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']);
-	}
-
-	/**
-	 * 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   1.9.6.7
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _passed(EndToEndTester $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 d26277e9d..000000000
--- a/tests/EndToEnd/forms/post-types/PostFormCest.php
+++ /dev/null
@@ -1,757 +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],
-	 * when using the Classic Editor.
-	 *
-	 * @since   1.9.7.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testAccessibility(EndToEndTester $I)
-	{
-		// Activate Classic Editor Plugin.
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-		// 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">');
-
-		// Deactivate Classic Editor Plugin.
-		$I->deactivateThirdPartyPlugin($I, 'classic-editor');
-	}
-
-	/**
-	 * 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'
-		);
-
-		// 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->configurePluginSidebarSettings(
-			$I,
-			form: '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->configurePluginSidebarSettings(
-			$I,
-			form: $_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->configurePluginSidebarSettings(
-			$I,
-			form: $_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']);
-	}
-
-	/**
-	 * 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
-	 * 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 3ae2ea2113f3e8d6984880797fc09c17439ecfc9 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 26 Mar 2026 13:02:47 +0800
Subject: [PATCH 2/7] Tests: Forms: Bulk & Quick Edit: Refactor Tests

---
 .../post-types/BulkQuickEditFormCest.php      | 325 ++++++++++++++++
 .../post-types/CPTBulkQuickEditFormCest.php   | 362 ------------------
 .../post-types/PageBulkQuickEditFormCest.php  | 324 ----------------
 .../post-types/PostBulkQuickEditFormCest.php  | 324 ----------------
 4 files changed, 325 insertions(+), 1010 deletions(-)
 create mode 100644 tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/CPTBulkQuickEditFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/PageBulkQuickEditFormCest.php
 delete mode 100644 tests/EndToEnd/forms/post-types/PostBulkQuickEditFormCest.php

diff --git a/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php b/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php
new file mode 100644
index 000000000..906d39764
--- /dev/null
+++ b/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php
@@ -0,0 +1,325 @@
+<?php
+
+namespace Tests\EndToEnd;
+
+use Tests\Support\EndToEndTester;
+
+/**
+ * Tests for Kit Forms on WordPress Pages, Posts and Articles when using the Bulk and Quick Edit functionality.
+ *
+ * @since   1.9.6
+ */
+class BulkQuickEditFormCest
+{
+	/**
+	 * 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 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 Default Form for Pages displays when the Default option is chosen via
+	 * WordPress' Quick Edit functionality.
+	 *
+	 * @since   1.9.8.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testQuickEditUsingDefaultForm(EndToEndTester $I)
+	{
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Programmatically create a Post Type.
+			$postID = $I->havePostInDatabase(
+				[
+					'post_type'  => $postType,
+					'post_title' => 'Kit: ' . $postType . ': Form: Default: Quick Edit',
+				]
+			);
+
+			// Quick Edit the Post Type in the Post Type WP_List_Table.
+			$I->quickEdit(
+				$I,
+				postType: $postType,
+				postID: $postID,
+				configuration: [
+					'form' => [ 'select', 'Default' ],
+				]
+			);
+
+			// Load the Post Type on the frontend site.
+			$I->amOnPage('/?p=' . $postID);
+
+			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+		}
+	}
+
+	/**
+	 * Test that the defined form displays when chosen via
+	 * WordPress' Quick Edit functionality.
+	 *
+	 * @since   1.9.8.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testQuickEditUsingDefinedForm(EndToEndTester $I)
+	{
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Programmatically create a Post Type.
+			$postID = $I->havePostInDatabase(
+				[
+					'post_type'  => $postType,
+					'post_title' => 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Quick Edit',
+				]
+			);
+
+			// Quick Edit the Post Type in the Post Type WP_List_Table.
+			$I->quickEdit(
+				$I,
+				postType: $postType,
+				postID: $postID,
+				configuration: [
+					'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
+				]
+			);
+
+			// Load the Post Type on the frontend site.
+			$I->amOnPage('/?p=' . $postID);
+
+			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+		}
+	}
+
+	/**
+	 * Test that the Default Form for Pages displays when the Default option is chosen via
+	 * WordPress' Bulk Edit functionality.
+	 *
+	 * @since   1.9.8.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testBulkEditUsingDefaultForm(EndToEndTester $I)
+	{
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Programmatically create two Pages.
+			$postIDs = array(
+				$I->havePostInDatabase(
+					[
+						'post_type'  => $postType,
+						'post_title' => 'Kit: ' . $postType . ': Form: Default: Bulk Edit #1',
+					]
+				),
+				$I->havePostInDatabase(
+					[
+						'post_type'  => $postType,
+						'post_title' => 'Kit: ' . $postType . ': Form: Default: Bulk Edit #2',
+					]
+				),
+			);
+
+			// Bulk Edit the Post Types in the Post Types WP_List_Table.
+			$I->bulkEdit(
+				$I,
+				postType: $postType,
+				postIDs: $postIDs,
+				configuration: [
+					'form' => [ 'select', 'Default' ],
+				]
+			);
+
+			// Iterate through Post Types to run frontend tests.
+			foreach ($postIDs as $postID) {
+				// Load Post Type on the frontend site.
+				$I->amOnPage('/?p=' . $postID);
+
+				// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+			}
+		}
+	}
+
+	/**
+	 * Test that the defined form displays when chosen via
+	 * WordPress' Bulk Edit functionality.
+	 *
+	 * @since   1.9.8.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testBulkEditUsingDefinedForm(EndToEndTester $I)
+	{
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Programmatically create two Post Types.
+			$postIDs = array(
+				$I->havePostInDatabase(
+					[
+						'post_type'  => $postType,
+						'post_title' => 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #1',
+					]
+				),
+				$I->havePostInDatabase(
+					[
+						'post_type'  => $postType,
+						'post_title' => 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #2',
+					]
+				),
+			);
+
+			// Bulk Edit the Post Types in the Post Types WP_List_Table.
+			$I->bulkEdit(
+				$I,
+				postType: $postType,
+				postIDs: $postIDs,
+				configuration: [
+					'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
+				]
+			);
+
+			// Iterate through Post Types to run frontend tests.
+			foreach ($postIDs as $postID) {
+				// Load Post Type on the frontend site.
+				$I->amOnPage('/?p=' . $postID);
+
+				// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+			}
+		}
+	}
+
+	/**
+	 * Test that the existing settings are honored and not changed
+	 * when the Bulk Edit options are set to 'No Change'.
+	 *
+	 * @since   1.9.8.0
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testBulkEditWithNoChanges(EndToEndTester $I)
+	{
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Programmatically create two Post Types with a defined form.
+			$postIDs = array(
+				$I->havePostInDatabase(
+					[
+						'post_type'  => $postType,
+						'post_title' => 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #1',
+						'meta_input' => [
+							'_wp_convertkit_post_meta' => [
+								'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
+								'landing_page' => '',
+								'tag'          => '',
+							],
+						],
+					]
+				),
+				$I->havePostInDatabase(
+					[
+						'post_type'  => $postType,
+						'post_title' => 'Kit: ' . $postType . ': Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #2',
+						'meta_input' => [
+							'_wp_convertkit_post_meta' => [
+								'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
+								'landing_page' => '',
+								'tag'          => '',
+							],
+						],
+					]
+				),
+			);
+
+			// Bulk Edit the Post Types in the Post Types WP_List_Table.
+			$I->bulkEdit(
+				$I,
+				postType: $postType,
+				postIDs: $postIDs,
+				configuration: [
+					'form' => [ 'select', '— No Change —' ],
+				]
+			);
+
+			// Iterate through Post Types to run frontend tests.
+			foreach ($postIDs as $postID) {
+				// Load Post Type on the frontend site.
+				$I->amOnPage('/?p=' . $postID);
+
+				// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
+			}
+		}
+	}
+
+	/**
+	 * Test that the Bulk Edit fields do not display when a search on a WP_List_Table
+	 * returns no results.
+	 *
+	 * @since   1.9.8.1
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testBulkEditFieldsHiddenWhenNoPostTypesFound(EndToEndTester $I)
+	{
+		// Test each Post Type.
+		foreach ( $this->postTypes as $postType ) {
+			// Emulate the user searching for Post Types with a query string that yields no results.
+			$I->amOnAdminPage('edit.php?post_type=' . $postType . '&s=nothing');
+
+			// Confirm that the Bulk Edit fields do not display.
+			$I->dontSeeElement('#convertkit-bulk-edit');
+		}
+	}
+
+	/**
+	 * 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/EndToEnd/forms/post-types/CPTBulkQuickEditFormCest.php b/tests/EndToEnd/forms/post-types/CPTBulkQuickEditFormCest.php
deleted file mode 100644
index 81b8b537f..000000000
--- a/tests/EndToEnd/forms/post-types/CPTBulkQuickEditFormCest.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for WordPress Custom Post Types (CPTs).
- *
- * @since   2.3.5
- */
-class CPTBulkQuickEditFormCest
-{
-	/**
-	 * 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 Default Form for Pages displays when the Default option is chosen via
-	 * WordPress' Quick Edit functionality.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testQuickEditUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create a CPT.
-		$postID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'article',
-				'post_title' => 'Kit: CPT: Form: Default: Quick Edit',
-			]
-		);
-
-		// Quick Edit the CPT in the CPTs WP_List_Table.
-		$I->quickEdit(
-			$I,
-			postType: 'article',
-			postID: $postID,
-			configuration: [
-				'form' => [ 'select', 'Default' ],
-			]
-		);
-
-		// 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 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 defined form displays when chosen via
-	 * WordPress' Quick Edit functionality.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testQuickEditUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create a CPT.
-		$postID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'article',
-				'post_title' => 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Quick Edit',
-			]
-		);
-
-		// Quick Edit the CPT in the CPTs WP_List_Table.
-		$I->quickEdit(
-			$I,
-			postType: 'article',
-			postID: $postID,
-			configuration: [
-				'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
-		);
-
-		// 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 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 for CPTs displays when the Default option is chosen via
-	 * WordPress' Bulk Edit functionality.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two CPTs.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'article',
-					'post_title' => 'Kit: CPT: Form: Default: Bulk Edit #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'article',
-					'post_title' => 'Kit: CPT: Form: Default: Bulk Edit #2',
-				]
-			),
-		);
-
-		// Bulk Edit the CPTs in the CPTs WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'article',
-			postIDs: $postIDs,
-			configuration: [
-				'form' => [ 'select', 'Default' ],
-			]
-		);
-
-		// Iterate through CPTs to run frontend tests.
-		foreach ($postIDs as $postID) {
-			// Load CPT on the frontend site.
-			$I->amOnPage('/?p=' . $postID);
-
-			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the defined form displays when chosen via
-	 * WordPress' Bulk Edit functionality.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two CPTs.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'article',
-					'post_title' => 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'article',
-					'post_title' => 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #2',
-				]
-			),
-		);
-
-		// Bulk Edit the CPTs in the CPTs WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'article',
-			postIDs: $postIDs,
-			configuration: [
-				'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
-		);
-
-		// Iterate through CPTs to run frontend tests.
-		foreach ($postIDs as $postID) {
-			// Load CPT on the frontend site.
-			$I->amOnPage('/?p=' . $postID);
-
-			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the existing settings are honored and not changed
-	 * when the Bulk Edit options are set to 'No Change'.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditWithNoChanges(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two CPTs with a defined form.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'article',
-					'post_title' => 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #1',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
-							'landing_page' => '',
-							'tag'          => '',
-						],
-					],
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'article',
-					'post_title' => 'Kit: CPT: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #2',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
-							'landing_page' => '',
-							'tag'          => '',
-						],
-					],
-				]
-			),
-		);
-
-		// Bulk Edit the CPTs in the CPTs WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'article',
-			postIDs: $postIDs,
-			configuration: [
-				'form' => [ 'select', '— No Change —' ],
-			]
-		);
-
-		// Iterate through CPTs to run frontend tests.
-		foreach ($postIDs as $postID) {
-			// Load CPT on the frontend site.
-			$I->amOnPage('/?p=' . $postID);
-
-			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the Bulk Edit fields do not display when a search on a WP_List_Table
-	 * returns no results.
-	 *
-	 * @since   2.4.3
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditFieldsHiddenWhenNoCPTsFound(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin(
-			$I,
-			[
-				'article_form' => $_ENV['CONVERTKIT_API_FORM_ID'],
-			]
-		);
-		$I->setupKitPluginResources($I);
-
-		// Emulate the user searching for CPTs with a query string that yields no results.
-		$I->amOnAdminPage('edit.php?post_type=article&s=nothing');
-
-		// Confirm that the Bulk Edit fields do not display.
-		$I->dontSeeElement('#convertkit-bulk-edit');
-	}
-
-	/**
-	 * 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/PageBulkQuickEditFormCest.php b/tests/EndToEnd/forms/post-types/PageBulkQuickEditFormCest.php
deleted file mode 100644
index f3af3b2f4..000000000
--- a/tests/EndToEnd/forms/post-types/PageBulkQuickEditFormCest.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for Kit Forms on WordPress Pages when using the Bulk and Quick Edit functionality.
- *
- * @since   1.9.6
- */
-class PageBulkQuickEditFormCest
-{
-	/**
-	 * 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 Kit plugin.
-		$I->activateKitPlugin($I);
-	}
-
-	/**
-	 * Test that the Default Form for Pages displays when the Default option is chosen via
-	 * WordPress' Quick Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testQuickEditUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create a Page.
-		$pageID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'page',
-				'post_title' => 'Kit: Page: Form: Default: Quick Edit',
-			]
-		);
-
-		// Quick Edit the Page in the Pages WP_List_Table.
-		$I->quickEdit(
-			$I,
-			postType: 'page',
-			postID: $pageID,
-			configuration: [
-				'form' => [ 'select', 'Default' ],
-			]
-		);
-
-		// 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 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 defined form displays when chosen via
-	 * WordPress' Quick Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testQuickEditUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create a Page.
-		$pageID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'page',
-				'post_title' => 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Quick Edit',
-			]
-		);
-
-		// Quick Edit the Page in the Pages WP_List_Table.
-		$I->quickEdit(
-			$I,
-			postType: 'page',
-			postID: $pageID,
-			configuration: [
-				'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
-		);
-
-		// 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 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 for Pages displays when the Default option is chosen via
-	 * WordPress' Bulk Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two Pages.
-		$pageIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'page',
-					'post_title' => 'Kit: Page: Form: Default: Bulk Edit #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'page',
-					'post_title' => 'Kit: Page: Form: Default: Bulk Edit #2',
-				]
-			),
-		);
-
-		// Bulk Edit the Pages in the Pages WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'page',
-			postIDs: $pageIDs,
-			configuration: [
-				'form' => [ 'select', 'Default' ],
-			]
-		);
-
-		// Iterate through Pages to run frontend tests.
-		foreach ($pageIDs as $pageID) {
-			// Load 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the defined form displays when chosen via
-	 * WordPress' Bulk Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two Pages.
-		$pageIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'page',
-					'post_title' => 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'page',
-					'post_title' => 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #2',
-				]
-			),
-		);
-
-		// Bulk Edit the Pages in the Pages WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'page',
-			postIDs: $pageIDs,
-			configuration: [
-				'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
-		);
-
-		// Iterate through Pages to run frontend tests.
-		foreach ($pageIDs as $pageID) {
-			// Load 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the existing settings are honored and not changed
-	 * when the Bulk Edit options are set to 'No Change'.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditWithNoChanges(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two Pages with a defined form.
-		$pageIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'page',
-					'post_title' => 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #1',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
-							'landing_page' => '',
-							'tag'          => '',
-						],
-					],
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'page',
-					'post_title' => 'Kit: Page: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #2',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
-							'landing_page' => '',
-							'tag'          => '',
-						],
-					],
-				]
-			),
-		);
-
-		// Bulk Edit the Pages in the Pages WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'page',
-			postIDs: $pageIDs,
-			configuration: [
-				'form' => [ 'select', '— No Change —' ],
-			]
-		);
-
-		// Iterate through Pages to run frontend tests.
-		foreach ($pageIDs as $pageID) {
-			// Load 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the Bulk Edit fields do not display when a search on a WP_List_Table
-	 * returns no results.
-	 *
-	 * @since   1.9.8.1
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditFieldsHiddenWhenNoPagesFound(EndToEndTester $I)
-	{
-		// Setup Kit plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Emulate the user searching for Pages with a query string that yields no results.
-		$I->amOnAdminPage('edit.php?post_type=page&s=nothing');
-
-		// Confirm that the Bulk Edit fields do not display.
-		$I->dontSeeElement('#convertkit-bulk-edit');
-	}
-
-	/**
-	 * 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/EndToEnd/forms/post-types/PostBulkQuickEditFormCest.php b/tests/EndToEnd/forms/post-types/PostBulkQuickEditFormCest.php
deleted file mode 100644
index 5ddad964a..000000000
--- a/tests/EndToEnd/forms/post-types/PostBulkQuickEditFormCest.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for Kit Forms on WordPress Posts.
- *
- * @since   1.9.6
- */
-class PostBulkQuickEditFormCest
-{
-	/**
-	 * 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 Default Form for Pages displays when the Default option is chosen via
-	 * WordPress' Quick Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testQuickEditUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create a Post.
-		$postID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'post',
-				'post_title' => 'Kit: Post: Form: Default: Quick Edit',
-			]
-		);
-
-		// Quick Edit the Post in the Posts WP_List_Table.
-		$I->quickEdit(
-			$I,
-			postType: 'post',
-			postID: $postID,
-			configuration: [
-				'form' => [ 'select', 'Default' ],
-			]
-		);
-
-		// 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 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 defined form displays when chosen via
-	 * WordPress' Quick Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testQuickEditUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create a Post.
-		$postID = $I->havePostInDatabase(
-			[
-				'post_type'  => 'post',
-				'post_title' => 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Quick Edit',
-			]
-		);
-
-		// Quick Edit the Post in the Posts WP_List_Table.
-		$I->quickEdit(
-			$I,
-			postType: 'post',
-			postID: $postID,
-			configuration: [
-				'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
-		);
-
-		// 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 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 for Posts displays when the Default option is chosen via
-	 * WordPress' Bulk Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditUsingDefaultForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two Posts.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'post',
-					'post_title' => 'Kit: Post: Form: Default: Bulk Edit #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'post',
-					'post_title' => 'Kit: Post: Form: Default: Bulk Edit #2',
-				]
-			),
-		);
-
-		// Bulk Edit the Posts in the Posts WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'post',
-			postIDs: $postIDs,
-			configuration: [
-				'form' => [ 'select', 'Default' ],
-			]
-		);
-
-		// Iterate through Posts to run frontend tests.
-		foreach ($postIDs as $postID) {
-			// Load Post on the frontend site.
-			$I->amOnPage('/?p=' . $postID);
-
-			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the defined form displays when chosen via
-	 * WordPress' Bulk Edit functionality.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditUsingDefinedForm(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two Posts.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'post',
-					'post_title' => 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #1',
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'post',
-					'post_title' => 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit #2',
-				]
-			),
-		);
-
-		// Bulk Edit the Posts in the Posts WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'post',
-			postIDs: $postIDs,
-			configuration: [
-				'form' => [ 'select', $_ENV['CONVERTKIT_API_FORM_NAME'] ],
-			]
-		);
-
-		// Iterate through Posts to run frontend tests.
-		foreach ($postIDs as $postID) {
-			// Load Post on the frontend site.
-			$I->amOnPage('/?p=' . $postID);
-
-			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the existing settings are honored and not changed
-	 * when the Bulk Edit options are set to 'No Change'.
-	 *
-	 * @since   1.9.8.0
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditWithNoChanges(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Programmatically create two Posts with a defined form.
-		$postIDs = array(
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'post',
-					'post_title' => 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #1',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
-							'landing_page' => '',
-							'tag'          => '',
-						],
-					],
-				]
-			),
-			$I->havePostInDatabase(
-				[
-					'post_type'  => 'post',
-					'post_title' => 'Kit: Post: Form: ' . $_ENV['CONVERTKIT_API_FORM_NAME'] . ': Bulk Edit with No Change #2',
-					'meta_input' => [
-						'_wp_convertkit_post_meta' => [
-							'form'         => $_ENV['CONVERTKIT_API_FORM_ID'],
-							'landing_page' => '',
-							'tag'          => '',
-						],
-					],
-				]
-			),
-		);
-
-		// Bulk Edit the Posts in the Posts WP_List_Table.
-		$I->bulkEdit(
-			$I,
-			postType: 'post',
-			postIDs: $postIDs,
-			configuration: [
-				'form' => [ 'select', '— No Change —' ],
-			]
-		);
-
-		// Iterate through Posts to run frontend tests.
-		foreach ($postIDs as $postID) {
-			// Load Post on the frontend site.
-			$I->amOnPage('/?p=' . $postID);
-
-			// 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->seeFormOutput($I, $_ENV['CONVERTKIT_API_FORM_ID']);
-		}
-	}
-
-	/**
-	 * Test that the Bulk Edit fields do not display when a search on a WP_List_Table
-	 * returns no results.
-	 *
-	 * @since   1.9.8.1
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testBulkEditFieldsHiddenWhenNoPostsFound(EndToEndTester $I)
-	{
-		// Setup Kit Plugin.
-		$I->setupKitPlugin($I);
-		$I->setupKitPluginResources($I);
-
-		// Emulate the user searching for Posts with a query string that yields no results.
-		$I->amOnAdminPage('edit.php?post_type=post&s=nothing');
-
-		// Confirm that the Bulk Edit fields do not display.
-		$I->dontSeeElement('#convertkit-bulk-edit');
-	}
-
-	/**
-	 * 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 2a5cacd266ab45b0ce0260e032271facb0025534 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 27 Mar 2026 18:36:50 +0800
Subject: [PATCH 3/7] Tests: Classic Editor: No Forms: Refactor

---
 .../post-types/ClassicEditorFormCest.php      | 27 +++++++
 .../forms/post-types/PageNoFormCest.php       | 72 -------------------
 2 files changed, 27 insertions(+), 72 deletions(-)
 delete mode 100644 tests/EndToEnd/forms/post-types/PageNoFormCest.php

diff --git a/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php b/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php
index 4a0a083b5..d33f005d5 100644
--- a/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php
+++ b/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php
@@ -74,6 +74,33 @@ public function testAccessibility(EndToEndTester $I)
 		}
 	}
 
+	/**
+	 * Test that UTM parameters are included in links displayed in the metabox for the user to sign in to
+	 * their Kit account.
+	 *
+	 * @since   1.9.6
+	 *
+	 * @param   EndToEndTester $I  Tester.
+	 */
+	public function testUTMParametersExist(EndToEndTester $I)
+	{
+		// Setup Kit plugin with no credentials or data.
+		$I->setupKitPluginCredentialsNoData($I);
+		$I->setupKitPluginResourcesNoData($I);
+
+		// Navigate to Pages > Add New.
+		$I->amOnAdminPage('post-new.php?post_type=page');
+
+		// Check that no PHP warnings or notices were output.
+		$I->checkNoWarningsAndNoticesOnScreen($I);
+
+		// Check that the metabox is displayed.
+		$I->seeElementInDOM('#wp-convertkit-meta-box');
+
+		// 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>');
+	}
+
 	/**
 	 * Test that the 'Default' option for the Default Form setting in the Plugin Settings works when
 	 * creating and viewing a new WordPress Page, Post or Article, and there is no Default Form specified in the Plugin
diff --git a/tests/EndToEnd/forms/post-types/PageNoFormCest.php b/tests/EndToEnd/forms/post-types/PageNoFormCest.php
deleted file mode 100644
index f0474f33b..000000000
--- a/tests/EndToEnd/forms/post-types/PageNoFormCest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Tests\EndToEnd;
-
-use Tests\Support\EndToEndTester;
-
-/**
- * Tests for WordPress Pages when no Kit Forms exist in the Kit account.
- *
- * @since   1.9.6.1
- */
-class PageNoFormCest
-{
-	/**
-	 * Run common actions before running the test functions in this class.
-	 *
-	 * @since   1.9.6.1
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function _before(EndToEndTester $I)
-	{
-		// Activate and Setup Kit plugin.
-		$I->activateKitPlugin($I);
-		$I->setupKitPluginCredentialsNoData($I);
-		$I->setupKitPluginResourcesNoData($I);
-	}
-
-	/**
-	 * Test that UTM parameters are included in links displayed in the metabox for the user to sign in to
-	 * their Kit account.
-	 *
-	 * @since   1.9.6
-	 *
-	 * @param   EndToEndTester $I  Tester.
-	 */
-	public function testUTMParametersExist(EndToEndTester $I)
-	{
-		// Activate Classic Editor Plugin.
-		$I->activateThirdPartyPlugin($I, 'classic-editor');
-
-		// Navigate to Pages > Add New.
-		$I->amOnAdminPage('post-new.php?post_type=page');
-
-		// Check that no PHP warnings or notices were output.
-		$I->checkNoWarningsAndNoticesOnScreen($I);
-
-		// Check that the metabox is displayed.
-		$I->seeElementInDOM('#wp-convertkit-meta-box');
-
-		// 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');
-	}
-
-	/**
-	 * 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 83e61c8cb060f708ce5446c2d3db76fedb2ce6c5 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 27 Mar 2026 20:25:34 +0800
Subject: [PATCH 4/7] Fix tests

---
 .../forms/post-types/BlockEditorFormCest.php  | 208 +++++++++---------
 1 file changed, 109 insertions(+), 99 deletions(-)

diff --git a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
index d3acb36c7..40219fcf7 100644
--- a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
+++ b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
@@ -42,14 +42,14 @@ public function _before(EndToEndTester $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
+	 * creating and viewing a new WordPress Page, Post or Article, and there is no Default Form specified in the Plugin
 	 * settings.
 	 *
 	 * @since   1.9.6
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin(EndToEndTester $I)
 	{
 		// Setup Kit plugin with no default Forms configured.
 		$I->setupKitPluginNoDefaultForms($I);
@@ -57,14 +57,14 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
 				title: 'Kit: ' . $postType . ': Form: Default: None'
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that no Kit Form is displayed.
@@ -74,13 +74,13 @@ public function testAddNewPageUsingDefaultFormWithNoDefaultFormSpecifiedInPlugin
 
 	/**
 	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page.
+	 * creating and viewing a new WordPress Page, Post or Article.
 	 *
 	 * @since   1.9.6
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultForm(EndToEndTester $I)
 	{
 		// Setup Kit plugin.
 		$I->setupKitPlugin($I);
@@ -88,14 +88,14 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $I)
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
 				title: 'Kit: ' . $postType . ': Form: Default'
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -106,40 +106,42 @@ public function testAddNewPageUsingDefaultForm(EndToEndTester $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 Page content.
+	 * creating and viewing a new WordPress Page, Post or Article, and its position is set
+	 * to after the Post Type content.
 	 *
 	 * @since   2.5.8
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormBeforeContent(EndToEndTester $I)
 	{
-		// Setup Kit plugin with Default Form for Pages set to be output before the Page content.
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output before the Post Type content.
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form_position' => 'before_content',
+				'page_form_position'    => 'before_content',
+				'post_form_position'    => 'before_content',
+				'article_form_position' => 'before_content',
 			]
 		);
 		$I->setupKitPluginResources($I);
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
 				title: 'Kit: ' . $postType . ': Form: Default: Before Content'
 			);
 
-			// Add paragraph to Page.
-			$I->addGutenbergParagraphBlock($I, 'Page content');
+			// Add paragraph to Post Type.
+			$I->addGutenbergParagraphBlock($I, $postType . ' content');
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
-			// Confirm that one Kit Form is output in the DOM after the Page content.
+			// Confirm that one Kit Form is output in the DOM after the Post Type content.
 			// This confirms that there is only one script on the page for this form, which renders the form.
 			$I->seeFormOutput(
 				$I,
@@ -151,40 +153,42 @@ public function testAddNewPageUsingDefaultFormBeforeContent(EndToEndTester $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 before and after the Page content.
+	 * creating and viewing a new WordPress Page, Post or Article, and its position is set
+	 * to before and after the Post Type content.
 	 *
 	 * @since   2.5.9
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormBeforeAndAfterContent(EndToEndTester $I)
 	{
-		// Setup Kit plugin with Default Form for Pages set to be output before and after the Page content.
+		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output before and after the Post Type content.
 		$I->setupKitPlugin(
 			$I,
 			[
-				'page_form_position' => 'before_after_content',
+				'page_form_position'    => 'before_after_content',
+				'post_form_position'    => 'before_after_content',
+				'article_form_position' => 'before_after_content',
 			]
 		);
 		$I->setupKitPluginResources($I);
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type 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, 'Page content');
+			// Add paragraph to Post Type.
+			$I->addGutenbergParagraphBlock($I, $postType . ' content');
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
-			// Confirm that two Kit Forms are output in the DOM before and after the Page content.
+			// Confirm that two Kit Forms are output in the DOM before and after the Post Type content.
 			$I->seeFormOutput(
 				$I,
 				formID: $_ENV['CONVERTKIT_API_FORM_ID'],
@@ -195,14 +199,14 @@ public function testAddNewPageUsingDefaultFormBeforeAndAfterContent(EndToEndTest
 
 	/**
 	 * 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.
+	 * creating and viewing a new WordPress Page, Post or Article, and its position is set
+	 * to after the 3rd paragraph of Post Type content.
 	 *
 	 * @since   2.6.2
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormAfterParagraphElement(EndToEndTester $I)
 	{
 		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output after the 3rd paragraph of content.
 		$I->setupKitPlugin(
@@ -226,14 +230,14 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
+			// Setup Post Type 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.
+			// View the Post Type on the frontend site.
 			$I->amOnPage('?p=' . $pageID);
 
 			// Check that no PHP warnings or notices were output.
@@ -262,13 +266,13 @@ public function testAddNewPageUsingDefaultFormAfterParagraphElement(EndToEndTest
 	/**
 	 * 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.
+	 * to after the 3rd paragraph of Post Type content.
 	 *
 	 * @since   2.6.8
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultNonInlineFormAfterParagraphElement(EndToEndTester $I)
 	{
 		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output after the 3rd paragraph of content.
 		$I->setupKitPlugin(
@@ -292,14 +296,14 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
+			// Setup Post Type 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.
+			// View the Post Type on the frontend site.
 			$I->amOnPage('?p=' . $pageID);
 
 			// Check that no PHP warnings or notices were output.
@@ -322,14 +326,14 @@ public function testAddNewPageUsingDefaultNonInlineFormAfterParagraphElement(End
 
 	/**
 	 * 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.
+	 * creating and viewing a new WordPress Page, Post or Article, and its position is set
+	 * to after the 2nd <h2> element of Post Type content.
 	 *
 	 * @since   2.6.6
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormAfterHeadingElement(EndToEndTester $I)
 	{
 		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output after the 2nd <h2> of content.
 		$I->setupKitPlugin(
@@ -353,14 +357,14 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
+			// Setup Post Type 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.
+			// View the Post Type on the frontend site.
 			$I->amOnPage('?p=' . $pageID);
 
 			// Check that no PHP warnings or notices were output.
@@ -388,19 +392,22 @@ public function testAddNewPageUsingDefaultFormAfterHeadingElement(EndToEndTester
 
 	/**
 	 * 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.
+	 * creating and viewing a new WordPress Page, Post or Article, and its position is set
+	 * to after the 2nd <img> element of Post Type content.
 	 *
 	 * @since   2.6.2
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormAfterImageElement(EndToEndTester $I)
 	{
 		// Setup Kit plugin with Default Form for Pages, Posts and Articles 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',
@@ -416,13 +423,13 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
+			// Setup Post Type with placeholder content.
 			$pageID = $I->addGutenbergPageToDatabase(
 				$I,
 				title: 'Kit: Page: Form: Default: After 2nd Image Element'
 			);
 
-			// View the Post on the frontend site.
+			// View the Post Type on the frontend site.
 			$I->amOnPage('?p=' . $pageID);
 
 			// Check that no PHP warnings or notices were output.
@@ -450,14 +457,14 @@ public function testAddNewPageUsingDefaultFormAfterImageElement(EndToEndTester $
 
 	/**
 	 * Test that the Default Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page, and its position is set
+	 * creating and viewing a new WordPress Page, Post or Article, 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 testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultFormAfterOutOfBoundsElement(EndToEndTester $I)
 	{
 		// Setup Kit plugin with Default Form for Pages, Posts and Articles set to be output after the 9th paragraph of content.
 		$I->setupKitPlugin(
@@ -481,14 +488,14 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Setup Page with placeholder content.
+			// Setup Post Type 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.
+			// View the Post Type on the frontend site.
 			$I->amOnPage('?p=' . $pageID);
 
 			// Check that no PHP warnings or notices were output.
@@ -515,13 +522,13 @@ public function testAddNewPageUsingDefaultFormAfterOutOfBoundsElement(EndToEndTe
 
 	/**
 	 * Test that the Default Legacy Form specified in the Plugin Settings works when
-	 * creating and viewing a new WordPress Page.
+	 * creating and viewing a new WordPress Page, Post or Article.
 	 *
 	 * @since   1.9.6.3
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefaultLegacyForm(EndToEndTester $I)
 	{
 		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
 		$I->setupKitPlugin(
@@ -538,14 +545,14 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
 				title: 'Kit: ' . $postType . ': Form: Legacy: Default'
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that the Kit Default Legacy Form displays.
@@ -558,13 +565,13 @@ public function testAddNewPageUsingDefaultLegacyForm(EndToEndTester $I)
 
 	/**
 	 * Test that 'None' Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
+	 * creating and viewing a new WordPress Page, Post or Article.
 	 *
 	 * @since   1.9.6
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingNoForm(EndToEndTester $I)
+	public function testAddNewPostTypeUsingNoForm(EndToEndTester $I)
 	{
 		// Setup Kit plugin.
 		$I->setupKitPlugin($I);
@@ -572,7 +579,7 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -585,7 +592,7 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 				form: 'None',
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that no Kit Form is displayed.
@@ -595,13 +602,13 @@ public function testAddNewPageUsingNoForm(EndToEndTester $I)
 
 	/**
 	 * Test that the Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
+	 * creating and viewing a new WordPress Page, Post or Article.
 	 *
 	 * @since   1.9.6
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefinedForm(EndToEndTester $I)
 	{
 		// Setup Kit plugin.
 		$I->setupKitPlugin($I);
@@ -609,7 +616,7 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -622,7 +629,7 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 				form: $_ENV['CONVERTKIT_API_FORM_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -633,13 +640,13 @@ public function testAddNewPageUsingDefinedForm(EndToEndTester $I)
 
 	/**
 	 * Test that the Modal Form is output once when the Autoptimize Plugin is active and
-	 * its "Defer JavaScript" setting is enabled.
+	 * its "Defer JavaScript" setting is enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.9
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithAutoptimizePlugin(EndToEndTester $I)
 	{
 		// Setup Plugin and Resources.
 		$I->setupKitPlugin($I);
@@ -650,7 +657,7 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -663,7 +670,7 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -678,13 +685,13 @@ public function testAddNewPageUsingModalFormWithAutoptimizePlugin(EndToEndTester
 
 	/**
 	 * 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.
+	 * its "Defer JavaScript" and "Delay All Scripts" settings are enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.8.6
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 	{
 		// Setup Plugin and Resources.
 		$I->setupKitPlugin($I);
@@ -699,7 +706,7 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -712,7 +719,7 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -728,13 +735,13 @@ public function testAddNewPageUsingModalFormWithDebloatPlugin(EndToEndTester $I)
 
 	/**
 	 * Test that the Modal Form is output once when the Jetpack Boost Plugin is active and
-	 * its "Defer Non-Essential JavaScript" setting is enabled.
+	 * its "Defer Non-Essential JavaScript" setting is enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.5
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithJetpackBoostPlugin(EndToEndTester $I)
 	{
 		// Setup Plugin and Resources.
 		$I->setupKitPlugin($I);
@@ -750,7 +757,7 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -763,7 +770,7 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -779,13 +786,13 @@ public function testAddNewPageUsingModalFormWithJetpackBoostPlugin(EndToEndTeste
 
 	/**
 	 * Test that the Modal Form is output once when the LiteSpeed Cache Plugin is active and
-	 * its "Load JS Deferred" setting is enabled.
+	 * its "Load JS Deferred" setting is enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.5
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithLiteSpeedCachePlugin(EndToEndTester $I)
 	{
 		// Setup Kit plugin.
 		$I->setupKitPlugin($I);
@@ -800,7 +807,7 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -813,7 +820,7 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -828,13 +835,13 @@ public function testAddNewPageUsingModalFormWithLiteSpeedCachePlugin(EndToEndTes
 
 	/**
 	 * 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.
+	 * and its "Combine JavaScript Files" setting is enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.5
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithSitegroundSpeedOptimizerPlugin(EndToEndTester $I)
 	{
 		// Setup Plugin and Resources.
 		$I->setupKitPlugin($I);
@@ -853,7 +860,7 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -866,7 +873,7 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM.
@@ -879,19 +886,20 @@ public function testAddNewPageUsingModalFormWithSitegroundSpeedOptimizerPlugin(E
 
 	/**
 	 * Test that the Modal Form is output once when the Perfmatters Plugin is active and its "Delay JavaScript"
-	 * setting is enabled.
+	 * setting is enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.7
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithPerfmattersPlugin(EndToEndTester $I)
 	{
 		// Setup Plugin and Resources.
 		$I->setupKitPlugin($I);
 		$I->setupKitPluginResources($I);
 
 		// Activate Perfmatters Plugin.
+		$I->activateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
 		$I->activateThirdPartyPlugin($I, 'perfmatters');
 
 		// Enable Defer and Delay JavaScript.
@@ -908,7 +916,7 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -921,7 +929,7 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM within the <main> element.
@@ -931,17 +939,18 @@ public function testAddNewPageUsingModalFormWithPerfmattersPlugin(EndToEndTester
 
 		// Deactivate Perfmatters Plugin.
 		$I->deactivateThirdPartyPlugin($I, 'perfmatters');
+		$I->deactivateThirdPartyPlugin($I, 'disable-_load_textdomain_just_in_time-doing_it_wrong-notice');
 	}
 
 	/**
 	 * Test that the Modal Form is output once when the WP Rocket Plugin is active and its "Delay JavaScript execution"
-	 * setting is enabled.
+	 * setting is enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.7
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I)
+	public function testAddNewPostTypeUsingModalFormWithWPRocketPlugin(EndToEndTester $I)
 	{
 		// Setup Plugin and Resources.
 		$I->setupKitPlugin($I);
@@ -956,7 +965,7 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -969,7 +978,8 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 				form: $_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
+			die();
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM within the <main> element.
@@ -984,13 +994,13 @@ public function testAddNewPageUsingModalFormWithWPRocketPlugin(EndToEndTester $I
 
 	/**
 	 * Test that the Legacy Form specified in the Page Settings works when
-	 * creating and viewing a new WordPress Page.
+	 * creating and viewing a new WordPress Page, Post or Article.
 	 *
 	 * @since   1.9.6.3
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
+	public function testAddNewPostTypeUsingDefinedLegacyForm(EndToEndTester $I)
 	{
 		// Setup Plugin with API Key and Secret, which is required for Legacy Forms to work.
 		$I->setupKitPlugin(
@@ -1007,7 +1017,7 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
-			// Add a Page using the Gutenberg editor.
+			// Add a Post Type using the Gutenberg editor.
 			$I->addGutenbergPage(
 				$I,
 				postType: $postType,
@@ -1020,7 +1030,7 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 				form: $_ENV['CONVERTKIT_API_LEGACY_FORM_NAME']
 			);
 
-			// Publish and view the Page on the frontend site.
+			// Publish and view the Post Type on the frontend site.
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that the Kit Legacy Form displays.
@@ -1033,7 +1043,7 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 
 	/**
 	 * Test that the Default Form for Pages displays when an invalid Form ID is specified
-	 * for a Page.
+	 * for a Page, Post or Article.
 	 *
 	 * Whilst the on screen options won't permit selecting an invalid Form ID, a Page might
 	 * have an invalid Form ID because:
@@ -1044,7 +1054,7 @@ public function testAddNewPageUsingDefinedLegacyForm(EndToEndTester $I)
 	 *
 	 * @param   EndToEndTester $I  Tester.
 	 */
-	public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
+	public function testAddNewPostTypeUsingInvalidDefinedForm(EndToEndTester $I)
 	{
 		// Setup Kit plugin.
 		$I->setupKitPlugin($I);
@@ -1052,7 +1062,7 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $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
+			// Create Post Type, 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(
 				[
@@ -1068,7 +1078,7 @@ public function testAddNewPageUsingInvalidDefinedForm(EndToEndTester $I)
 				]
 			);
 
-			// Load the Page on the frontend site.
+			// Load the Post Type on the frontend site.
 			$I->amOnPage('/?p=' . $pageID);
 
 			// Check that no PHP warnings or notices were output.

From 47490eb0d48e412e4e25bcc367955ee8a26ce640 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 27 Mar 2026 20:31:02 +0800
Subject: [PATCH 5/7] Coding Standards

---
 tests/EndToEnd/forms/post-types/BlockEditorFormCest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
index 40219fcf7..764183ccb 100644
--- a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
+++ b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
@@ -979,7 +979,6 @@ public function testAddNewPostTypeUsingModalFormWithWPRocketPlugin(EndToEndTeste
 			);
 
 			// Publish and view the Post Type on the frontend site.
-			die();
 			$I->publishAndViewGutenbergPage($I);
 
 			// Confirm that one Kit Form is output in the DOM within the <main> element.

From cc05ed61bdf22b7f378809869ddad02acdb56dea Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Fri, 27 Mar 2026 21:38:12 +0800
Subject: [PATCH 6/7] Fix tests

---
 .../forms/post-types/BulkQuickEditFormCest.php      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php b/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php
index 906d39764..17a9ce8e0 100644
--- a/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php
+++ b/tests/EndToEnd/forms/post-types/BulkQuickEditFormCest.php
@@ -11,6 +11,19 @@
  */
 class BulkQuickEditFormCest
 {
+	/**
+	 * 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.
 	 *

From 5372d6cee4422a3ac26673f09e50746b5390a75f Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Mon, 30 Mar 2026 14:55:41 +0800
Subject: [PATCH 7/7] Fix tests

---
 .../PageBlockFormPerformancePluginsCest.php   | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php
index fbc5d43a6..dbcaac603 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php
@@ -47,12 +47,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.
@@ -105,12 +102,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.
@@ -164,12 +158,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.
@@ -227,12 +218,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.
@@ -284,12 +272,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.
@@ -350,12 +335,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.
@@ -407,12 +389,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.
@@ -471,12 +450,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.