diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 269f131f..b8a65247 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -256,10 +256,10 @@ jobs:
         working-directory: ${{ env.PLUGIN_DIR }}
         run: php vendor/bin/codecept build
 
-      # Run Codeception WPUnit Tests on the PHP 8.0 instance before the acceptance/broadcasts acceptance tests.
+      # Run Codeception WPUnit Tests on the PHP 8.3 instance before the acceptance/tags acceptance tests.
       # We run these once to avoid hitting API rate limits.
       - name: Run tests/wpunit
-        if: ${{ matrix.php-versions == '8.0' && matrix.test-groups == 'acceptance/broadcasts' }}
+        if: ${{ matrix.php-versions == '8.3' && matrix.test-groups == 'acceptance/tags' }}
         working-directory: ${{ env.PLUGIN_DIR }}
         run: php vendor/bin/codecept run tests/wpunit --fail-fast
 
diff --git a/tests/_support/Helper/Acceptance/ConvertKitForms.php b/tests/_support/Helper/Acceptance/ConvertKitForms.php
index 403c683c..c88b9365 100644
--- a/tests/_support/Helper/Acceptance/ConvertKitForms.php
+++ b/tests/_support/Helper/Acceptance/ConvertKitForms.php
@@ -53,16 +53,16 @@ public function seeFormOutput($I, $formID, $position = false, $element = false,
 				// The block editor automatically adds CSS classes to some elements.
 				switch ( $element ) {
 					case 'p':
-						$I->seeInSource('<' . $element . '>Item #' . $element_index . '</' . $element . '><form action="https://app.convertkit.com/forms/' . $formID . '/subscriptions" ');
+						$I->seeInSource('<' . $element . '>Item #' . $element_index . '</' . $element . '><form action="https://app.kit.com/forms/' . $formID . '/subscriptions" ');
 						break;
 
 					case 'img':
-						$I->seeInSource('<' . $element . ' decoding="async" src="https://placehold.co/600x400" alt="Image #' . $element_index . '"><form action="https://app.convertkit.com/forms/' . $formID . '/subscriptions" ');
+						$I->seeInSource('<' . $element . ' decoding="async" src="https://placehold.co/600x400" alt="Image #' . $element_index . '"><form action="https://app.kit.com/forms/' . $formID . '/subscriptions" ');
 						break;
 
 					// Headings.
 					default:
-						$I->seeInSource('<' . $element . ' class="wp-block-heading">Item #' . $element_index . '</' . $element . '><form action="https://app.convertkit.com/forms/' . $formID . '/subscriptions" ');
+						$I->seeInSource('<' . $element . ' class="wp-block-heading">Item #' . $element_index . '</' . $element . '><form action="https://app.kit.com/forms/' . $formID . '/subscriptions" ');
 						break;
 				}
 				break;
diff --git a/tests/acceptance/forms/general/CategoryFormCest.php b/tests/acceptance/forms/general/CategoryFormCest.php
index a4f25ead..157d09c9 100644
--- a/tests/acceptance/forms/general/CategoryFormCest.php
+++ b/tests/acceptance/forms/general/CategoryFormCest.php
@@ -202,7 +202,7 @@ public function testAddCategoryWithFormPositionBefore(AcceptanceTester $I)
 		$I->seeInSource(
 			'</h1>
 
-	<form action="https://app.convertkit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
+	<form action="https://app.kit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
 		);
 
 		// Confirm that one ConvertKit Form is output in the DOM.
@@ -259,7 +259,7 @@ public function testAddCategoryWithFormPositionAfter(AcceptanceTester $I)
 		// Confirm form is after closing div element.
 		$I->seeInSource(
 			'</div>
-	<form action="https://app.convertkit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
+	<form action="https://app.kit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
 		);
 
 		// Confirm that one ConvertKit Form is output in the DOM.
@@ -339,7 +339,7 @@ public function testEditCategoryWithFormPositionBefore(AcceptanceTester $I)
 		$I->seeInSource(
 			'</h1>
 
-	<form action="https://app.convertkit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
+	<form action="https://app.kit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
 		);
 
 		// Confirm that one ConvertKit Form is output in the DOM.
@@ -418,7 +418,7 @@ public function testEditCategoryWithFormPositionAfter(AcceptanceTester $I)
 		// Confirm form is after closing div element.
 		$I->seeInSource(
 			'</div>
-	<form action="https://app.convertkit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
+	<form action="https://app.kit.com/forms/' . $_ENV['CONVERTKIT_API_FORM_ID'] . '/subscriptions"'
 		);
 
 		// Confirm that one ConvertKit Form is output in the DOM.
diff --git a/tests/acceptance/landing-pages/PageLandingPageCest.php b/tests/acceptance/landing-pages/PageLandingPageCest.php
index 2aed4eda..7af02a52 100644
--- a/tests/acceptance/landing-pages/PageLandingPageCest.php
+++ b/tests/acceptance/landing-pages/PageLandingPageCest.php
@@ -180,7 +180,7 @@ public function testLandingPageCharacterEncoding(AcceptanceTester $I)
 		$I->publishAndViewGutenbergPage($I);
 
 		// Confirm that the basic HTML structure is correct.
-		$I->seeLandingPageOutput($I);
+		$I->seeLandingPageOutput($I, true);
 
 		// Confirm that the Landing Page title is the same as defined on ConvertKit i.e. that character encoding is correct.
 		$I->seeInSource('Vantar þinn ungling sjálfstraust í stærðfræði?');
diff --git a/tests/wpunit/ResourceFormsTest.php b/tests/wpunit/ResourceFormsTest.php
index 63988823..9f063319 100644
--- a/tests/wpunit/ResourceFormsTest.php
+++ b/tests/wpunit/ResourceFormsTest.php
@@ -48,8 +48,8 @@ public function setUp(): void
 		update_option(
 			$this->settings::SETTINGS_NAME,
 			[
-				'access_token'  => $_ENV['CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA'],
-				'refresh_token' => $_ENV['CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA'],
+				'access_token'  => $_ENV['CONVERTKIT_OAUTH_ACCESS_TOKEN'],
+				'refresh_token' => $_ENV['CONVERTKIT_OAUTH_REFRESH_TOKEN'],
 			]
 		);
 
@@ -196,8 +196,8 @@ public function testGetWithInvalidOrderBy()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data has not changed.
-		$this->assertEquals('AAA Test', reset($result)['name']);
-		$this->assertEquals('WooCommerce Product Form', end($result)['name']);
+		$this->assertEquals('WPForms Form', reset($result)['name']);
+		$this->assertEquals('Legacy Form', end($result)['name']);
 	}
 
 	/**
@@ -223,8 +223,8 @@ public function testGetNonInline()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data is in ascending alphabetical order.
-		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'], reset($result)[ $this->resource->order_by ]);
-		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME'], end($result)[ $this->resource->order_by ]);
+		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME_ONLY'], reset($result)[ $this->resource->order_by ]);
+		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME_ONLY'], end($result)[ $this->resource->order_by ]);
 	}
 
 	/**
@@ -254,8 +254,8 @@ public function testGetNonInlineWithValidOrderByAndOrder()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data is in ascending alphabetical order.
-		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME'], reset($result)[ $this->resource->order_by ]);
-		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'], end($result)[ $this->resource->order_by ]);
+		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME_ONLY'], reset($result)[ $this->resource->order_by ]);
+		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME_ONLY'], end($result)[ $this->resource->order_by ]);
 	}
 
 	/**
@@ -284,8 +284,8 @@ public function testGetNonInlineWithInvalidOrderBy()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data has not changed.
-		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME'], reset($result)['name']);
-		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME'], end($result)['name']);
+		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_STICKY_BAR_NAME_ONLY'], reset($result)['name']);
+		$this->assertEquals($_ENV['CONVERTKIT_API_FORM_FORMAT_MODAL_NAME_ONLY'], end($result)['name']);
 	}
 
 	/**
@@ -332,7 +332,7 @@ public function testGetHTML()
 	{
 		$result = $this->resource->get_html($_ENV['CONVERTKIT_API_FORM_ID']);
 		$this->assertNotInstanceOf(WP_Error::class, $result);
-		$this->assertSame($result, '<script async data-uid="85629c512d" src="https://cheerful-architect-3237.ck.page/85629c512d/index.js"></script>');
+		$this->assertSame($result, '<script async data-uid="85629c512d" src="https://cheerful-architect-3237.ck.page/85629c512d/index.js" data-jetpack-boost="ignore" data-no-defer="1" nowprocket></script>');
 	}
 
 	/**
diff --git a/tests/wpunit/ResourcePostsTest.php b/tests/wpunit/ResourcePostsTest.php
index 7d6c3518..06e28de9 100644
--- a/tests/wpunit/ResourcePostsTest.php
+++ b/tests/wpunit/ResourcePostsTest.php
@@ -48,8 +48,8 @@ public function setUp(): void
 		update_option(
 			$this->settings::SETTINGS_NAME,
 			[
-				'access_token'  => $_ENV['CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA'],
-				'refresh_token' => $_ENV['CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA'],
+				'access_token'  => $_ENV['CONVERTKIT_OAUTH_ACCESS_TOKEN'],
+				'refresh_token' => $_ENV['CONVERTKIT_OAUTH_REFRESH_TOKEN'],
 			]
 		);
 
@@ -248,7 +248,7 @@ public function testGet()
 		$this->assertArrayHasKey('title', reset($result));
 
 		// Assert order of data is in descending published_at order.
-		$this->assertEquals($_ENV['CONVERTKIT_API_BROADCAST_FIRST_DATE'], reset($result)[ $this->resource->order_by ]);
+		$this->assertEquals('2024-04-30T08:00:36.000Z', reset($result)[ $this->resource->order_by ]);
 		$this->assertEquals('2022-01-24T00:00:00.000Z', end($result)[ $this->resource->order_by ]);
 	}
 
@@ -309,7 +309,7 @@ public function testGetWithInvalidOrderBy()
 		$this->assertArrayHasKey('title', reset($result));
 
 		// Assert order of data has not changed.
-		$this->assertEquals($_ENV['CONVERTKIT_API_BROADCAST_FIRST_DATE'], reset($result)['published_at']);
+		$this->assertEquals('2024-04-30T08:00:36.000Z', reset($result)['published_at']);
 		$this->assertEquals('2022-01-24T00:00:00.000Z', end($result)['published_at']);
 	}
 
diff --git a/tests/wpunit/ResourceProductsTest.php b/tests/wpunit/ResourceProductsTest.php
index 25aa6d41..e3a2e549 100644
--- a/tests/wpunit/ResourceProductsTest.php
+++ b/tests/wpunit/ResourceProductsTest.php
@@ -48,8 +48,8 @@ public function setUp(): void
 		update_option(
 			$this->settings::SETTINGS_NAME,
 			[
-				'access_token'  => $_ENV['CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA'],
-				'refresh_token' => $_ENV['CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA'],
+				'access_token'  => $_ENV['CONVERTKIT_OAUTH_ACCESS_TOKEN'],
+				'refresh_token' => $_ENV['CONVERTKIT_OAUTH_REFRESH_TOKEN'],
 			]
 		);
 
@@ -136,7 +136,7 @@ public function testGet()
 
 		// Assert order of data is in ascending alphabetical order.
 		$this->assertEquals('Example Tip Jar', reset($result)[ $this->resource->order_by ]);
-		$this->assertEquals('Newsletter Subscription', end($result)[ $this->resource->order_by ]);
+		$this->assertEquals('PDF Guide', end($result)[ $this->resource->order_by ]);
 	}
 
 	/**
@@ -166,7 +166,7 @@ public function testGetWithValidOrderByAndOrder()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data is in ascending alphabetical order.
-		$this->assertEquals('Newsletter Subscription', reset($result)[ $this->resource->order_by ]);
+		$this->assertEquals('PDF Guide', reset($result)[ $this->resource->order_by ]);
 		$this->assertEquals('Example Tip Jar', end($result)[ $this->resource->order_by ]);
 	}
 
@@ -196,7 +196,7 @@ public function testGetWithInvalidOrderBy()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data has not changed.
-		$this->assertEquals('Example Tip Jar', reset($result)['name']);
+		$this->assertEquals('PDF Guide', reset($result)['name']);
 		$this->assertEquals('Newsletter Subscription', end($result)['name']);
 	}
 
diff --git a/tests/wpunit/ResourceTagsTest.php b/tests/wpunit/ResourceTagsTest.php
index 1a82fa7c..93be7079 100644
--- a/tests/wpunit/ResourceTagsTest.php
+++ b/tests/wpunit/ResourceTagsTest.php
@@ -196,8 +196,8 @@ public function testGetWithInvalidOrderBy()
 		$this->assertArrayHasKey('name', reset($result));
 
 		// Assert order of data has not changed.
-		$this->assertEquals('wordpress', reset($result)['name']);
-		$this->assertEquals('wpforms', end($result)['name']);
+		$this->assertEquals('wpforms', reset($result)['name']);
+		$this->assertEquals('wordpress', end($result)['name']);
 	}
 
 	/**