From 7b4db96a8b1e4c1d54efc48ba9035c79420c5a81 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 29 Jul 2021 21:00:05 +0200
Subject: [PATCH 01/41] Implement dependency resolution for services

---
 includes/Infrastructure/HasRequirements.php   | 43 +++++++++
 .../Infrastructure/ServiceBasedPlugin.php     | 93 +++++++++++++++----
 .../Fixture/DummyServiceWithRequirements.php  | 33 +++++++
 .../Infrastructure/ServiceBasedPluginTest.php | 69 ++++++++++++--
 4 files changed, 208 insertions(+), 30 deletions(-)
 create mode 100644 includes/Infrastructure/HasRequirements.php
 create mode 100644 tests/phpunit/includes/Fixture/DummyServiceWithRequirements.php

diff --git a/includes/Infrastructure/HasRequirements.php b/includes/Infrastructure/HasRequirements.php
new file mode 100644
index 000000000000..1c31bd536eef
--- /dev/null
+++ b/includes/Infrastructure/HasRequirements.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Interface HasRequirements.
+ *
+ * @package Google\Web_Stories
+ */
+
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Web_Stories\Infrastructure;
+
+/**
+ * Something that requires other services to be registered before it can be registered.
+ *
+ * A class marked as having requirements can return the list of services it requires
+ * to be available before it can be registered.
+ *
+ * @since 1.10.0
+ * @internal
+ */
+interface HasRequirements {
+
+	/**
+	 * Get the list of service IDs required for this service to be registered.
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array;
+}
diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index 2fe76ce9ffa5..a9f0caff0382 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -19,6 +19,8 @@
 
 use Google\Web_Stories\Exception\InvalidService;
 use Google\Web_Stories\Infrastructure\ServiceContainer\LazilyInstantiatedService;
+use function add_action;
+use function apply_filters;
 use function Google\Web_Stories\rewrite_flush;
 
 
@@ -161,7 +163,7 @@ public function deactivate( $network_wide ) {
 	 */
 	public function register() {
 		if ( false !== static::REGISTRATION_ACTION ) {
-			\add_action(
+			add_action(
 				static::REGISTRATION_ACTION,
 				[ $this, 'register_services' ]
 			);
@@ -205,38 +207,89 @@ public function register_services() {
 			 *                                classes need to implement the
 			 *                                Service interface.
 			 */
-			$filtered_services = \apply_filters(
+			$filtered_services = apply_filters(
 				static::HOOK_PREFIX . static::SERVICES_FILTER,
 				$services
 			);
 
 			$services = $this->validate_services( $filtered_services, $services );
 		}
-		foreach ( $services as $id => $class ) {
-			$id    = $this->maybe_resolve( $id );
-			$class = $this->maybe_resolve( $class );
+
+		while ( null !== key( $services ) ) {
+			$id    = $this->maybe_resolve( key( $services ) );
+			$class = $this->maybe_resolve( current( $services ) );
+
+			// Delay registering the service until all requirements are met.
+			if (
+				is_a( $class, HasRequirements::class, true )
+				&&
+				! $this->requirements_are_met( $class, array_keys( $services ) )
+			) {
+				/*
+				 * Move the service to the end of the array.
+				 *
+				 * Note: Unsetting the key advances the internal array pointer to the next array item, so
+				 * the current array item will have to be temporarily stored so that it can be re-added later.
+				 */
+				$delayed_service = [ key( $services ) => current( $services ) ];
+				unset( $services[ key( $services ) ] );
+				$services[ key( $delayed_service ) ] = current( $delayed_service );
+
+				continue;
+			}
+
 			// Allow the services to delay their registration.
 			if ( is_a( $class, Delayed::class, true ) ) {
 				$registration_action = $class::get_registration_action();
+
 				if ( did_action( $registration_action ) ) {
 					$this->register_service( $id, $class );
-
-					continue;
+				} else {
+					add_action(
+						$class::get_registration_action(),
+						function () use ( $id, $class ) {
+							$this->register_service( $id, $class );
+						}
+					);
 				}
 
-				\add_action(
-					$class::get_registration_action(),
-					function () use ( $id, $class ) {
-						$this->register_service( $id, $class );
-					},
-					$class::get_registration_action_priority()
-				);
-
+				next( $services );
 				continue;
 			}
 
 			$this->register_service( $id, $class );
+
+			next( $services );
+		}
+	}
+
+	/**
+	 * Determine if the requirements for a service to be registered are met.
+	 *
+	 * @since 1.10.0
+	 *
+	 * @param HasRequirements $class       Service with requirements.
+	 * @param string[]        $service_ids List of service IDs to be registered.
+	 *
+	 * @throws InvalidService If the required service is not recognized.
+	 *
+	 * @return bool Whether the requirements for the service has been met.
+	 */
+	protected function requirements_are_met( $class, $service_ids ): bool {
+		$requirements = $class::get_requirements();
+
+		foreach ( $requirements as $requirement ) {
+			// Bail if it requires a service that is not recognized.
+			if ( ! in_array( $requirement, $service_ids, true ) ) {
+				throw InvalidService::from_service_id( $requirement );
+			}
+
+			if ( ! $this->get_container()->has( $requirement ) ) {
+				return false;
+			}
 		}
+
+		return true;
 	}
 
 	/**
@@ -396,7 +449,7 @@ function () use ( $class ) {
 	 * @param Injector $injector Injector instance to configure.
 	 * @return Injector Configured injector instance.
 	 */
-	protected function configure_injector( Injector $injector ) {
+	protected function configure_injector( Injector $injector ): Injector {
 		$bindings         = $this->get_bindings();
 		$shared_instances = $this->get_shared_instances();
 		$arguments        = $this->get_arguments();
@@ -412,7 +465,7 @@ protected function configure_injector( Injector $injector ) {
 			 *                                implementation bindings. Both
 			 *                                should be FQCNs.
 			 */
-			$bindings = (array) \apply_filters(
+			$bindings = (array) apply_filters(
 				static::HOOK_PREFIX . static::BINDINGS_FILTER,
 				$bindings
 			);
@@ -428,7 +481,7 @@ protected function configure_injector( Injector $injector ) {
 			 *                                array maps argument names to
 			 *                                values.
 			 */
-			$arguments = (array) \apply_filters(
+			$arguments = (array) apply_filters(
 				static::HOOK_PREFIX . static::ARGUMENTS_FILTER,
 				$arguments
 			);
@@ -442,7 +495,7 @@ protected function configure_injector( Injector $injector ) {
 			 * @param array<string> $shared_instances Array of FQCNs to turn
 			 *                                        into shared objects.
 			 */
-			$shared_instances = (array) \apply_filters(
+			$shared_instances = (array) apply_filters(
 				static::HOOK_PREFIX . static::SHARED_INSTANCES_FILTER,
 				$shared_instances
 			);
@@ -456,7 +509,7 @@ protected function configure_injector( Injector $injector ) {
 			 * @param array<string> $delegations Associative array of class =>
 			 *                                   callable mappings.
 			 */
-			$delegations = (array) \apply_filters(
+			$delegations = (array) apply_filters(
 				static::HOOK_PREFIX . static::DELEGATIONS_FILTER,
 				$delegations
 			);
diff --git a/tests/phpunit/includes/Fixture/DummyServiceWithRequirements.php b/tests/phpunit/includes/Fixture/DummyServiceWithRequirements.php
new file mode 100644
index 000000000000..26f137424f58
--- /dev/null
+++ b/tests/phpunit/includes/Fixture/DummyServiceWithRequirements.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Web_Stories\Tests\Fixture;
+
+use Google\Web_Stories\Infrastructure\HasRequirements;
+use Google\Web_Stories\Infrastructure\Service;
+
+class DummyServiceWithRequirements implements Service, HasRequirements {
+
+	/**
+	 * Get the list of service IDs required for this service to be registered.
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array {
+		return [ 'service_a' ];
+	}
+}
diff --git a/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php b/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php
index 5ed6a3bd5834..51750b5662ca 100644
--- a/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php
+++ b/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php
@@ -8,6 +8,7 @@
 use Google\Web_Stories\Infrastructure\ServiceContainer\SimpleServiceContainer;
 use Google\Web_Stories\Tests\Fixture\DummyService;
 use Google\Web_Stories\Tests\Fixture\DummyServiceBasedPlugin;
+use Google\Web_Stories\Tests\Fixture\DummyServiceWithRequirements;
 use Google\Web_Stories\Tests\Test_Case;
 
 final class ServiceBasedPluginTest extends Test_Case {
@@ -47,11 +48,11 @@ public function test_it_always_registers_an_injector_by_default() {
 			->setMethodsExcept( [ 'register', 'register_services' ] )
 			->getMock();
 
-		$this->assertEquals( 0, count( $container ) );
+		$this->assertCount( 0, $container );
 
 		$plugin->register();
 
-		$this->assertEquals( 1, count( $container ) );
+		$this->assertCount( 1, $container );
 		$this->assertTrue( $container->has( 'injector' ) );
 		$this->assertInstanceof( Injector::class, $container->get( 'injector' ) );
 	}
@@ -71,11 +72,11 @@ public function test_it_registers_default_services() {
 			)
 			->getMock();
 
-		$this->assertEquals( 0, count( $container ) );
+		$this->assertCount( 0, $container );
 
 		$plugin->register();
 
-		$this->assertEquals( 3, count( $container ) );
+		$this->assertCount( 3, $container );
 		$this->assertTrue( $container->has( 'service_a' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
 		$this->assertTrue( $container->has( 'service_b' ) );
@@ -107,7 +108,7 @@ static function () {
 
 		$plugin->register();
 
-		$this->assertEquals( 2, count( $container ) );
+		$this->assertCount( 2, $container );
 		$this->assertTrue( $container->has( 'filtered_service' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'filtered_service' ) );
 		$this->assertfalse( $container->has( 'service_a' ) );
@@ -142,7 +143,7 @@ static function ( $services ) {
 
 		$plugin->register();
 
-		$this->assertEquals( 4, count( $container ) );
+		$this->assertCount( 4, $container );
 		$this->assertTrue( $container->has( 'service_a' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
 		$this->assertTrue( $container->has( 'service_b' ) );
@@ -151,6 +152,54 @@ static function ( $services ) {
 		$this->assertInstanceof( DummyService::class, $container->get( 'filtered_service' ) );
 	}
 
+	public function test_it_registers_service_with_requirements() {
+		$container = new SimpleServiceContainer();
+		$plugin    = $this->getMockBuilder( DummyServiceBasedPlugin::class )
+						->enableOriginalConstructor()
+						->setConstructorArgs( [ true, null, $container ] )
+						->setMethodsExcept(
+							[
+								'register',
+								'register_services',
+								'get_service_classes',
+							]
+						)
+						->getMock();
+
+		// Throws an exception if it requires a service that has not been recognized.
+		$service_callback = static function () {
+			return [ 'filtered_service' => DummyServiceWithRequirements::class ];
+		};
+
+		add_filter( 'services', $service_callback );
+
+		$this->expectExceptionMessage( 'The service ID "service_a" is not recognized and cannot be retrieved.' );
+		$plugin->register();
+
+		remove_filter( 'services', $service_callback );
+
+		// Successfully registers a service that has requirements.
+		$service_callback = static function ( $services ) {
+			array_unshift(
+				$services,
+				[ 'filtered_service' => DummyServiceWithRequirements::class ]
+			);
+			return $services;
+		};
+
+		add_filter( 'services', $service_callback );
+
+		$plugin->register();
+
+		$this->assertCount( 4, $container );
+		$this->assertTrue( $container->has( 'service_a' ) );
+		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
+		$this->assertTrue( $container->has( 'service_b' ) );
+		$this->assertInstanceof( DummyService::class, $container->get( 'service_b' ) );
+		$this->assertTrue( $container->has( 'filtered_service' ) );
+		$this->assertInstanceof( DummyServiceWithRequirements::class, $container->get( 'filtered_service' ) );
+	}
+
 	public function test_it_generates_identifiers_as_needed() {
 		$container = new SimpleServiceContainer();
 		$plugin    = $this->getMockBuilder( ServiceBasedPlugin::class )
@@ -168,7 +217,7 @@ static function () {
 
 		$plugin->register();
 
-		$this->assertEquals( 2, count( $container ) );
+		$this->assertCount( 2, $container );
 		$this->assertTrue( $container->has( 'dummy_service' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'dummy_service' ) );
 	}
@@ -192,7 +241,7 @@ static function () {
 
 		$plugin->register();
 
-		$this->assertEquals( 1, count( $container ) );
+		$this->assertCount( 1, $container );
 		$this->assertFalse( $container->has( 'dummy_service' ) );
 	}
 
@@ -219,7 +268,7 @@ static function () {
 
 		$plugin->register();
 
-		$this->assertEquals( 3, count( $container ) );
+		$this->assertCount( 3, $container );
 		$this->assertTrue( $container->has( 'service_a' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
 		$this->assertTrue( $container->has( 'service_b' ) );
@@ -249,7 +298,7 @@ static function () {
 
 		$plugin->register();
 
-		$this->assertEquals( 3, count( $container ) );
+		$this->assertCount( 3, $container );
 		$this->assertTrue( $container->has( 'service_a' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
 		$this->assertTrue( $container->has( 'service_b' ) );

From bc5472bcd2d320b6db6d179fca67f416904930c9 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 29 Jul 2021 21:15:52 +0200
Subject: [PATCH 02/41] Fix incorrect test

---
 includes/Experiments.php            | 2 +-
 tests/phpunit/tests/Experiments.php | 7 +++++--
 tests/phpunit/tests/Settings.php    | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/includes/Experiments.php b/includes/Experiments.php
index 936221b40ffa..e1974f8aa532 100644
--- a/includes/Experiments.php
+++ b/includes/Experiments.php
@@ -493,7 +493,7 @@ public function is_experiment_enabled( string $name ): bool {
 	 *
 	 * @return array List of all enabled experiments.
 	 */
-	public function get_enabled_experiments() {
+	public function get_enabled_experiments(): array {
 		$experiments = array_filter(
 			wp_list_pluck( $this->get_experiments(), 'name' ),
 			[ $this, 'is_experiment_enabled' ]
diff --git a/tests/phpunit/tests/Experiments.php b/tests/phpunit/tests/Experiments.php
index f0b0fcb5a02c..65dd0af271f4 100644
--- a/tests/phpunit/tests/Experiments.php
+++ b/tests/phpunit/tests/Experiments.php
@@ -84,11 +84,14 @@ public function test_add_menu_page() {
 	 * @covers ::initialize_settings
 	 */
 	public function test_initialize_settings() {
+		global $wp_settings_fields, $wp_settings_sections;
+
 		$experiments = new \Google\Web_Stories\Experiments();
 		$experiments->initialize_settings();
 
-		$options = get_registered_settings();
-		$this->assertArrayHasKey( \Google\Web_Stories\Settings::SETTING_NAME_EXPERIMENTS, $options );
+		$this->assertArrayHasKey( \Google\Web_Stories\Experiments::PAGE_NAME, $wp_settings_fields );
+		$this->assertArrayHasKey( \Google\Web_Stories\Experiments::PAGE_NAME, $wp_settings_sections );
+		$this->assertArrayHasKey( 'web_stories_experiments_section', $wp_settings_sections[ \Google\Web_Stories\Experiments::PAGE_NAME ] );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/Settings.php b/tests/phpunit/tests/Settings.php
index 276b55fb5a0b..ed1a7c0e6be2 100644
--- a/tests/phpunit/tests/Settings.php
+++ b/tests/phpunit/tests/Settings.php
@@ -44,5 +44,6 @@ public function test_register_settings() {
 		$this->assertArrayHasKey( $settings::SETTING_NAME_AD_MANAGER_SLOT_ID, $options );
 		$this->assertArrayHasKey( $settings::SETTING_NAME_ADSENSE_PUBLISHER_ID, $options );
 		$this->assertArrayHasKey( $settings::SETTING_NAME_ADSENSE_SLOT_ID, $options );
+		$this->assertArrayHasKey( $settings::SETTING_NAME_EXPERIMENTS, $options );
 	}
 }

From b6421cb41e15df63d216558776f23c7a0caf9cff Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 30 Jul 2021 10:34:53 +0200
Subject: [PATCH 03/41] LInt fix

---
 includes/Infrastructure/ServiceBasedPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index a9f0caff0382..b5974226f3ac 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -268,8 +268,8 @@ function () use ( $id, $class ) {
 	 *
 	 * @since 1.10.0
 	 *
-	 * @param HasRequirements $class       Service with requirements.
-	 * @param string[]        $service_ids List of service IDs to be registered.
+	 * @param class-string|HasRequirements $class       Service with requirements.
+	 * @param string[]                     $service_ids List of service IDs to be registered.
 	 *
 	 * @throws InvalidService If the required service is not recognized.
 	 *

From 45cacb2f1c2c73bd7ba69fe2dab4f1f438da6c06 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 30 Jul 2021 17:16:22 +0200
Subject: [PATCH 04/41] Make experiment toggling more robust

Borrowed from #7748
---
 bin/local-env/install-wordpress.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/local-env/install-wordpress.sh b/bin/local-env/install-wordpress.sh
index 128385616480..73e50733bc15 100755
--- a/bin/local-env/install-wordpress.sh
+++ b/bin/local-env/install-wordpress.sh
@@ -209,6 +209,9 @@ wp media import /var/www/html/wp-content/e2e-assets/example-1.jpg --quiet
 wp media import /var/www/html/wp-content/e2e-assets/example-2.jpg --quiet
 wp media import /var/www/html/wp-content/e2e-assets/example-3.png --quiet
 
+# Ensures that the patch command below always works.
+wp option update web_stories_experiments '{}' --format=json
+
 wp option patch insert web_stories_experiments enableSVG 1
 wp media import /var/www/html/wp-content/e2e-assets/video-play.svg
 wp option patch insert web_stories_experiments enableSVG 0

From f8a3a1b1708b6f47d722f8cdd575a1ccbe31530a Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 2 Aug 2021 13:04:37 +0200
Subject: [PATCH 05/41] Fix `Settings::register()`

---
 includes/Settings.php            | 35 +++++++++++---------------------
 tests/phpunit/tests/Settings.php | 10 ---------
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/includes/Settings.php b/includes/Settings.php
index d617b3c818d2..43ce62e01310 100644
--- a/includes/Settings.php
+++ b/includes/Settings.php
@@ -109,28 +109,6 @@ class Settings extends Service_Base {
 	 */
 	const SETTING_NAME_VIDEO_CACHE = 'web_stories_video_cache';
 
-	/**
-	 * Initializes the Settings logic.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return void
-	 */
-	public function register() {
-		add_action( 'init', [ $this, 'register_settings' ] );
-	}
-
-	/**
-	 * Get the action priority to use for registering the service.
-	 *
-	 * @since 1.6.0
-	 *
-	 * @return int Registration action priority to use.
-	 */
-	public static function get_registration_action_priority(): int {
-		return 5;
-	}
-
 	/**
 	 * Register settings.
 	 *
@@ -140,7 +118,7 @@ public static function get_registration_action_priority(): int {
 	 *
 	 * @return void
 	 */
-	public function register_settings() {
+	public function register() {
 		register_setting(
 			self::SETTING_GROUP,
 			self::SETTING_NAME_TRACKING_ID,
@@ -251,4 +229,15 @@ public function register_settings() {
 			]
 		);
 	}
+
+	/**
+	 * Get the action priority to use for registering the service.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @return int Registration action priority to use.
+	 */
+	public static function get_registration_action_priority(): int {
+		return 5;
+	}
 }
diff --git a/tests/phpunit/tests/Settings.php b/tests/phpunit/tests/Settings.php
index ed1a7c0e6be2..ef62ac2bb8b8 100644
--- a/tests/phpunit/tests/Settings.php
+++ b/tests/phpunit/tests/Settings.php
@@ -28,16 +28,6 @@ public function test_register() {
 		$settings = new \Google\Web_Stories\Settings();
 		$settings->register();
 
-		$this->assertSame( 10, has_action( 'init', [ $settings, 'register_settings' ] ) );
-	}
-
-	/**
-	 * @covers ::register_settings
-	 */
-	public function test_register_settings() {
-		$settings = new \Google\Web_Stories\Settings();
-		$settings->register_settings();
-
 		$options = get_registered_settings();
 		$this->assertArrayHasKey( $settings::SETTING_NAME_TRACKING_ID, $options );
 		$this->assertArrayHasKey( $settings::SETTING_NAME_AD_NETWORK, $options );

From 2127db66ef21d9f18ffc8be89e223acc0f9403e0 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 5 Aug 2021 00:42:13 +0200
Subject: [PATCH 06/41] Add some types

---
 .../Injector/InjectionChain.php               | 12 ++---
 .../Injector/SimpleInjector.php               | 48 +++++++++----------
 includes/Infrastructure/Plugin.php            |  2 +-
 .../Infrastructure/ServiceBasedPlugin.php     |  2 +-
 includes/Infrastructure/ServiceContainer.php  |  4 +-
 .../LazilyInstantiatedService.php             |  2 +-
 .../SimpleServiceContainer.php                |  4 +-
 7 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/includes/Infrastructure/Injector/InjectionChain.php b/includes/Infrastructure/Injector/InjectionChain.php
index 96cc2424eb75..4060d0edfe97 100644
--- a/includes/Infrastructure/Injector/InjectionChain.php
+++ b/includes/Infrastructure/Injector/InjectionChain.php
@@ -53,7 +53,7 @@ final class InjectionChain {
 	 * @param string $class Class to add to injection chain.
 	 * @return self Modified injection chain.
 	 */
-	public function add_to_chain( $class ) {
+	public function add_to_chain( $class ): self {
 		$new_chain          = clone $this;
 		$new_chain->chain[] = $class;
 
@@ -68,7 +68,7 @@ public function add_to_chain( $class ) {
 	 * @param string $resolution Resolution to add.
 	 * @return self Modified injection chain.
 	 */
-	public function add_resolution( $resolution ) {
+	public function add_resolution( $resolution ): self {
 		$new_chain                             = clone $this;
 		$new_chain->resolutions[ $resolution ] = true;
 
@@ -83,7 +83,7 @@ public function add_resolution( $resolution ) {
 	 * @return string Last class pushed to the injection chain.
 	 * @throws LogicException If the injection chain is accessed too early.
 	 */
-	public function get_class() {
+	public function get_class(): string {
 		if ( empty( $this->chain ) ) {
 			throw new LogicException(
 				'Access to injection chain before any resolution was made.'
@@ -100,7 +100,7 @@ public function get_class() {
 	 *
 	 * @return array Chain of injections.
 	 */
-	public function get_chain() {
+	public function get_chain(): array {
 		return \array_reverse( $this->chain );
 	}
 
@@ -112,7 +112,7 @@ public function get_chain() {
 	 * @param string $resolution Resolution to check for.
 	 * @return bool Whether the resolution was found.
 	 */
-	public function has_resolution( $resolution ) {
+	public function has_resolution( $resolution ): bool {
 		return \array_key_exists( $resolution, $this->resolutions );
 	}
 
@@ -124,7 +124,7 @@ public function has_resolution( $resolution ) {
 	 * @param string $class Class to check.
 	 * @return bool Whether the given class is already part of the chain.
 	 */
-	public function is_in_chain( $class ) {
+	public function is_in_chain( $class ): bool {
 		return in_array( $class, $this->chain, true );
 	}
 }
diff --git a/includes/Infrastructure/Injector/SimpleInjector.php b/includes/Infrastructure/Injector/SimpleInjector.php
index 9b1a437bd282..49ff15ce238c 100644
--- a/includes/Infrastructure/Injector/SimpleInjector.php
+++ b/includes/Infrastructure/Injector/SimpleInjector.php
@@ -24,6 +24,8 @@
 use ReflectionClass;
 use ReflectionNamedType;
 use ReflectionParameter;
+use function array_key_exists;
+use function array_map;
 
 /**
  * A simplified implementation of a dependency injector.
@@ -85,9 +87,7 @@ final class SimpleInjector implements Injector {
 	 * @param Instantiator|null $instantiator Optional. Instantiator to use.
 	 */
 	public function __construct( Instantiator $instantiator = null ) {
-		$this->instantiator = null !== $instantiator
-			? $instantiator
-			: new FallbackInstantiator();
+		$this->instantiator = $instantiator ?? new FallbackInstantiator();
 	}
 
 	/**
@@ -130,7 +130,7 @@ public function make( $interface_or_class, $arguments = [] ) {
 			$object = $this->instantiator->instantiate( $class, $dependencies );
 		}
 
-		if ( \array_key_exists( $class, $this->shared_instances ) ) {
+		if ( array_key_exists( $class, $this->shared_instances ) ) {
 			$this->shared_instances[ $class ] = $object;
 		}
 
@@ -149,7 +149,7 @@ public function make( $interface_or_class, $arguments = [] ) {
 	 * @param string $to   Interface or class that provides the implementation.
 	 * @return Injector
 	 */
-	public function bind( $from, $to ) {
+	public function bind( $from, $to ): Injector {
 		$this->mappings[ $from ] = $to;
 
 		return $this;
@@ -171,7 +171,7 @@ public function bind_argument(
 		$interface_or_class,
 		$argument_name,
 		$value
-	) {
+	): Injector {
 		$this->argument_mappings[ $interface_or_class ][ $argument_name ] = $value;
 
 		return $this;
@@ -186,7 +186,7 @@ public function bind_argument(
 	 * @param string $interface_or_class Interface or class to reuse.
 	 * @return Injector
 	 */
-	public function share( $interface_or_class ) {
+	public function share( $interface_or_class ): Injector {
 		$this->shared_instances[ $interface_or_class ] = null;
 
 		return $this;
@@ -202,7 +202,7 @@ public function share( $interface_or_class ) {
 	 * @param callable $callable           Callable to use for instantiation.
 	 * @return Injector
 	 */
-	public function delegate( $interface_or_class, callable $callable ) {
+	public function delegate( $interface_or_class, callable $callable ): Injector {
 		$this->delegates[ $interface_or_class ] = $callable;
 
 		return $this;
@@ -249,7 +249,7 @@ private function make_dependency(
 
 		$object = $this->instantiator->instantiate( $class, $dependencies );
 
-		if ( \array_key_exists( $class, $this->shared_instances ) ) {
+		if ( array_key_exists( $class, $this->shared_instances ) ) {
 			$this->shared_instances[ $class ] = $object;
 		}
 
@@ -270,7 +270,7 @@ private function make_dependency(
 	private function resolve(
 		InjectionChain $injection_chain,
 		$interface_or_class
-	) {
+	): InjectionChain {
 		if ( $injection_chain->is_in_chain( $interface_or_class ) ) {
 			// Circular reference detected, aborting.
 			throw FailedToMakeInstance::for_circular_reference(
@@ -281,7 +281,7 @@ private function resolve(
 
 		$injection_chain = $injection_chain->add_resolution( $interface_or_class );
 
-		if ( \array_key_exists( $interface_or_class, $this->mappings ) ) {
+		if ( array_key_exists( $interface_or_class, $this->mappings ) ) {
 			return $this->resolve(
 				$injection_chain,
 				$this->mappings[ $interface_or_class ]
@@ -309,7 +309,7 @@ private function get_dependencies_for(
 		InjectionChain $injection_chain,
 		ReflectionClass $reflection,
 		$arguments = []
-	) {
+	): array {
 		$constructor = $reflection->getConstructor();
 		$class       = $reflection->getName();
 
@@ -317,7 +317,7 @@ private function get_dependencies_for(
 			return [];
 		}
 
-		return \array_map(
+		return array_map(
 			function ( ReflectionParameter $parameter ) use ( $injection_chain, $class, $arguments ) {
 				return $this->resolve_argument(
 					$injection_chain,
@@ -385,7 +385,7 @@ private function resolve_argument(
 				);
 			}
 
-			$type = $type instanceof \ReflectionNamedType
+			$type = $type instanceof ReflectionNamedType
 				? $type->getName()
 				: (string) $type;
 		} else {
@@ -394,7 +394,7 @@ private function resolve_argument(
 			// support it.
 
 			$reflection_class = $parameter->getClass();
-			$type             = $reflection_class ? $reflection_class->name : null;
+			$type             = $reflection_class->name ?? null;
 
 			if ( null === $type ) {
 				return $this->resolve_argument_by_name(
@@ -428,13 +428,13 @@ private function resolve_argument_by_name(
 		$name = $parameter->getName();
 
 		// The argument was directly provided to the make() call.
-		if ( \array_key_exists( $name, $arguments ) ) {
+		if ( array_key_exists( $name, $arguments ) ) {
 			return $arguments[ $name ];
 		}
 
 		// Check if we have mapped this argument for the specific class.
-		if ( \array_key_exists( $class, $this->argument_mappings )
-			&& \array_key_exists( $name, $this->argument_mappings[ $class ] ) ) {
+		if ( array_key_exists( $class, $this->argument_mappings )
+			&& array_key_exists( $name, $this->argument_mappings[ $class ] ) ) {
 			$value = $this->argument_mappings[ $class ][ $name ];
 
 			// Closures are immediately resolved, to provide lazy resolution.
@@ -446,7 +446,7 @@ private function resolve_argument_by_name(
 		}
 
 		// No argument found for the class, check if we have a global value.
-		if ( \array_key_exists( $name, $this->argument_mappings[ self::GLOBAL_ARGUMENTS ] ) ) {
+		if ( array_key_exists( $name, $this->argument_mappings[ self::GLOBAL_ARGUMENTS ] ) ) {
 			return $this->argument_mappings[ self::GLOBAL_ARGUMENTS ][ $name ];
 		}
 
@@ -471,8 +471,8 @@ private function resolve_argument_by_name(
 	 * @param string $class Class to check for a shared instance.
 	 * @return bool Whether a shared instance exists.
 	 */
-	private function has_shared_instance( $class ) {
-		return \array_key_exists( $class, $this->shared_instances )
+	private function has_shared_instance( $class ): bool {
+		return array_key_exists( $class, $this->shared_instances )
 			&& null !== $this->shared_instances[ $class ];
 	}
 
@@ -502,8 +502,8 @@ private function get_shared_instance( $class ) {
 	 * @param string $class Class to check for a delegate.
 	 * @return bool Whether a delegate exists.
 	 */
-	private function has_delegate( $class ) {
-		return \array_key_exists( $class, $this->delegates );
+	private function has_delegate( $class ): bool {
+		return array_key_exists( $class, $this->delegates );
 	}
 
 	/**
@@ -515,7 +515,7 @@ private function has_delegate( $class ) {
 	 * @return callable Delegate.
 	 * @throws FailedToMakeInstance If an invalid delegate is requested.
 	 */
-	private function get_delegate( $class ) {
+	private function get_delegate( $class ): callable {
 		if ( ! $this->has_delegate( $class ) ) {
 			throw FailedToMakeInstance::for_invalid_delegate( $class );
 		}
diff --git a/includes/Infrastructure/Plugin.php b/includes/Infrastructure/Plugin.php
index 6e5b55c970fc..766f3fdd22d0 100644
--- a/includes/Infrastructure/Plugin.php
+++ b/includes/Infrastructure/Plugin.php
@@ -44,5 +44,5 @@ interface Plugin extends Activateable, Deactivateable, Registerable {
 	 *
 	 * @return ServiceContainer Service container of the plugin.
 	 */
-	public function get_container();
+	public function get_container(): ServiceContainer;
 }
diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index b5974226f3ac..b4672bef2f2c 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -391,7 +391,7 @@ protected function register_service( $id, $class ) {
 	 *
 	 * @return ServiceContainer Service container of the plugin.
 	 */
-	public function get_container() {
+	public function get_container(): ServiceContainer {
 		return $this->service_container;
 	}
 
diff --git a/includes/Infrastructure/ServiceContainer.php b/includes/Infrastructure/ServiceContainer.php
index fc0aacfca1db..3b9abca3b0b8 100644
--- a/includes/Infrastructure/ServiceContainer.php
+++ b/includes/Infrastructure/ServiceContainer.php
@@ -46,7 +46,7 @@ interface ServiceContainer extends Traversable, Countable, ArrayAccess {
 	 *
 	 * @return Service Service that was requested.
 	 */
-	public function get( $id );
+	public function get( $id ): Service;
 
 	/**
 	 * Check whether the container can return a service for the given
@@ -58,7 +58,7 @@ public function get( $id );
 	 *
 	 * @return bool
 	 */
-	public function has( $id );
+	public function has( $id ): bool;
 
 	/**
 	 * Put a service into the container for later retrieval.
diff --git a/includes/Infrastructure/ServiceContainer/LazilyInstantiatedService.php b/includes/Infrastructure/ServiceContainer/LazilyInstantiatedService.php
index 8ee2a317c33c..b6f20a571df2 100644
--- a/includes/Infrastructure/ServiceContainer/LazilyInstantiatedService.php
+++ b/includes/Infrastructure/ServiceContainer/LazilyInstantiatedService.php
@@ -54,7 +54,7 @@ public function __construct( callable $instantiation ) {
 	 *
 	 * @return Service Properly instantiated service.
 	 */
-	public function instantiate() {
+	public function instantiate(): Service {
 		$instantiation = $this->instantiation; // Because uniform variable syntax not supported in PHP 5.6.
 		$service       = $instantiation();
 
diff --git a/includes/Infrastructure/ServiceContainer/SimpleServiceContainer.php b/includes/Infrastructure/ServiceContainer/SimpleServiceContainer.php
index 684532a0483b..e7cd126c8603 100644
--- a/includes/Infrastructure/ServiceContainer/SimpleServiceContainer.php
+++ b/includes/Infrastructure/ServiceContainer/SimpleServiceContainer.php
@@ -46,7 +46,7 @@ final class SimpleServiceContainer
 	 *
 	 * @return Service Service that was requested.
 	 */
-	public function get( $id ) {
+	public function get( $id ): Service {
 		if ( ! $this->has( $id ) ) {
 			throw InvalidService::from_service_id( $id );
 		}
@@ -72,7 +72,7 @@ public function get( $id ) {
 	 *
 	 * @return bool
 	 */
-	public function has( $id ) {
+	public function has( $id ): bool {
 		return $this->offsetExists( $id );
 	}
 

From 1b9590c28ba565519b348f1718991f347278a12d Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 5 Aug 2021 00:42:20 +0200
Subject: [PATCH 07/41] Pull upstream changes

---
 .../Infrastructure/ServiceBasedPlugin.php     | 111 ++++++++++++++----
 .../Fixture/DummyServiceWithDelay.php         |  41 +++++++
 .../Infrastructure/ServiceBasedPluginTest.php |  86 ++++++++++++--
 3 files changed, 204 insertions(+), 34 deletions(-)
 create mode 100644 tests/phpunit/includes/Fixture/DummyServiceWithDelay.php

diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index b4672bef2f2c..4af3c8c8df2a 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -21,9 +21,9 @@
 use Google\Web_Stories\Infrastructure\ServiceContainer\LazilyInstantiatedService;
 use function add_action;
 use function apply_filters;
+use function did_action;
 use function Google\Web_Stories\rewrite_flush;
 
-
 /**
  * This abstract base plugin provides all the boilerplate code for working with
  * the dependency injector and the service container.
@@ -223,33 +223,26 @@ public function register_services() {
 			if (
 				is_a( $class, HasRequirements::class, true )
 				&&
-				! $this->requirements_are_met( $class, array_keys( $services ) )
+				! $this->requirements_are_met( $id, $class, $services )
 			) {
-				/*
-				 * Move the service to the end of the array.
-				 *
-				 * Note: Unsetting the key advances the internal array pointer to the next array item, so
-				 * the current array item will have to be temporarily stored so that it can be re-added later.
-				 */
-				$delayed_service = [ key( $services ) => current( $services ) ];
-				unset( $services[ key( $services ) ] );
-				$services[ key( $delayed_service ) ] = current( $delayed_service );
-
+				next( $services );
 				continue;
 			}
 
 			// Allow the services to delay their registration.
 			if ( is_a( $class, Delayed::class, true ) ) {
-				$registration_action = $class::get_registration_action();
+				$registration_action          = $class::get_registration_action();
+				$registration_action_priority = $class::get_registration_action_priority();
 
 				if ( did_action( $registration_action ) ) {
 					$this->register_service( $id, $class );
 				} else {
 					add_action(
-						$class::get_registration_action(),
+						$registration_action,
 						function () use ( $id, $class ) {
 							$this->register_service( $id, $class );
-						}
+						},
+						$registration_action_priority
 					);
 				}
 
@@ -266,30 +259,104 @@ function () use ( $id, $class ) {
 	/**
 	 * Determine if the requirements for a service to be registered are met.
 	 *
+	 * This also hooks up another check in the future to the registration action(s) of its requirements.
+	 *
 	 * @since 1.10.0
 	 *
-	 * @param class-string|HasRequirements $class       Service with requirements.
-	 * @param string[]                     $service_ids List of service IDs to be registered.
+	 * @param string                       $id       Service ID of the service with requirements.
+	 * @param HasRequirements|class-string $class    Service FQCN of the service with requirements.
+	 * @param string[]                     $services List of services to be registered.
 	 *
 	 * @throws InvalidService If the required service is not recognized.
 	 *
 	 * @return bool Whether the requirements for the service has been met.
 	 */
-	protected function requirements_are_met( $class, $service_ids ): bool {
+	protected function requirements_are_met( string $id, $class, array &$services ): bool {
+		$missing_requirements = $this->collect_missing_requirements( $class, $services );
+
+		if ( empty( $missing_requirements ) ) {
+			return true;
+		}
+
+		foreach ( $missing_requirements as $missing_requirement ) {
+			if ( is_a( $missing_requirement, Delayed::class, true ) ) {
+				$action = $missing_requirement::get_registration_action();
+
+				if ( did_action( $action ) ) {
+					continue;
+				}
+
+				/*
+				 * The current service depends on another service that is Delayed and hasn't been registered yet
+				 * and for which the registration action has not yet passed.
+				 *
+				 * Therefore, we postpone the registration of the current service up until the requirement's
+				 * action has passed.
+				 *
+				 * We don't register the service right away, though, we will first check whether at that point,
+				 * the requirements have been met.
+				 *
+				 * Note that badly configured requirements can lead to services that will never register at all.
+				 */
+
+				add_action(
+					$action,
+					function () use ( $id, $class, $services ) {
+						if ( ! $this->requirements_are_met( $id, $class, $services ) ) {
+							return;
+						}
+
+						$this->register_service( $id, $class );
+					},
+					PHP_INT_MAX
+				);
+
+				return false;
+			}
+		}
+
+		/*
+		 * The registration actions from all of the requirements were already processed. This means that the missing
+		 * requirement(s) are about to be registered, they just weren't encountered yet while traversing the services
+		 * map. Therefore, we skip registration for now and move this particular service to the end of the service map.
+		 */
+		unset( $services[ $id ] );
+		$services[ $id ] = $class;
+
+		return false;
+	}
+
+	/**
+	 * Collect the list of missing requirements for a service which has requirements.
+	 *
+	 * @since 1.10.0
+	 *
+	 * @param HasRequirements|class-string $class    Service FQCN of the service with requirements.
+	 * @param string[]                     $services List of services to register.
+	 *
+	 * @throws InvalidService If the required service is not recognized.
+	 *
+	 * @return string[] List of missing requirements as a $service_id => $service_class mapping.
+	 */
+	protected function collect_missing_requirements( $class, $services ): array {
 		$requirements = $class::get_requirements();
 
+		$missing = [];
+
 		foreach ( $requirements as $requirement ) {
 			// Bail if it requires a service that is not recognized.
-			if ( ! in_array( $requirement, $service_ids, true ) ) {
+			if ( ! array_key_exists( $requirement, $services ) ) {
 				throw InvalidService::from_service_id( $requirement );
 			}
 
-			if ( ! $this->get_container()->has( $requirement ) ) {
-				return false;
+			if ( $this->get_container()->has( $requirement ) ) {
+				continue;
 			}
+
+			$missing[ $requirement ] = $services[ $requirement ];
 		}
 
-		return true;
+		return $missing;
 	}
 
 	/**
diff --git a/tests/phpunit/includes/Fixture/DummyServiceWithDelay.php b/tests/phpunit/includes/Fixture/DummyServiceWithDelay.php
new file mode 100644
index 000000000000..0be77c6960ad
--- /dev/null
+++ b/tests/phpunit/includes/Fixture/DummyServiceWithDelay.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Web_Stories\Tests\Fixture;
+
+use Google\Web_Stories\Infrastructure\Delayed;
+use Google\Web_Stories\Infrastructure\Service;
+
+class DummyServiceWithDelay implements Service, Delayed {
+	/**
+	 * Get the action to use for registering the service.
+	 *
+	 * @return string Registration action to use.
+	 */
+	public static function get_registration_action(): string {
+		return 'some_action';
+	}
+
+	/**
+	 * Get the action priority to use for registering the service.
+	 *
+	 * @return int Registration action priority to use.
+	 */
+	public static function get_registration_action_priority(): int {
+		return 10;
+	}
+}
diff --git a/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php b/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php
index 51750b5662ca..21d814ef1012 100644
--- a/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php
+++ b/tests/phpunit/tests/Infrastructure/ServiceBasedPluginTest.php
@@ -8,6 +8,7 @@
 use Google\Web_Stories\Infrastructure\ServiceContainer\SimpleServiceContainer;
 use Google\Web_Stories\Tests\Fixture\DummyService;
 use Google\Web_Stories\Tests\Fixture\DummyServiceBasedPlugin;
+use Google\Web_Stories\Tests\Fixture\DummyServiceWithDelay;
 use Google\Web_Stories\Tests\Fixture\DummyServiceWithRequirements;
 use Google\Web_Stories\Tests\Test_Case;
 
@@ -159,45 +160,106 @@ public function test_it_registers_service_with_requirements() {
 						->setConstructorArgs( [ true, null, $container ] )
 						->setMethodsExcept(
 							[
+								'collect_missing_requirements',
 								'register',
 								'register_services',
+								'requirements_are_met',
+								'get_container',
 								'get_service_classes',
 							]
 						)
 						->getMock();
 
-		// Throws an exception if it requires a service that has not been recognized.
-		$service_callback = static function () {
-			return [ 'filtered_service' => DummyServiceWithRequirements::class ];
+		$service_callback = static function ( $services ) {
+			return array_merge(
+				$services,
+				[ 'service_with_requirements' => DummyServiceWithRequirements::class ]
+			);
 		};
 
 		add_filter( 'services', $service_callback );
 
-		$this->expectExceptionMessage( 'The service ID "service_a" is not recognized and cannot be retrieved.' );
 		$plugin->register();
 
-		remove_filter( 'services', $service_callback );
+		$this->assertCount( 4, $container );
+		$this->assertTrue( $container->has( 'service_a' ) );
+		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
+		$this->assertTrue( $container->has( 'service_b' ) );
+		$this->assertInstanceof( DummyService::class, $container->get( 'service_b' ) );
+		$this->assertTrue( $container->has( 'service_with_requirements' ) );
+		$this->assertInstanceof( DummyServiceWithRequirements::class, $container->get( 'service_with_requirements' ) );
+	}
+
+	public function test_it_handles_delays_for_requirements() {
+		$container = new SimpleServiceContainer();
+		$plugin    = $this->getMockBuilder( DummyServiceBasedPlugin::class )
+						->enableOriginalConstructor()
+						->setConstructorArgs( [ true, null, $container ] )
+						->setMethodsExcept(
+							[
+								'collect_missing_requirements',
+								'register',
+								'register_services',
+								'requirements_are_met',
+								'get_container',
+								'get_service_classes',
+							]
+						)
+						->getMock();
 
-		// Successfully registers a service that has requirements.
 		$service_callback = static function ( $services ) {
-			array_unshift(
+			return array_merge(
 				$services,
-				[ 'filtered_service' => DummyServiceWithRequirements::class ]
+				[
+					'service_a'                 => DummyServiceWithDelay::class,
+					'service_with_requirements' => DummyServiceWithRequirements::class,
+				]
 			);
-			return $services;
 		};
 
 		add_filter( 'services', $service_callback );
 
 		$plugin->register();
 
+		$this->assertCount( 2, $container );
+		$this->assertFalse( $container->has( 'service_a' ) );
+		$this->assertTrue( $container->has( 'service_b' ) );
+		$this->assertFalse( $container->has( 'service_with_requirements' ) );
+		$this->assertInstanceof( DummyService::class, $container->get( 'service_b' ) );
+
+		do_action( 'some_action' );
+
 		$this->assertCount( 4, $container );
 		$this->assertTrue( $container->has( 'service_a' ) );
-		$this->assertInstanceof( DummyService::class, $container->get( 'service_a' ) );
+		$this->assertInstanceof( DummyServiceWithDelay::class, $container->get( 'service_a' ) );
 		$this->assertTrue( $container->has( 'service_b' ) );
 		$this->assertInstanceof( DummyService::class, $container->get( 'service_b' ) );
-		$this->assertTrue( $container->has( 'filtered_service' ) );
-		$this->assertInstanceof( DummyServiceWithRequirements::class, $container->get( 'filtered_service' ) );
+		$this->assertTrue( $container->has( 'service_with_requirements' ) );
+		$this->assertInstanceof( DummyServiceWithRequirements::class, $container->get( 'service_with_requirements' ) );
+	}
+
+	public function test_it_throws_an_exception_if_unrecognized_service_is_required() {
+		$container = new SimpleServiceContainer();
+		$plugin    = $this->getMockBuilder( DummyServiceBasedPlugin::class )
+						->enableOriginalConstructor()
+						->setConstructorArgs( [ true, null, $container ] )
+						->setMethodsExcept(
+							[
+								'register',
+								'register_services',
+								'get_service_classes',
+							]
+						)
+						->getMock();
+
+		$service_callback = static function () {
+			return [ 'service_with_requirements' => DummyServiceWithRequirements::class ];
+		};
+
+		add_filter( 'services', $service_callback );
+
+		$this->expectExceptionMessage( 'The service ID "service_a" is not recognized and cannot be retrieved.' );
+		$plugin->register();
 	}
 
 	public function test_it_generates_identifiers_as_needed() {

From c50f20c261db93b31c447c93d6b6dbbb731176df Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 20 Aug 2021 13:45:26 +0200
Subject: [PATCH 08/41] Update docs

---
 includes/Infrastructure/HasRequirements.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/Infrastructure/HasRequirements.php b/includes/Infrastructure/HasRequirements.php
index 1c31bd536eef..5e04a8e44e21 100644
--- a/includes/Infrastructure/HasRequirements.php
+++ b/includes/Infrastructure/HasRequirements.php
@@ -37,6 +37,8 @@ interface HasRequirements {
 	/**
 	 * Get the list of service IDs required for this service to be registered.
 	 *
+	 * @since 1.11.0
+	 *
 	 * @return string[] List of required services.
 	 */
 	public static function get_requirements(): array;

From 9686c90a7069ec266ac810736fc85cfbd641ddae Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 20 Aug 2021 13:49:41 +0200
Subject: [PATCH 09/41] Ensure services that are delayed and have requirements
 are scheduled correctly

See ampproject/amp-wp#6548
---
 .../Infrastructure/ServiceBasedPlugin.php     | 63 +++++++++++--------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index 4af3c8c8df2a..e847bbf98425 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -229,28 +229,7 @@ public function register_services() {
 				continue;
 			}
 
-			// Allow the services to delay their registration.
-			if ( is_a( $class, Delayed::class, true ) ) {
-				$registration_action          = $class::get_registration_action();
-				$registration_action_priority = $class::get_registration_action_priority();
-
-				if ( did_action( $registration_action ) ) {
-					$this->register_service( $id, $class );
-				} else {
-					add_action(
-						$registration_action,
-						function () use ( $id, $class ) {
-							$this->register_service( $id, $class );
-						},
-						$registration_action_priority
-					);
-				}
-
-				next( $services );
-				continue;
-			}
-
-			$this->register_service( $id, $class );
+			$this->schedule_potential_service_registration( $id, $class );
 
 			next( $services );
 		}
@@ -306,7 +285,7 @@ function () use ( $id, $class, $services ) {
 							return;
 						}
 
-						$this->register_service( $id, $class );
+						$this->schedule_potential_service_registration( $id, $class );
 					},
 					PHP_INT_MAX
 				);
@@ -425,7 +404,36 @@ protected function get_identifier_from_fqcn( $fqcn ): string {
 	}
 
 	/**
-	 * Register a single service.
+	 * Schedule the potential registration of a single service.
+	 *
+	 * This takes into account whether the service registration needs to be delayed or not.
+	 *
+	 * @since 1.11.0
+	 *
+	 * @param string $id ID of the service to register.
+	 * @param string $class Class of the service to register.
+	 */
+	protected function schedule_potential_service_registration( $id, $class ) {
+		if ( is_a( $class, Delayed::class, true ) ) {
+			$registration_action = $class::get_registration_action();
+
+			if ( \did_action( $registration_action ) ) {
+				$this->maybe_register_service( $id, $class );
+			} else {
+				\add_action(
+					$registration_action,
+					function () use ( $id, $class ) {
+						$this->maybe_register_service( $id, $class );
+					}
+				);
+			}
+		} else {
+			$this->maybe_register_service( $id, $class );
+		}
+	}
+
+	/**
+	 * Register a single service, provided its conditions are met.
 	 *
 	 * @since 1.6.0
 	 *
@@ -434,7 +442,12 @@ protected function get_identifier_from_fqcn( $fqcn ): string {
 	 *
 	 * @return void
 	 */
-	protected function register_service( $id, $class ) {
+	protected function maybe_register_service( $id, $class ) {
+		// Ensure we don't register the same service more than once.
+		if ( $this->service_container->has( $id ) ) {
+			return;
+		}
+
 		// Only instantiate services that are actually needed.
 		if ( is_a( $class, Conditional::class, true )
 			&& ! $class::is_needed() ) {

From e8db36d649a0e3ca14f834a5e80e929952f3065d Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 20 Aug 2021 14:08:53 +0200
Subject: [PATCH 10/41] Fix PHPDoc

---
 includes/Infrastructure/ServiceBasedPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index e847bbf98425..b7777db377aa 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -410,8 +410,8 @@ protected function get_identifier_from_fqcn( $fqcn ): string {
 	 *
 	 * @since 1.11.0
 	 *
-	 * @param string $id ID of the service to register.
-	 * @param string $class Class of the service to register.
+	 * @param string                       $id ID of the service to register.
+	 * @param HasRequirements|class-string $class Class of the service to register.
 	 */
 	protected function schedule_potential_service_registration( $id, $class ) {
 		if ( is_a( $class, Delayed::class, true ) ) {

From fbbd35fcee166b82da5ea5326cc853cd523e7000 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 20 Aug 2021 14:08:56 +0200
Subject: [PATCH 11/41] Fix typo

---
 includes/Infrastructure/ServiceBasedPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index b7777db377aa..3dfdd4a98c5d 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -71,7 +71,7 @@ abstract class ServiceBasedPlugin implements Plugin {
 	protected $injector;
 
 	/**
-	 * ServiceC ontainer.
+	 * ServiceContainer.
 	 *
 	 * @var ServiceContainer
 	 */

From 617873c02e76845ecd21a700bbc183b43cc9d92b Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 20 Aug 2021 14:14:28 +0200
Subject: [PATCH 12/41] Add some more robust assertions

---
 includes/REST_API/Embed_Controller.php                 |  1 +
 tests/phpunit/tests/REST_API/Autosaves_Controller.php  |  2 ++
 tests/phpunit/tests/REST_API/Embed_Controller.php      |  1 +
 tests/phpunit/tests/REST_API/Stories_Controller.php    |  2 ++
 .../tests/REST_API/Stories_Media_Controller.php        |  2 ++
 .../tests/REST_API/Stories_Users_Controller.php        | 10 +++++-----
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/includes/REST_API/Embed_Controller.php b/includes/REST_API/Embed_Controller.php
index bc849cf9c877..9a41271d4148 100644
--- a/includes/REST_API/Embed_Controller.php
+++ b/includes/REST_API/Embed_Controller.php
@@ -44,6 +44,7 @@
  */
 class Embed_Controller extends REST_Controller {
 	use Document_Parser, Post_Type;
+
 	/**
 	 * Constructor.
 	 */
diff --git a/tests/phpunit/tests/REST_API/Autosaves_Controller.php b/tests/phpunit/tests/REST_API/Autosaves_Controller.php
index cd2990a0fb01..013927394879 100644
--- a/tests/phpunit/tests/REST_API/Autosaves_Controller.php
+++ b/tests/phpunit/tests/REST_API/Autosaves_Controller.php
@@ -92,6 +92,8 @@ public function test_create_item_as_author_should_not_strip_markup() {
 		$response = rest_get_server()->dispatch( $request );
 		$new_data = $response->get_data();
 
+		$this->assertArrayHasKey( 'content', $new_data );
+		$this->assertArrayHasKey( 'content', $new_data );
 		$this->assertEquals( $unsanitized_content, $new_data['content']['raw'] );
 		$this->assertEquals( $unsanitized_story_data, $new_data['story_data'] );
 
diff --git a/tests/phpunit/tests/REST_API/Embed_Controller.php b/tests/phpunit/tests/REST_API/Embed_Controller.php
index 8633f7e396b1..2ec2dced3545 100644
--- a/tests/phpunit/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/tests/REST_API/Embed_Controller.php
@@ -162,6 +162,7 @@ public function test_register_routes() {
 		$this->assertArrayHasKey( '/web-stories/v1/embed', $routes );
 
 		$route = $routes['/web-stories/v1/embed'];
+
 		$this->assertCount( 1, $route );
 		$this->assertArrayHasKey( 'callback', $route[0] );
 		$this->assertArrayHasKey( 'permission_callback', $route[0] );
diff --git a/tests/phpunit/tests/REST_API/Stories_Controller.php b/tests/phpunit/tests/REST_API/Stories_Controller.php
index 293f9fb77c6d..2cd30f26dbcf 100644
--- a/tests/phpunit/tests/REST_API/Stories_Controller.php
+++ b/tests/phpunit/tests/REST_API/Stories_Controller.php
@@ -405,6 +405,8 @@ public function test_get_item_schema() {
 
 		$this->assertNotEmpty( $data );
 
+		$this->assertArrayHasKey( 'schema', $data );
+		$this->assertArrayHasKey( 'properties', $data['schema'] );
 		$properties = $data['schema']['properties'];
 		$this->assertArrayHasKey( 'story_data', $properties );
 		$this->assertArrayHasKey( 'featured_media_url', $properties );
diff --git a/tests/phpunit/tests/REST_API/Stories_Media_Controller.php b/tests/phpunit/tests/REST_API/Stories_Media_Controller.php
index 56bf3f2db22b..5cf5fca5b39f 100644
--- a/tests/phpunit/tests/REST_API/Stories_Media_Controller.php
+++ b/tests/phpunit/tests/REST_API/Stories_Media_Controller.php
@@ -286,6 +286,8 @@ public function test_get_item_schema() {
 
 		$this->assertNotEmpty( $data );
 
+		$this->assertArrayHasKey( 'schema', $data );
+		$this->assertArrayHasKey( 'properties', $data['schema'] );
 		$properties = $data['schema']['properties'];
 		$this->assertArrayNotHasKey( 'permalink_template', $properties );
 		$this->assertArrayNotHasKey( 'generated_slug', $properties );
diff --git a/tests/phpunit/tests/REST_API/Stories_Users_Controller.php b/tests/phpunit/tests/REST_API/Stories_Users_Controller.php
index fe0d8a5e2349..c2899b63fead 100644
--- a/tests/phpunit/tests/REST_API/Stories_Users_Controller.php
+++ b/tests/phpunit/tests/REST_API/Stories_Users_Controller.php
@@ -109,7 +109,7 @@ public function test_count_user_posts() {
 			[
 				self::$user_id,
 				\Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
-			] 
+			]
 		);
 		$this->assertEquals( 3, $result1 );
 
@@ -126,7 +126,7 @@ public function test_count_user_posts() {
 			[
 				self::$user_id,
 				\Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
-			] 
+			]
 		);
 
 		$this->assertEquals( 4, $result2 );
@@ -139,7 +139,7 @@ public function test_count_user_posts() {
 			[
 				self::$user_id,
 				\Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
-			] 
+			]
 		);
 
 		$this->assertEquals( 3, $result3 );
@@ -159,7 +159,7 @@ public function test_count_user_posts_invalid() {
 			[
 				-1,
 				\Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
-			] 
+			]
 		);
 		$this->assertEquals( 0, $result1 );
 
@@ -169,7 +169,7 @@ public function test_count_user_posts_invalid() {
 			[
 				self::$user_id,
 				'invalid',
-			] 
+			]
 		);
 		$this->assertEquals( 0, $result1 );
 	}

From 9955cbebcfc244f589d2056dcaf9cdecdf935609 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 20 Aug 2021 14:16:12 +0200
Subject: [PATCH 13/41] Move `rest_api_init` to `wpSetUpBeforeClass`

---
 .../tests/REST_API/Autosaves_Controller.php   | 18 +++++++++---------
 .../tests/REST_API/Embed_Controller.php       | 18 +++++++++---------
 .../tests/REST_API/Link_Controller.php        | 19 +++++++++----------
 .../tests/REST_API/Lock_Controller.php        | 18 +++++++++---------
 .../REST_API/Page_Template_Controller.php     | 18 +++++++++---------
 .../REST_API/Status_Check_Controller.php      | 18 +++++++++---------
 .../tests/REST_API/Stories_Controller.php     | 18 +++++++++---------
 .../REST_API/Stories_Media_Controller.php     | 19 ++++++++++---------
 .../REST_API/Stories_Users_Controller.php     | 17 ++++++++---------
 9 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/tests/phpunit/tests/REST_API/Autosaves_Controller.php b/tests/phpunit/tests/REST_API/Autosaves_Controller.php
index 013927394879..6e43edc0d378 100644
--- a/tests/phpunit/tests/REST_API/Autosaves_Controller.php
+++ b/tests/phpunit/tests/REST_API/Autosaves_Controller.php
@@ -40,28 +40,28 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'role' => 'author',
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$author_id );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
diff --git a/tests/phpunit/tests/REST_API/Embed_Controller.php b/tests/phpunit/tests/REST_API/Embed_Controller.php
index 2ec2dced3545..b0a74fb29721 100644
--- a/tests/phpunit/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/tests/REST_API/Embed_Controller.php
@@ -83,22 +83,26 @@ public static function wpSetUpBeforeClass( $factory ) {
 
 		add_filter( 'content_save_pre', 'wp_filter_post_kses' );
 		add_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$subscriber );
 		self::delete_user( self::$editor );
 		self::delete_user( self::$admin );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
 		$this->request_count = 0;
 
@@ -106,10 +110,6 @@ public function setUp() {
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
 
 		$this->remove_caps_from_roles();
diff --git a/tests/phpunit/tests/REST_API/Link_Controller.php b/tests/phpunit/tests/REST_API/Link_Controller.php
index 26a193b8b88c..be1171664b9b 100644
--- a/tests/phpunit/tests/REST_API/Link_Controller.php
+++ b/tests/phpunit/tests/REST_API/Link_Controller.php
@@ -51,33 +51,32 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'user_email' => 'editor@example.com',
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$subscriber );
 		self::delete_user( self::$editor );
+
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
-
 		$this->request_count = 0;
 
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
 
 		$this->remove_caps_from_roles();
diff --git a/tests/phpunit/tests/REST_API/Lock_Controller.php b/tests/phpunit/tests/REST_API/Lock_Controller.php
index 6203b11e7e13..708fc106585a 100644
--- a/tests/phpunit/tests/REST_API/Lock_Controller.php
+++ b/tests/phpunit/tests/REST_API/Lock_Controller.php
@@ -52,29 +52,29 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'user_email' => 'editor@example.com',
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$author_id );
 		self::delete_user( self::$subscriber );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
diff --git a/tests/phpunit/tests/REST_API/Page_Template_Controller.php b/tests/phpunit/tests/REST_API/Page_Template_Controller.php
index 2d13cdcc94e9..eb879c3cf7a2 100644
--- a/tests/phpunit/tests/REST_API/Page_Template_Controller.php
+++ b/tests/phpunit/tests/REST_API/Page_Template_Controller.php
@@ -116,6 +116,11 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'post_type'   => $post_type,
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
@@ -123,26 +128,21 @@ public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user2_id );
 		self::delete_user( self::$user3_id );
 		self::delete_user( self::$author_id );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->add_caps_to_roles();
 
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		$this->set_permalink_structure( '' );
diff --git a/tests/phpunit/tests/REST_API/Status_Check_Controller.php b/tests/phpunit/tests/REST_API/Status_Check_Controller.php
index 8599c525806c..f9c39c82d8ca 100644
--- a/tests/phpunit/tests/REST_API/Status_Check_Controller.php
+++ b/tests/phpunit/tests/REST_API/Status_Check_Controller.php
@@ -56,31 +56,31 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'user_email' => 'editor@example.com',
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$subscriber );
 		self::delete_user( self::$editor );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->request_count = 0;
 
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
diff --git a/tests/phpunit/tests/REST_API/Stories_Controller.php b/tests/phpunit/tests/REST_API/Stories_Controller.php
index 2cd30f26dbcf..fb899fdb3b59 100644
--- a/tests/phpunit/tests/REST_API/Stories_Controller.php
+++ b/tests/phpunit/tests/REST_API/Stories_Controller.php
@@ -123,6 +123,11 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'post_type'   => $post_type,
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
@@ -131,26 +136,21 @@ public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user3_id );
 		self::delete_user( self::$author_id );
 		self::delete_user( self::$contributor_id );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->add_caps_to_roles();
 
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		$this->set_permalink_structure( '' );
diff --git a/tests/phpunit/tests/REST_API/Stories_Media_Controller.php b/tests/phpunit/tests/REST_API/Stories_Media_Controller.php
index 5cf5fca5b39f..56f3b956222e 100644
--- a/tests/phpunit/tests/REST_API/Stories_Media_Controller.php
+++ b/tests/phpunit/tests/REST_API/Stories_Media_Controller.php
@@ -71,28 +71,29 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'display_name' => 'Andrea Adams',
 			]
 		);
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user_id );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
diff --git a/tests/phpunit/tests/REST_API/Stories_Users_Controller.php b/tests/phpunit/tests/REST_API/Stories_Users_Controller.php
index c2899b63fead..97acfe21b442 100644
--- a/tests/phpunit/tests/REST_API/Stories_Users_Controller.php
+++ b/tests/phpunit/tests/REST_API/Stories_Users_Controller.php
@@ -54,30 +54,29 @@ public static function wpSetUpBeforeClass( $factory ) {
 			]
 		);
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user_id );
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 		$this->add_caps_to_roles();
 
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	public function tearDown() {
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
 		$this->remove_caps_from_roles();
 
 		$this->set_permalink_structure( '' );

From 62bd00f3cc3e171de6bdb2f93b9d444d5eee116a Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 9 Sep 2021 00:48:37 +0200
Subject: [PATCH 14/41] Add return type

---
 includes/Infrastructure/ServiceBasedPlugin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/Infrastructure/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index 383f078def7d..94e96e79a2d9 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -467,10 +467,11 @@ protected function get_identifier_from_fqcn( $fqcn ): string {
 	 *
 	 * This takes into account whether the service registration needs to be delayed or not.
 	 *
-	 * @since 1.11.0
+	 * @since 1.12.0
 	 *
 	 * @param string                       $id ID of the service to register.
 	 * @param HasRequirements|class-string $class Class of the service to register.
+	 * @return void
 	 */
 	protected function schedule_potential_service_registration( $id, $class ) {
 		if ( is_a( $class, Delayed::class, true ) ) {

From da6f69ffab5d84a482c51922d4960d299d1ce80a Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 23 Sep 2021 00:03:01 +0200
Subject: [PATCH 15/41] Code & test fixes

---
 includes/AMP/Output_Buffer.php                |  1 -
 includes/AMP/Sanitization.php                 |  7 +-
 includes/AdSense.php                          |  6 +-
 includes/Ad_Manager.php                       |  4 +-
 includes/Admin/Cross_Origin_Isolation.php     | 56 +++++++-----
 includes/Admin/Customizer.php                 |  3 +-
 includes/Analytics.php                        |  4 +-
 includes/Experiments.php                      |  2 +-
 includes/Integrations/AMP.php                 |  4 +-
 includes/Interfaces/Renderer.php              |  2 -
 includes/Media/Media_Source_Taxonomy.php      |  1 -
 .../Migrations/Update_Publisher_Logos.php     |  3 +-
 includes/REST_API/Autosaves_Controller.php    |  4 +-
 includes/REST_API/Embed_Controller.php        |  8 +-
 includes/REST_API/Link_Controller.php         |  1 +
 includes/REST_API/Status_Check_Controller.php |  1 -
 .../REST_API/Template_Lock_Controller.php     |  1 -
 includes/Renderer/Story/Embed.php             |  1 -
 includes/Renderer/Story/HTML.php              |  2 -
 includes/Settings.php                         | 15 +++
 includes/Story_Post_Type.php                  |  4 +-
 includes/Tracking.php                         | 17 +++-
 includes/User/Capabilities.php                |  9 ++
 includes/User/Preferences.php                 | 14 +++
 .../templates/frontend/single-web-story.php   |  1 -
 .../includes/DependencyInjectedTestCase.php   |  6 ++
 .../integration/tests/AMP/Output_Buffer.php   |  1 -
 .../integration/tests/AMP/Sanitization.php    |  1 -
 .../tests/Admin/Cross_Origin_Isolation.php    | 91 ++++++++-----------
 .../integration/tests/Admin/Site_Health.php   |  1 -
 .../integration/tests/Admin/TinyMCE.php       |  1 -
 .../integration/tests/Demo_Content.php        |  3 -
 .../integration/tests/Integrations/AMP.php    |  1 -
 .../tests/REST_API/Embed_Controller.php       | 75 +++++++++++----
 .../tests/REST_API/Hotlinking_Controller.php  | 52 +++++++----
 .../tests/REST_API/Link_Controller.php        | 71 ++++++++++++---
 .../REST_API/Page_Template_Controller.php     |  3 -
 .../REST_API/Status_Check_Controller.php      | 50 +++++++---
 ...r.php => Stories_Autosaves_Controller.php} | 40 +++++---
 .../tests/REST_API/Stories_Controller.php     | 78 +++++++++++-----
 ...roller.php => Stories_Lock_Controller.php} | 59 +++++++++---
 .../REST_API/Stories_Media_Controller.php     | 44 +++++++--
 .../Stories_Taxonomies_Controller.php         | 29 ++++++
 .../REST_API/Stories_Users_Controller.php     | 51 +++++++----
 .../integration/tests/Renderer/Archives.php   |  1 -
 .../integration/tests/Renderer/Feed.php       |  1 -
 .../integration/tests/Renderer/Oembed.php     |  1 -
 .../integration/tests/Renderer/Single.php     |  1 -
 .../Renderer/Stories/Generic_Renderer.php     |  1 -
 .../integration/tests/Renderer/Story/HTML.php |  2 -
 tests/phpunit/integration/tests/Tracking.php  |  3 -
 .../integration/tests/User/Preferences.php    | 40 +++++++-
 52 files changed, 600 insertions(+), 278 deletions(-)
 rename tests/phpunit/integration/tests/REST_API/{Autosaves_Controller.php => Stories_Autosaves_Controller.php} (88%)
 rename tests/phpunit/integration/tests/REST_API/{Lock_Controller.php => Stories_Lock_Controller.php} (92%)

diff --git a/includes/AMP/Output_Buffer.php b/includes/AMP/Output_Buffer.php
index 9ddf4fd6b4b8..382a77d692cd 100644
--- a/includes/AMP/Output_Buffer.php
+++ b/includes/AMP/Output_Buffer.php
@@ -26,7 +26,6 @@
 
 namespace Google\Web_Stories\AMP;
 
-use DOMElement;
 use Exception;
 use Google\Web_Stories\Exception\SanitizationException;
 use Google\Web_Stories\Infrastructure\Conditional;
diff --git a/includes/AMP/Sanitization.php b/includes/AMP/Sanitization.php
index 69fbeebf693b..635b392e4bf5 100644
--- a/includes/AMP/Sanitization.php
+++ b/includes/AMP/Sanitization.php
@@ -26,12 +26,10 @@
 
 namespace Google\Web_Stories\AMP;
 
-use Google\Web_Stories\Experiments;
-use Google\Web_Stories\Media\Image_Sizes;
 use Google\Web_Stories\Model\Story;
+use Google\Web_Stories\Services;
 use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Post_Type;
-use Google\Web_Stories\Traits\Publisher;
 use Google\Web_Stories_Dependencies\AMP_Allowed_Tags_Generated;
 use Google\Web_Stories_Dependencies\AMP_Content_Sanitizer;
 use Google\Web_Stories_Dependencies\AMP_Dev_Mode_Sanitizer;
@@ -46,7 +44,6 @@
 use Google\Web_Stories_Dependencies\AmpProject\Extension;
 use Google\Web_Stories_Dependencies\AmpProject\Tag;
 use DOMElement;
-use WP_Post;
 
 /**
  * Sanitization class.
@@ -407,7 +404,7 @@ protected function get_sanitizers(): array {
 		$post = get_queried_object();
 
 		if ( $post instanceof \WP_Post && Story_Post_Type::POST_TYPE_SLUG === get_post_type( $post ) ) {
-			$video_cache_enabled = (bool) get_option( Settings::SETTING_NAME_VIDEO_CACHE );
+			$video_cache_enabled = (bool) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
 
 			$story = new Story();
 			$story->load_from_post( $post );
diff --git a/includes/AdSense.php b/includes/AdSense.php
index ef4089580a1b..fa9415708ad8 100644
--- a/includes/AdSense.php
+++ b/includes/AdSense.php
@@ -49,7 +49,7 @@ public function register() {
 	 * @return string Publisher ID.
 	 */
 	private function get_publisher_id(): string {
-		return (string) get_option( Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
+		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
 	}
 
 	/**
@@ -60,7 +60,7 @@ private function get_publisher_id(): string {
 	 * @return string Slot ID.
 	 */
 	private function get_slot_id(): string {
-		return (string) get_option( Settings::SETTING_NAME_ADSENSE_SLOT_ID );
+		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ADSENSE_SLOT_ID );
 	}
 
 	/**
@@ -71,7 +71,7 @@ private function get_slot_id(): string {
 	 * @return bool
 	 */
 	private function is_enabled(): bool {
-		return ( 'adsense' === (string) get_option( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'adsense' === (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
diff --git a/includes/Ad_Manager.php b/includes/Ad_Manager.php
index 95ec3e2abdcf..b6c2bc6f6d06 100644
--- a/includes/Ad_Manager.php
+++ b/includes/Ad_Manager.php
@@ -49,7 +49,7 @@ public function register() {
 	 * @return string Slot ID.
 	 */
 	private function get_slot_id(): string {
-		return (string) get_option( Settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
+		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
 	}
 
 	/**
@@ -60,7 +60,7 @@ private function get_slot_id(): string {
 	 * @return bool
 	 */
 	private function is_enabled(): bool {
-		return ( 'admanager' === (string) get_option( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'admanager' === (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
diff --git a/includes/Admin/Cross_Origin_Isolation.php b/includes/Admin/Cross_Origin_Isolation.php
index e5d9fd21d28d..f648dff81b37 100644
--- a/includes/Admin/Cross_Origin_Isolation.php
+++ b/includes/Admin/Cross_Origin_Isolation.php
@@ -30,6 +30,7 @@
 
 use Google\Web_Stories\Infrastructure\Conditional;
 use Google\Web_Stories\Service_Base;
+use Google\Web_Stories\Services;
 use Google\Web_Stories\Traits\Screen;
 use Google\Web_Stories\User\Preferences;
 
@@ -81,6 +82,38 @@ public static function get_registration_action_priority(): int {
 		return 11;
 	}
 
+	/**
+	 * Check whether the conditional object is currently needed.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @return bool Whether the conditional object is needed.
+	 */
+	public static function is_needed(): bool {
+		$user_id = get_current_user_id();
+		if ( ! $user_id ) {
+			return false;
+		}
+
+		// Cross-origin isolation is not needed if users can't upload files anyway.
+		if ( ! user_can( $user_id, 'upload_files' ) ) {
+			return false;
+		}
+
+		return rest_sanitize_boolean( Services::get( 'user_preferences' )->get_preference( $user_id, Preferences::MEDIA_OPTIMIZATION_META_KEY ) );
+	}
+
+	/**
+	 * Get the list of service IDs required for this service to be registered.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array {
+		return [ 'user_preferences' ];
+	}
+
 	/**
 	 * Start output buffer and add headers.
 	 *
@@ -289,27 +322,4 @@ public function custom_print_media_templates() {
 	private function starts_with( string $string, string $start_string ): bool {
 		return 0 === strpos( $string, $start_string );
 	}
-
-	/**
-	 * Check whether the conditional object is currently needed.
-	 *
-	 * @since 1.6.0
-	 *
-	 * @return bool Whether the conditional object is needed.
-	 */
-	public static function is_needed(): bool {
-		$user_id = get_current_user_id();
-		if ( ! $user_id ) {
-			return false;
-		}
-
-		// Cross-origin isolation is not needed if users can't upload files anyway.
-		if ( ! user_can( $user_id, 'upload_files' ) ) {
-			return false;
-		}
-
-		$check = get_user_meta( $user_id, Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
-
-		return rest_sanitize_boolean( $check );
-	}
 }
diff --git a/includes/Admin/Customizer.php b/includes/Admin/Customizer.php
index 2769054d8b6a..7f34e95cc6d9 100644
--- a/includes/Admin/Customizer.php
+++ b/includes/Admin/Customizer.php
@@ -26,6 +26,7 @@
 
 namespace Google\Web_Stories\Admin;
 
+use Google\Web_Stories\Services;
 use Google\Web_Stories\Story_Query;
 use Google\Web_Stories\Service_Base;
 use Google\Web_Stories\Traits\Layout;
@@ -536,7 +537,7 @@ public function validate_number_of_columns( $validity, $value ) {
 	 * @return string
 	 */
 	public function render_stories(): string {
-		$options = get_option( self::STORY_OPTION );
+		$options = Services::get( 'settings' )->get_setting( self::STORY_OPTION );
 
 		if ( empty( $options['show_stories'] ) || true !== $options['show_stories'] ) {
 			return '';
diff --git a/includes/Analytics.php b/includes/Analytics.php
index 2a62c22cc1c1..d9fc4c67a3c1 100644
--- a/includes/Analytics.php
+++ b/includes/Analytics.php
@@ -68,7 +68,7 @@ public function register() {
 	 * @return string Tracking ID.
 	 */
 	public function get_tracking_id(): string {
-		return (string) get_option( Settings::SETTING_NAME_TRACKING_ID );
+		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_TRACKING_ID );
 	}
 
 	/**
@@ -229,7 +229,7 @@ public function print_analytics_tag() {
 		}
 
 		if (
-			(bool) get_option( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) ||
+			(bool) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) ||
 			! $this->experiments->is_experiment_enabled( 'enableAutoAnalyticsMigration' )
 		) {
 			$this->print_amp_analytics_tag( $tracking_id );
diff --git a/includes/Experiments.php b/includes/Experiments.php
index 74a456b29287..d6f8b23605d0 100644
--- a/includes/Experiments.php
+++ b/includes/Experiments.php
@@ -461,7 +461,7 @@ public function is_experiment_enabled( string $name ): bool {
 			return (bool) $experiment['default'];
 		}
 
-		$experiments = get_option( Settings::SETTING_NAME_EXPERIMENTS );
+		$experiments = Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_EXPERIMENTS, [] );
 		return ! empty( $experiments[ $name ] );
 	}
 
diff --git a/includes/Integrations/AMP.php b/includes/Integrations/AMP.php
index 7e31d1d17b7f..1c9da2c58d9d 100644
--- a/includes/Integrations/AMP.php
+++ b/includes/Integrations/AMP.php
@@ -28,8 +28,8 @@
 
 use DOMElement;
 use Google\Web_Stories\AMP\Integration\AMP_Story_Sanitizer;
-use Google\Web_Stories\Experiments;
 use Google\Web_Stories\Model\Story;
+use Google\Web_Stories\Services;
 use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Service_Base;
@@ -139,7 +139,7 @@ public function add_amp_content_sanitizers( $sanitizers ) {
 			return $sanitizers;
 		}
 
-		$video_cache_enabled = (bool) get_option( Settings::SETTING_NAME_VIDEO_CACHE );
+		$video_cache_enabled = (bool) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
 
 		$story = new Story();
 		$story->load_from_post( $post );
diff --git a/includes/Interfaces/Renderer.php b/includes/Interfaces/Renderer.php
index edb105dc0644..40679b01f0e1 100644
--- a/includes/Interfaces/Renderer.php
+++ b/includes/Interfaces/Renderer.php
@@ -28,8 +28,6 @@
 
 namespace Google\Web_Stories\Interfaces;
 
-use Google\Web_Stories\Interfaces\FieldState;
-
 /**
  * Interface Renderer.
  *
diff --git a/includes/Media/Media_Source_Taxonomy.php b/includes/Media/Media_Source_Taxonomy.php
index fb4cf8107cb7..4806f1eb5090 100644
--- a/includes/Media/Media_Source_Taxonomy.php
+++ b/includes/Media/Media_Source_Taxonomy.php
@@ -30,7 +30,6 @@
 use Google\Web_Stories\Traits\Screen;
 use WP_Query;
 use WP_Post;
-use WP_REST_Request;
 
 /**
  * Class Media_Source_Taxonomy
diff --git a/includes/Migrations/Update_Publisher_Logos.php b/includes/Migrations/Update_Publisher_Logos.php
index b37583dea121..73b030d1fda1 100644
--- a/includes/Migrations/Update_Publisher_Logos.php
+++ b/includes/Migrations/Update_Publisher_Logos.php
@@ -27,6 +27,7 @@
 
 namespace Google\Web_Stories\Migrations;
 
+use Google\Web_Stories\Services;
 use Google\Web_Stories\Settings;
 
 /**
@@ -45,7 +46,7 @@ class Update_Publisher_Logos extends Migrate_Base {
 	 */
 	public function migrate() {
 		$publisher_logo_id       = 0;
-		$publisher_logo_settings = (array) get_option( Settings::SETTING_NAME_PUBLISHER_LOGOS );
+		$publisher_logo_settings = (array) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] );
 
 		if ( ! empty( $publisher_logo_settings['active'] ) ) {
 			$publisher_logo_id = $publisher_logo_settings['active'];
diff --git a/includes/REST_API/Autosaves_Controller.php b/includes/REST_API/Autosaves_Controller.php
index d3995ea90c0c..d0206876a85f 100644
--- a/includes/REST_API/Autosaves_Controller.php
+++ b/includes/REST_API/Autosaves_Controller.php
@@ -29,13 +29,10 @@
 use Google\Web_Stories\Infrastructure\Delayed;
 use Google\Web_Stories\Infrastructure\Registerable;
 use Google\Web_Stories\Infrastructure\Service;
-use Google\Web_Stories\Media\Image_Sizes;
 use Google\Web_Stories\Traits\Post_Type;
-use WP_Error;
 use WP_Post;
 use WP_REST_Autosaves_Controller;
 use WP_REST_Controller;
-use WP_REST_Posts_Controller;
 use WP_REST_Request;
 use WP_REST_Response;
 use WP_REST_Server;
@@ -47,6 +44,7 @@
  */
 abstract class Autosaves_Controller extends WP_REST_Autosaves_Controller implements Service, Delayed, Registerable {
 	use Post_Type;
+
 	/**
 	 * Parent post controller.
 	 *
diff --git a/includes/REST_API/Embed_Controller.php b/includes/REST_API/Embed_Controller.php
index 9a41271d4148..4ffd3a915ee0 100644
--- a/includes/REST_API/Embed_Controller.php
+++ b/includes/REST_API/Embed_Controller.php
@@ -32,6 +32,7 @@
 use Google\Web_Stories\Traits\Post_Type;
 use WP_Error;
 use WP_Http;
+use WP_Network;
 use WP_Post;
 use WP_REST_Request;
 use WP_REST_Response;
@@ -237,7 +238,7 @@ private function url_to_post( $url ) {
 				$path    = explode( '/', ltrim( $url_parts['path'], '/' ) );
 				$path    = count( $path ) > 2 ? reset( $path ) : false;
 				$network = get_network();
-				if ( $path && $network instanceof \WP_Network ) {
+				if ( $path && $network instanceof WP_Network ) {
 					$qv['path'] = $network->path . $path . '/';
 				}
 			}
@@ -363,10 +364,7 @@ public function prepare_item_for_response( $embed, $request ) {
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		return $response;
+		return rest_ensure_response( $data );
 	}
 
 
diff --git a/includes/REST_API/Link_Controller.php b/includes/REST_API/Link_Controller.php
index 6d34e9cec328..4bca23d9d22b 100644
--- a/includes/REST_API/Link_Controller.php
+++ b/includes/REST_API/Link_Controller.php
@@ -44,6 +44,7 @@
  */
 class Link_Controller extends REST_Controller {
 	use Document_Parser, Post_Type;
+
 	/**
 	 * Constructor.
 	 */
diff --git a/includes/REST_API/Status_Check_Controller.php b/includes/REST_API/Status_Check_Controller.php
index 1dc9a3a998d5..1f66e4d25d9a 100644
--- a/includes/REST_API/Status_Check_Controller.php
+++ b/includes/REST_API/Status_Check_Controller.php
@@ -27,7 +27,6 @@
 namespace Google\Web_Stories\REST_API;
 
 use Google\Web_Stories\Decoder;
-use Google\Web_Stories\Experiments;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Traits\Post_Type;
 use WP_REST_Server;
diff --git a/includes/REST_API/Template_Lock_Controller.php b/includes/REST_API/Template_Lock_Controller.php
index 6c8ed78cb92a..e9e053023ea9 100644
--- a/includes/REST_API/Template_Lock_Controller.php
+++ b/includes/REST_API/Template_Lock_Controller.php
@@ -27,7 +27,6 @@
 namespace Google\Web_Stories\REST_API;
 
 use Google\Web_Stories\Template_Post_Type;
-use WP_REST_Controller;
 
 /**
  * Class Template_Lock_Controller
diff --git a/includes/Renderer/Story/Embed.php b/includes/Renderer/Story/Embed.php
index 59988ea07607..ace1674aa87c 100644
--- a/includes/Renderer/Story/Embed.php
+++ b/includes/Renderer/Story/Embed.php
@@ -28,7 +28,6 @@
 namespace Google\Web_Stories\Renderer\Story;
 
 use Google\Web_Stories\Assets;
-use Google\Web_Stories\Embed_Base;
 use Google\Web_Stories\Model\Story;
 use Google\Web_Stories\AMP_Story_Player_Assets;
 use Google\Web_Stories\Traits\Amp;
diff --git a/includes/Renderer/Story/HTML.php b/includes/Renderer/Story/HTML.php
index 542e04c4bd57..4adc0e3d5569 100644
--- a/includes/Renderer/Story/HTML.php
+++ b/includes/Renderer/Story/HTML.php
@@ -26,8 +26,6 @@
 
 namespace Google\Web_Stories\Renderer\Story;
 
-use Google\Web_Stories\Experiments;
-use Google\Web_Stories\Settings;
 use Google\Web_Stories_Dependencies\AmpProject\Dom\Document;
 use Google\Web_Stories\Model\Story;
 
diff --git a/includes/Settings.php b/includes/Settings.php
index d5cde96c0848..81738f408ad8 100644
--- a/includes/Settings.php
+++ b/includes/Settings.php
@@ -282,4 +282,19 @@ public function register() {
 	public static function get_registration_action_priority(): int {
 		return 5;
 	}
+
+	/**
+	 * Returns the value for a given setting.
+	 *
+	 * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param string $key Setting key.
+	 * @param mixed  $default Optional. Default value to return if the option does not exist.
+	 * @return mixed Setting value.
+	 */
+	public function get_setting( $key, $default = false ) {
+		return get_option( $key, $default );
+	}
 }
diff --git a/includes/Story_Post_Type.php b/includes/Story_Post_Type.php
index 7274bbf8f826..11acd8f97d82 100644
--- a/includes/Story_Post_Type.php
+++ b/includes/Story_Post_Type.php
@@ -121,7 +121,7 @@ public function on_plugin_deactivation( $network_wide ) {
 	 * @return \WP_Post_Type|\WP_Error
 	 */
 	public function register_post_type() {
-		$has_archive = 'default' === get_option( Settings::SETTING_NAME_ARCHIVE, 'default' );
+		$has_archive = 'default' === Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ARCHIVE, 'default' );
 
 		return register_post_type(
 			self::POST_TYPE_SLUG,
@@ -206,7 +206,7 @@ public function unregister_post_type() {
 	 * @return void
 	 */
 	protected function register_meta() {
-		$active_publisher_logo_id = absint( get_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
+		$active_publisher_logo_id = absint( Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, 0 ) );
 
 		register_post_meta(
 			self::POST_TYPE_SLUG,
diff --git a/includes/Tracking.php b/includes/Tracking.php
index f8f7121516a7..b4f7dbe4a4a3 100644
--- a/includes/Tracking.php
+++ b/includes/Tracking.php
@@ -128,6 +128,17 @@ public static function get_registration_action(): string {
 		return 'admin_init';
 	}
 
+	/**
+	 * Get the list of service IDs required for this service to be registered.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array {
+		return [ 'user_preferences' ];
+	}
+
 	/**
 	 * Returns tracking settings to pass to the inline script.
 	 *
@@ -161,7 +172,7 @@ private function get_user_properties(): array {
 
 		$site_kit_status = $this->site_kit->get_plugin_status();
 		$active_plugins  = $site_kit_status['active'] ? 'google-site-kit' : '';
-		$analytics       = $site_kit_status['analyticsActive'] ? 'google-site-kit' : ! empty( get_option( Settings::SETTING_NAME_TRACKING_ID ) );
+		$analytics       = $site_kit_status['analyticsActive'] ? 'google-site-kit' : ! empty( Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_TRACKING_ID ) );
 
 		return [
 			'siteLocale'         => get_locale(),
@@ -171,7 +182,7 @@ private function get_user_properties(): array {
 			'wpVersion'          => get_bloginfo( 'version' ),
 			'phpVersion'         => PHP_VERSION,
 			'isMultisite'        => (int) is_multisite(),
-			'adNetwork'          => (string) get_option( Settings::SETTING_NAME_AD_NETWORK, 'none' ),
+			'adNetwork'          => (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ),
 			'analytics'          => $analytics,
 			'activePlugins'      => $active_plugins,
 		];
@@ -183,6 +194,6 @@ private function get_user_properties(): array {
 	 * @return bool True if tracking enabled, and False if not.
 	 */
 	public function is_active(): bool {
-		return (bool) get_user_meta( get_current_user_id(), Preferences::OPTIN_META_KEY, true );
+		return (bool) Services::get( 'user_preferences' )->get_preference( get_current_user_id(), Preferences::OPTIN_META_KEY );
 	}
 }
diff --git a/includes/User/Capabilities.php b/includes/User/Capabilities.php
index c9a307d23268..5e963fdc1924 100644
--- a/includes/User/Capabilities.php
+++ b/includes/User/Capabilities.php
@@ -192,4 +192,13 @@ protected function get_all_capabilities(): array {
 
 		return $all_capabilities;
 	}
+
+	/**
+	 * Get the list of service IDs required for this service to be registered.
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array {
+		return [ 'story_post_type', 'taxonomy.category', 'taxonomy.tag' ];
+	}
 }
diff --git a/includes/User/Preferences.php b/includes/User/Preferences.php
index 8d0b831c35e6..50cef21eb75a 100644
--- a/includes/User/Preferences.php
+++ b/includes/User/Preferences.php
@@ -124,4 +124,18 @@ public function register() {
 	public function can_edit_current_user( $allowed, $meta_key, $user_id, $current_user_id ): bool {
 		return user_can( $current_user_id, 'edit_user', $user_id );
 	}
+
+	/**
+	 * Returns the specific preference for a givern user.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param int    $user_id User ID.
+	 * @param string $key Preference key.
+	 *
+	 * @return mixed User preference value.
+	 */
+	public function get_preference( $user_id, $key ) {
+		return get_user_meta( $user_id, $key, true );
+	}
 }
diff --git a/includes/templates/frontend/single-web-story.php b/includes/templates/frontend/single-web-story.php
index f5ec8f2203a2..3ec86a243337 100644
--- a/includes/templates/frontend/single-web-story.php
+++ b/includes/templates/frontend/single-web-story.php
@@ -10,7 +10,6 @@
 
 use Google\Web_Stories\Renderer\Story\HTML;
 use Google\Web_Stories\Model\Story;
-use Google\Web_Stories\Services;
 
 /**
  * Copyright 2020 Google LLC
diff --git a/tests/phpunit/integration/includes/DependencyInjectedTestCase.php b/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
index a7ab3945965d..bec22206eccf 100644
--- a/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
+++ b/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
@@ -44,6 +44,12 @@ abstract class DependencyInjectedTestCase extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
+		// Needed because the block will exist already after hooking up the plugin
+		// on plugins_loaded. This avoids _doing_it_wrong messages
+		// due to registering the plugin (and thus the block) again.
+		// TODO: Figure out a better way.
+		unregister_block_type( 'web-stories/embed' );
+
 		// We're intentionally avoiding the PluginFactory here as it uses a
 		// static instance, because its whole point is to allow reuse across consumers.
 		$this->plugin = new Plugin();
diff --git a/tests/phpunit/integration/tests/AMP/Output_Buffer.php b/tests/phpunit/integration/tests/AMP/Output_Buffer.php
index 4986c9643d4d..7030d412c6e7 100644
--- a/tests/phpunit/integration/tests/AMP/Output_Buffer.php
+++ b/tests/phpunit/integration/tests/AMP/Output_Buffer.php
@@ -20,7 +20,6 @@
 use Google\Web_Stories\Experiments;
 use Google\Web_Stories\Model\Story;
 use Google\Web_Stories\Renderer\Story\HTML;
-use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\AMP\Sanitization;
 use Google\Web_Stories\AMP\Optimization;
diff --git a/tests/phpunit/integration/tests/AMP/Sanitization.php b/tests/phpunit/integration/tests/AMP/Sanitization.php
index a797700f1725..25c68f6e10da 100644
--- a/tests/phpunit/integration/tests/AMP/Sanitization.php
+++ b/tests/phpunit/integration/tests/AMP/Sanitization.php
@@ -18,7 +18,6 @@
 namespace Google\Web_Stories\Tests\Integration\AMP;
 
 use DOMElement;
-use Google\Web_Stories\Experiments;
 use Google\Web_Stories_Dependencies\AMP_Dev_Mode_Sanitizer;
 use Google\Web_Stories_Dependencies\AMP_Layout_Sanitizer;
 use Google\Web_Stories_Dependencies\AMP_Style_Sanitizer;
diff --git a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
index ae5717772b45..7178499b43e2 100644
--- a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
+++ b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
@@ -17,12 +17,12 @@
 
 namespace Google\Web_Stories\Tests\Integration\Admin;
 
-use Google\Web_Stories\Tests\Integration\TestCase;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Admin\Cross_Origin_Isolation
  */
-class Cross_Origin_Isolation extends TestCase {
+class Cross_Origin_Isolation extends DependencyInjectedTestCase {
 	/**
 	 * Admin user for test.
 	 *
@@ -37,6 +37,13 @@ class Cross_Origin_Isolation extends TestCase {
 	 */
 	protected static $contributor_id;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\Admin\Cross_Origin_Isolation
+	 */
+	private $instance;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$admin_id = $factory->user->create(
 			[ 'role' => 'administrator' ]
@@ -55,8 +62,7 @@ public static function wpTearDownAfterClass() {
 	public function setUp() {
 		parent::setUp();
 
-		$user_preferences = new \Google\Web_Stories\User\Preferences();
-		$user_preferences->register();
+		$this->instance = $this->injector->make( \Google\Web_Stories\Admin\Cross_Origin_Isolation::class );
 	}
 
 	/**
@@ -68,15 +74,14 @@ public function test_register() {
 
 		$GLOBALS['current_screen'] = convert_to_screen( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$instance->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_action( 'load-post.php', [ $instance, 'admin_header' ] ) );
-		$this->assertSame( 10, has_action( 'load-post-new.php', [ $instance, 'admin_header' ] ) );
+		$this->assertSame( 10, has_action( 'load-post.php', [ $this->instance, 'admin_header' ] ) );
+		$this->assertSame( 10, has_action( 'load-post-new.php', [ $this->instance, 'admin_header' ] ) );
 
-		$this->assertSame( 10, has_filter( 'style_loader_tag', [ $instance, 'style_loader_tag' ] ) );
-		$this->assertSame( 10, has_filter( 'script_loader_tag', [ $instance, 'script_loader_tag' ] ) );
-		$this->assertSame( 10, has_filter( 'get_avatar', [ $instance, 'get_avatar' ] ) );
+		$this->assertSame( 10, has_filter( 'style_loader_tag', [ $this->instance, 'style_loader_tag' ] ) );
+		$this->assertSame( 10, has_filter( 'script_loader_tag', [ $this->instance, 'script_loader_tag' ] ) );
+		$this->assertSame( 10, has_filter( 'get_avatar', [ $this->instance, 'get_avatar' ] ) );
 
 		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
 	}
@@ -87,9 +92,8 @@ public function test_register() {
 	public function test_is_needed() {
 		wp_set_current_user( self::$admin_id );
 		update_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertTrue( $result );
+
+		$this->assertTrue( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
 
 	/**
@@ -98,18 +102,15 @@ public function test_is_needed() {
 	public function test_is_needed_default_user_meta_value() {
 		wp_set_current_user( self::$admin_id );
 		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertTrue( $result );
+
+		$this->assertTrue( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
 
 	/**
 	 * @covers ::is_needed
 	 */
 	public function test_is_needed_no_user() {
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertFalse( $result );
+		$this->assertFalse( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
 
 	/**
@@ -118,9 +119,8 @@ public function test_is_needed_no_user() {
 	public function test_is_needed_opt_out() {
 		wp_set_current_user( self::$admin_id );
 		update_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, false );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertFalse( $result );
+
+		$this->assertFalse( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
 
 	/**
@@ -129,9 +129,8 @@ public function test_is_needed_opt_out() {
 	public function test_is_needed_no_upload_caps() {
 		wp_set_current_user( self::$contributor_id );
 		update_user_meta( self::$contributor_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertFalse( $result );
+
+		$this->assertFalse( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
 
 	/**
@@ -139,11 +138,10 @@ public function test_is_needed_no_upload_caps() {
 	 * @covers ::starts_with
 	 */
 	public function test_add_attribute() {
-		$instance  = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
 		$html      = "<img src='http://www.google.com/test.jpg' alt='test' />";
 		$attribute = 'src';
 		$url       = 'http://www.google.com/test.jpg';
-		$result    = $this->call_private_method( $instance, 'add_attribute', [ $html, $attribute, $url ] );
+		$result    = $this->call_private_method( $this->instance, 'add_attribute', [ $html, $attribute, $url ] );
 		$this->assertContains( 'crossorigin', $result );
 	}
 	/**
@@ -151,12 +149,10 @@ public function test_add_attribute() {
 	 * @covers ::starts_with
 	 */
 	public function test_add_attribute_local_image() {
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-
 		$url       = site_url( '/test.jpg' );
 		$html      = sprintf( "<img src='%s' alt='test' />", $url );
 		$attribute = 'src';
-		$result    = $this->call_private_method( $instance, 'add_attribute', [ $html, $attribute, $url ] );
+		$result    = $this->call_private_method( $this->instance, 'add_attribute', [ $html, $attribute, $url ] );
 		$this->assertNotContains( 'crossorigin', $result );
 	}
 
@@ -165,12 +161,10 @@ public function test_add_attribute_local_image() {
 	 * @covers ::starts_with
 	 */
 	public function test_add_attribute_relative_image() {
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-
 		$html      = "<img src='/test.jpg' alt='test' />";
 		$attribute = 'src';
 		$url       = '/test.jpg';
-		$result    = $this->call_private_method( $instance, 'add_attribute', [ $html, $attribute, $url ] );
+		$result    = $this->call_private_method( $this->instance, 'add_attribute', [ $html, $attribute, $url ] );
 		$this->assertNotContains( 'crossorigin', $result );
 	}
 
@@ -178,11 +172,9 @@ public function test_add_attribute_relative_image() {
 	 * @covers ::starts_with
 	 */
 	public function test_starts_with() {
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-
 		$string       = 'hello world';
 		$start_string = 'hello';
-		$result       = $this->call_private_method( $instance, 'starts_with', [ $string, $start_string ] );
+		$result       = $this->call_private_method( $this->instance, 'starts_with', [ $string, $start_string ] );
 		$this->assertTrue( $result );
 	}
 
@@ -190,11 +182,9 @@ public function test_starts_with() {
 	 * @covers ::starts_with
 	 */
 	public function test_starts_with_fail() {
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-
 		$string       = 'hello world';
 		$start_string = 'world';
-		$result       = $this->call_private_method( $instance, 'starts_with', [ $string, $start_string ] );
+		$result       = $this->call_private_method( $this->instance, 'starts_with', [ $string, $start_string ] );
 		$this->assertFalse( $result );
 	}
 
@@ -207,8 +197,7 @@ public function test_starts_with_fail() {
 	public function test_is_edit_screen() {
 		$GLOBALS['current_screen'] = convert_to_screen( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_edit_screen' );
+		$result = $this->call_private_method( $this->instance, 'is_edit_screen' );
 		$this->assertTrue( $result );
 	}
 
@@ -217,8 +206,7 @@ public function test_is_edit_screen() {
 	 * @covers \Google\Web_Stories\Traits\Screen::get_current_screen
 	 */
 	public function test_get_current_screen() {
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'get_current_screen' );
+		$result = $this->call_private_method( $this->instance, 'get_current_screen' );
 		$this->assertFalse( $result );
 	}
 
@@ -228,10 +216,9 @@ public function test_get_current_screen() {
 	public function test_replace_in_dom() {
 		$site_url = site_url();
 
-		$html     = file_get_contents( WEB_STORIES_TEST_DATA_DIR . '/cross_origin_content.html' );
-		$html     = str_replace( '--SITE_URL--', $site_url, $html );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'replace_in_dom', [ $html ] );
+		$html   = file_get_contents( WEB_STORIES_TEST_DATA_DIR . '/cross_origin_content.html' );
+		$html   = str_replace( '--SITE_URL--', $site_url, $html );
+		$result = $this->call_private_method( $this->instance, 'replace_in_dom', [ $html ] );
 
 		$this->assertContains( '<script async="" crossorigin="anonymous" src="https://cdn.ampproject.org/v0.js"></script>', $result );
 		$this->assertContains( '<script async="" crossorigin="anonymous" src="https://cdn.ampproject.org/v0/amp-story-1.0.js" custom-element="amp-story"></script>', $result );
@@ -259,9 +246,8 @@ public function test_replace_in_dom() {
 	 * @covers ::replace_in_dom
 	 */
 	public function test_replace_in_dom_invalid() {
-		$html     = '<html><img src="http://www.example.com/test1.jpg" /><invalid /</html';
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'replace_in_dom', [ $html ] );
+		$html   = '<html><img src="http://www.example.com/test1.jpg" /><invalid /</html';
+		$result = $this->call_private_method( $this->instance, 'replace_in_dom', [ $html ] );
 		$this->assertContains( '<img crossorigin="anonymous" src="http://www.example.com/test1.jpg" />', $result );
 	}
 
@@ -272,8 +258,7 @@ public function test_replace_in_dom_invalid() {
 	 */
 	public function test_custom_print_media_templates() {
 		require_once ABSPATH . WPINC . '/media-template.php';
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$output   = get_echo( [ $instance, 'custom_print_media_templates' ] );
+		$output = get_echo( [ $this->instance, 'custom_print_media_templates' ] );
 		$this->assertContains( '<audio crossorigin="anonymous"', $output );
 		$this->assertContains( '<img crossorigin="anonymous"', $output );
 		$this->assertContains( '<video crossorigin="anonymous"', $output );
diff --git a/tests/phpunit/integration/tests/Admin/Site_Health.php b/tests/phpunit/integration/tests/Admin/Site_Health.php
index 4626f0ee29ce..898fc924d3dd 100644
--- a/tests/phpunit/integration/tests/Admin/Site_Health.php
+++ b/tests/phpunit/integration/tests/Admin/Site_Health.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Admin;
 
-use Google\Web_Stories\Experiments;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
diff --git a/tests/phpunit/integration/tests/Admin/TinyMCE.php b/tests/phpunit/integration/tests/Admin/TinyMCE.php
index e271a3205f6d..e67cbbac40ff 100644
--- a/tests/phpunit/integration/tests/Admin/TinyMCE.php
+++ b/tests/phpunit/integration/tests/Admin/TinyMCE.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Admin;
 
-use Google\Web_Stories\Assets;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
diff --git a/tests/phpunit/integration/tests/Demo_Content.php b/tests/phpunit/integration/tests/Demo_Content.php
index 23c9823017f7..46d5290cd765 100644
--- a/tests/phpunit/integration/tests/Demo_Content.php
+++ b/tests/phpunit/integration/tests/Demo_Content.php
@@ -17,9 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration;
 
-use Spy_REST_Server;
-use WP_REST_Request;
-
 /**
  * @coversDefaultClass \Google\Web_Stories\Demo_Content
  */
diff --git a/tests/phpunit/integration/tests/Integrations/AMP.php b/tests/phpunit/integration/tests/Integrations/AMP.php
index 68801dacecf5..7126cf331cb4 100644
--- a/tests/phpunit/integration/tests/Integrations/AMP.php
+++ b/tests/phpunit/integration/tests/Integrations/AMP.php
@@ -18,7 +18,6 @@
 namespace Google\Web_Stories\Tests\Integration\Integrations;
 
 use DOMDocument;
-use Google\Web_Stories\Experiments;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
diff --git a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
index 9acdb90e0897..10697789314d 100644
--- a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
@@ -17,9 +17,12 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
+use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Spy_REST_Server;
 use WP_REST_Request;
+use WP_REST_Response;
+use WP_REST_Server;
 
 /**
  * Class Embed_Controller
@@ -30,7 +33,7 @@
  */
 class Embed_Controller extends Test_REST_TestCase {
 	/**
-	 * @var \WP_REST_Server
+	 * @var WP_REST_Server
 	 */
 	protected $server;
 
@@ -50,6 +53,13 @@ class Embed_Controller extends Test_REST_TestCase {
 	 */
 	protected $request_count = 0;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Embed_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$subscriber = $factory->user->create(
 			[
@@ -74,7 +84,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 		$story_content  = file_get_contents( WEB_STORIES_TEST_DATA_DIR . '/story_post_content.html' );
 		self::$story_id = $factory->post->create(
 			[
-				'post_type'    => \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
+				'post_type'    => Story_Post_Type::POST_TYPE_SLUG,
 				'post_title'   => 'Embed Controller Test Story',
 				'post_status'  => 'publish',
 				'post_content' => $story_content,
@@ -83,33 +93,35 @@ public static function wpSetUpBeforeClass( $factory ) {
 
 		add_filter( 'content_save_pre', 'wp_filter_post_kses' );
 		add_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$subscriber );
 		self::delete_user( self::$editor );
 		self::delete_user( self::$admin );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
 		$this->request_count = 0;
 
+		$this->controller = new \Google\Web_Stories\REST_API\Embed_Controller();
+
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
 
 		$this->remove_caps_from_roles();
@@ -125,7 +137,7 @@ public function tearDown() {
 	 * @param string $url     The request URL.
 	 * @return array Response data.
 	 */
-	public function mock_http_request( $preempt, $r, $url ) {
+	public function mock_http_request( $preempt, $r, $url ): array {
 		++ $this->request_count;
 
 		if ( false !== strpos( $url, self::VALID_URL_EMPTY_DOCUMENT ) ) {
@@ -153,13 +165,17 @@ public function mock_http_request( $preempt, $r, $url ) {
 		];
 	}
 
+	/**
+	 * @covers ::register
+	 */
 	public function test_register_routes() {
+		$this->controller->register();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/embed', $routes );
 
 		$route = $routes['/web-stories/v1/embed'];
-
 		$this->assertCount( 1, $route );
 		$this->assertArrayHasKey( 'callback', $route[0] );
 		$this->assertArrayHasKey( 'permission_callback', $route[0] );
@@ -167,8 +183,8 @@ public function test_register_routes() {
 		$this->assertArrayHasKey( 'args', $route[0] );
 	}
 
-	protected function dispatch_request( $url = null ) {
-		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/embed' );
+	protected function dispatch_request( $url = null ): WP_REST_Response {
+		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/embed' );
 		if ( null !== $url ) {
 			$request->set_param( 'url', $url );
 		}
@@ -176,18 +192,25 @@ protected function dispatch_request( $url = null ) {
 	}
 
 	public function test_missing_param() {
+		$this->controller->register();
+
 		$response = $this->dispatch_request();
 
 		$this->assertErrorResponse( 'rest_missing_callback_param', $response, 400 );
 	}
 
 	public function test_not_logged_in() {
+		$this->controller->register();
+
+
 		$response = $this->dispatch_request( '' );
 
 		$this->assertErrorResponse( 'rest_forbidden', $response, 401 );
 	}
 
 	public function test_without_permission() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$subscriber );
 
 		$response = $this->dispatch_request( self::VALID_URL );
@@ -197,6 +220,8 @@ public function test_without_permission() {
 	}
 
 	public function test_url_empty_string() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		$response = $this->dispatch_request( '' );
@@ -206,6 +231,8 @@ public function test_url_empty_string() {
 	}
 
 	public function test_invalid_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		$response = $this->dispatch_request( self::INVALID_URL );
@@ -214,6 +241,8 @@ public function test_invalid_url() {
 	}
 
 	public function test_empty_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		$response = $this->dispatch_request( self::VALID_URL_EMPTY_DOCUMENT );
@@ -222,6 +251,8 @@ public function test_empty_url() {
 	}
 
 	public function test_valid_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$response = $this->dispatch_request( self::VALID_URL );
 		$data     = $response->get_data();
@@ -240,6 +271,8 @@ public function test_valid_url() {
 	}
 
 	public function test_removes_trailing_slashes() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$response = $this->dispatch_request( self::VALID_URL );
 		$data     = $response->get_data();
@@ -249,7 +282,7 @@ public function test_removes_trailing_slashes() {
 			'poster' => 'https://amp.dev/static/samples/img/story_dog2_portrait.jpg',
 		];
 
-		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/embed' );
+		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/embed' );
 		$request->set_param( 'url', self::VALID_URL . '/' );
 		rest_get_server()->dispatch( $request );
 		$this->assertEquals( 1, $this->request_count );
@@ -259,6 +292,8 @@ public function test_removes_trailing_slashes() {
 	}
 
 	public function test_local_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		$response = $this->dispatch_request( get_permalink( self::$story_id ) );
@@ -275,13 +310,15 @@ public function test_local_url() {
 	}
 
 	public function test_local_url_pretty_permalinks() {
+		$this->controller->register();
+
 		$this->set_permalink_structure( '/%postname%/' );
 
 		// Without (re-)registering the post type here there won't be any rewrite rules for it
 		// and get_permalink() will return "http://example.org/?web-story=embed-controller-test-story"
 		// instead of "http://example.org/web-stories/embed-controller-test-story/".
 		// @todo Investigate why this is  needed (leakage between tests?)
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
+		$story_post_type = new Story_Post_Type();
 		$story_post_type->register();
 
 		flush_rewrite_rules( false );
@@ -305,13 +342,15 @@ public function test_local_url_pretty_permalinks() {
 	 * @group ms-required
 	 */
 	public function test_local_url_pretty_permalinks_multisite() {
+		$this->controller->register();
+
 		$this->set_permalink_structure( '/%postname%/' );
 
 		// Without (re-)registering the post type here there won't be any rewrite rules for it
 		// and get_permalink() will return "http://example.org/?web-story=embed-controller-test-story"
 		// instead of "http://example.org/web-stories/embed-controller-test-story/".
 		// @todo Investigate why this is  needed (leakage between tests?).
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
+		$story_post_type = new Story_Post_Type();
 		$story_post_type->register();
 
 		flush_rewrite_rules( false );
diff --git a/tests/phpunit/integration/tests/REST_API/Hotlinking_Controller.php b/tests/phpunit/integration/tests/REST_API/Hotlinking_Controller.php
index a4c2ec23bd87..fbbbb8b6c34a 100644
--- a/tests/phpunit/integration/tests/REST_API/Hotlinking_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Hotlinking_Controller.php
@@ -51,6 +51,13 @@ class Hotlinking_Controller extends Test_REST_TestCase {
 	 */
 	protected $request_count = 0;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Hotlinking_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$subscriber = $factory->user->create(
 			[
@@ -82,6 +89,8 @@ public function setUp() {
 
 		$this->request_count = 0;
 
+		$this->controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
+
 		$this->add_caps_to_roles();
 	}
 
@@ -156,9 +165,11 @@ public function mock_http_request( $preempt, $r, $url ) {
 	}
 
 	/**
-	 * @covers ::register_routes
+	 * @covers ::register
 	 */
-	public function test_register_routes() {
+	public function test_register() {
+		$this->controller->register();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( self::REST_URL, $routes );
@@ -169,8 +180,7 @@ public function test_register_routes() {
 	 * @covers ::validate_url
 	 */
 	public function test_validate_url() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$result     = $controller->validate_url( self::URL_VALID );
+		$result = $this->controller->validate_url( self::URL_VALID );
 		$this->assertTrue( $result );
 	}
 
@@ -178,8 +188,7 @@ public function test_validate_url() {
 	 * @covers ::validate_url
 	 */
 	public function test_validate_url_empty() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$result     = $controller->validate_url( '' );
+		$result = $this->controller->validate_url( '' );
 		$this->assertErrorResponse( 'rest_invalid_url', $result, 400 );
 	}
 
@@ -187,8 +196,7 @@ public function test_validate_url_empty() {
 	 * @covers ::validate_url
 	 */
 	public function test_validate_url_domain() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$result     = $controller->validate_url( self::URL_DOMAIN );
+		$result = $this->controller->validate_url( self::URL_DOMAIN );
 		$this->assertErrorResponse( 'rest_invalid_url_path', $result, 400 );
 	}
 
@@ -196,8 +204,7 @@ public function test_validate_url_domain() {
 	 * @covers ::validate_url
 	 */
 	public function test_validate_url_path() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$result     = $controller->validate_url( self::URL_PATH );
+		$result = $this->controller->validate_url( self::URL_PATH );
 		$this->assertErrorResponse( 'rest_invalid_url', $result, 400 );
 	}
 
@@ -205,8 +212,7 @@ public function test_validate_url_path() {
 	 * @covers ::validate_url
 	 */
 	public function test_validate_url_invalid() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$result     = $controller->validate_url( '-1' );
+		$result = $this->controller->validate_url( '-1' );
 		$this->assertErrorResponse( 'rest_invalid_url', $result, 400 );
 	}
 
@@ -214,8 +220,7 @@ public function test_validate_url_invalid() {
 	 * @covers ::validate_url
 	 */
 	public function test_validate_url_invalid2() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$result     = $controller->validate_url( 'wibble' );
+		$result = $this->controller->validate_url( 'wibble' );
 		$this->assertErrorResponse( 'rest_invalid_url', $result, 400 );
 	}
 
@@ -223,8 +228,7 @@ public function test_validate_url_invalid2() {
 	 * @covers ::get_item_schema
 	 */
 	public function test_get_item_schema() {
-		$controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
-		$data       = $controller->get_item_schema();
+		$data = $this->controller->get_item_schema();
 
 		$properties = $data['properties'];
 		$this->assertArrayHasKey( 'ext', $properties );
@@ -241,6 +245,8 @@ public function test_get_item_schema() {
 	 * @covers ::parse_url_permissions_check
 	 */
 	public function test_parse_url_without_permission() {
+		$this->controller->register();
+
 		// Test without a login.
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_VALID );
@@ -260,6 +266,8 @@ public function test_parse_url_without_permission() {
 	}
 
 	public function test_url_invalid_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_INVALID );
@@ -276,6 +284,8 @@ public function test_url_invalid_url() {
 	 * @covers ::parse_url_permissions_check
 	 */
 	public function test_parse_url_empty_string() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', '' );
@@ -292,6 +302,8 @@ public function test_parse_url_empty_string() {
 	 * @covers ::parse_url_permissions_check
 	 */
 	public function test_parse_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_VALID );
@@ -314,6 +326,8 @@ public function test_parse_url() {
 	 * @covers ::parse_url_permissions_check
 	 */
 	public function test_parse_url_cache() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_VALID );
@@ -350,6 +364,8 @@ public function test_parse_url_cache() {
 	 * @covers ::parse_url_permissions_check
 	 */
 	public function test_parse_url_404() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_404 );
@@ -362,6 +378,8 @@ public function test_parse_url_404() {
 	 * @covers ::parse_url_permissions_check
 	 */
 	public function test_parse_url_500() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_500 );
@@ -376,6 +394,8 @@ public function test_parse_url_500() {
 	 * @covers ::prepare_item_for_response
 	 */
 	public function test_parse_url_svg() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, self::REST_URL );
 		$request->set_param( 'url', self::URL_SVG );
diff --git a/tests/phpunit/integration/tests/REST_API/Link_Controller.php b/tests/phpunit/integration/tests/REST_API/Link_Controller.php
index c7957d1271b6..99c4abae1098 100644
--- a/tests/phpunit/integration/tests/REST_API/Link_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Link_Controller.php
@@ -39,6 +39,13 @@ class Link_Controller extends Test_REST_TestCase {
 	 */
 	protected $request_count = 0;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Link_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$subscriber = $factory->user->create(
 			[
@@ -51,32 +58,34 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'user_email' => 'editor@example.com',
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$subscriber );
 		self::delete_user( self::$editor );
-
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
 		$this->request_count = 0;
 
+		$this->controller = new \Google\Web_Stories\REST_API\Link_Controller();
+
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
 
 		$this->remove_caps_from_roles();
@@ -150,7 +159,12 @@ public function mock_http_request( $preempt, $r, $url ) {
 		return $preempt;
 	}
 
-	public function test_register_routes() {
+	/**
+	 * @covers ::register
+	 */
+	public function test_register() {
+		$this->controller->register();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/link', $routes );
@@ -163,14 +177,24 @@ public function test_register_routes() {
 		$this->assertArrayHasKey( 'args', $route[0] );
 	}
 
-	public function test_without_permission() {
-		// Test without a login.
+	/**
+	 * @covers ::parse_link_permissions_check
+	 */
+	public function test_no_user() {
+		$this->controller->register();
+
 		$request  = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$response = rest_get_server()->dispatch( $request );
 
 		$this->assertEquals( 400, $response->get_status() );
+	}
+
+	/**
+	 * @covers ::parse_link_permissions_check
+	 */
+	public function test_without_permission() {
+		$this->controller->register();
 
-		// Test with a user that does not have edit_posts capability.
 		wp_set_current_user( self::$subscriber );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_VALID );
@@ -181,7 +205,12 @@ public function test_without_permission() {
 		$this->assertEquals( $data['code'], 'rest_forbidden' );
 	}
 
+	/**
+	 * @covers ::parse_link
+	 */
 	public function test_url_invalid_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_INVALID );
@@ -192,6 +221,8 @@ public function test_url_invalid_url() {
 	}
 
 	public function test_url_returning_500() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_500 );
@@ -201,6 +232,8 @@ public function test_url_returning_500() {
 	}
 
 	public function test_url_returning_404() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_404 );
@@ -219,6 +252,8 @@ public function test_url_returning_404() {
 	}
 
 	public function test_url_empty_string() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', '' );
@@ -229,6 +264,8 @@ public function test_url_empty_string() {
 	}
 
 	public function test_empty_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_EMPTY_DOCUMENT );
@@ -250,6 +287,8 @@ public function test_empty_url() {
 	}
 
 	public function test_characters_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_CHARACTERS );
@@ -271,6 +310,8 @@ public function test_characters_url() {
 	}
 
 	public function test_example_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_VALID_TITLE_ONLY );
@@ -292,6 +333,8 @@ public function test_example_url() {
 	}
 
 	public function test_valid_url() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_VALID );
@@ -313,6 +356,8 @@ public function test_valid_url() {
 	}
 
 	public function test_removes_trailing_slashes() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/link' );
 		$request->set_param( 'url', self::URL_VALID_TITLE_ONLY );
diff --git a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
index d01fc4c5c404..b81e9d375a69 100644
--- a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
-use Google\Web_Stories\Settings;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Spy_REST_Server;
 use WP_REST_Request;
@@ -145,8 +144,6 @@ public function setUp() {
 	public function tearDown() {
 		$this->remove_caps_from_roles();
 
-		$this->set_permalink_structure( '' );
-
 		parent::tearDown();
 	}
 
diff --git a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
index ced2501c8bb4..d52e894baa10 100644
--- a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
+use Google\Web_Stories\Decoder;
 use Spy_REST_Server;
 use WP_REST_Request;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
@@ -44,6 +45,13 @@ class Status_Check_Controller extends Test_REST_TestCase {
 	 */
 	protected $request_count = 0;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Status_Check_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$subscriber = $factory->user->create(
 			[
@@ -56,20 +64,11 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'user_email' => 'editor@example.com',
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$subscriber );
 		self::delete_user( self::$editor );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
@@ -77,19 +76,32 @@ public function setUp() {
 
 		$this->request_count = 0;
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new \Google\Web_Stories\REST_API\Status_Check_Controller( new Decoder() );
+
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
 	}
 
 	/**
-	 * @covers ::register_routes
+	 * @covers ::register
 	 */
-	public function test_register_routes() {
+	public function test_register() {
+		$this->controller->register();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/status-check', $routes );
@@ -102,15 +114,23 @@ public function test_register_routes() {
 	 * @covers ::status_check_permissions_check
 	 * @covers ::status_check
 	 */
-	public function test_without_permission() {
-		// Test without a login.
+	public function test_no_user() {
+		$this->controller->register();
+
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/status-check' );
 		$request->set_param( 'content', '<a href="#">Test</a>' );
 		$response = rest_get_server()->dispatch( $request );
 
 		$this->assertErrorResponse( 'rest_forbidden', $response, 401 );
+	}
+
+	/**
+	 * @covers ::status_check_permissions_check
+	 * @covers ::status_check
+	 */
+	public function test_without_permission() {
+		$this->controller->register();
 
-		// Test with a user that does not have edit_posts capability.
 		wp_set_current_user( self::$subscriber );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/status-check' );
 		$request->set_param( 'content', '<a href="#">Test</a>' );
@@ -124,6 +144,8 @@ public function test_without_permission() {
 	 * @covers ::status_check
 	 */
 	public function test_status_check() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/status-check' );
 		$request->set_param( 'content', '<a href="#">Test</a>' );
diff --git a/tests/phpunit/integration/tests/REST_API/Autosaves_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
similarity index 88%
rename from tests/phpunit/integration/tests/REST_API/Autosaves_Controller.php
rename to tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
index d1ede53f8221..ea5a35eec425 100644
--- a/tests/phpunit/integration/tests/REST_API/Autosaves_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
+use Google\Web_Stories\REST_API\Stories_Autosaves_Controller as Controller;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Spy_REST_Server;
@@ -27,47 +28,62 @@
  *
  * @package Google\Web_Stories\Tests\REST_API
  *
- * @coversDefaultClass \Google\Web_Stories\REST_API\Autosaves_Controller
+ * @coversDefaultClass Controller
  */
-class Autosaves_Controller extends Test_REST_TestCase {
-	protected $server;
+class Stories_Autosaves_Controller extends Test_REST_TestCase {
 
+	/**
+	 * Author user ID.
+	 *
+	 * @var int
+	 */
 	protected static $author_id;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$author_id = $factory->user->create(
 			[
 				'role' => 'author',
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$author_id );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new Controller();
+
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
 	}
 
 	public function test_create_item_as_author_should_not_strip_markup() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 
 		$this->kses_int();
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
index 85b2f422c3d7..2a565a55b1e4 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
-use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Google\Web_Stories\Tests\Integration\Fixture\DummyTaxonomy;
@@ -42,6 +41,13 @@ class Stories_Controller extends Test_REST_TestCase {
 	protected static $author_id;
 	protected static $contributor_id;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Stories_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$user_id = $factory->user->create(
 			[
@@ -125,11 +131,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'post_type'   => $post_type,
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
@@ -138,24 +139,29 @@ public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user3_id );
 		self::delete_user( self::$author_id );
 		self::delete_user( self::$contributor_id );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Controller( Story_Post_Type::POST_TYPE_SLUG );
+
 		$this->add_caps_to_roles();
 
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	public function tearDown() {
-		$this->remove_caps_from_roles();
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 
-		$this->set_permalink_structure( '' );
+		$this->remove_caps_from_roles();
 
 		$this->kses_remove_filters();
 
@@ -176,6 +182,8 @@ public function test_register_routes() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story' );
 		$request->set_param( 'status', [ 'draft' ] );
@@ -206,7 +214,9 @@ public function test_get_items() {
 	/**
 	 * @covers ::get_items
 	 */
-	public function test_get_items_no_perm() {
+	public function test_get_items_no_permission() {
+		$this->controller->register_routes();
+
 		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story' );
 		$response = rest_get_server()->dispatch( $request );
 		$headers  = $response->get_headers();
@@ -219,6 +229,8 @@ public function test_get_items_no_perm() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items_contributor() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$contributor_id );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story' );
 		$request->set_param( 'context', 'edit' );
@@ -249,6 +261,8 @@ public function test_get_items_contributor() {
 	 * @covers ::prepare_item_for_response
 	 */
 	public function test_get_item() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$story   = self::factory()->post->create(
 			[
@@ -276,6 +290,8 @@ public function test_get_item() {
 	 * @covers ::prepare_item_for_response
 	 */
 	public function test_get_item_no_user() {
+		$this->controller->register_routes();
+
 		$story = self::factory()->post->create(
 			[
 				'post_type'   => \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
@@ -298,6 +314,8 @@ public function test_get_item_no_user() {
 	 * @covers ::prepare_item_for_response
 	 */
 	public function test_get_item_future() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$future_date = strtotime( '+1 day' );
 		$story       = self::factory()->post->create(
@@ -328,6 +346,8 @@ public function test_get_item_future() {
 	 * @covers \Google\Web_Stories\REST_API\Stories_Base_Controller::prepare_links
 	 */
 	public function test_get_item_lock() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$future_date = strtotime( '+1 day' );
 		$story       = self::factory()->post->create(
@@ -353,6 +373,8 @@ public function test_get_item_lock() {
 	 * @covers \Google\Web_Stories\REST_API\Stories_Base_Controller::get_available_actions
 	 */
 	public function test_get_available_actions() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$future_date = strtotime( '+1 day' );
 		$story       = self::factory()->post->create(
@@ -378,6 +400,8 @@ public function test_get_available_actions() {
 	 * @covers \Google\Web_Stories\REST_API\Stories_Base_Controller::add_taxonomy_links
 	 */
 	public function test_get_add_taxonomy_links() {
+		$this->controller->register_routes();
+
 		$object = new DummyTaxonomy();
 		$this->set_private_property( $object, 'taxonomy_post_type', \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 		$object->register_taxonomy();
@@ -406,6 +430,8 @@ public function test_get_add_taxonomy_links() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items_format() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story' );
 		$request->set_param( 'status', [ 'draft' ] );
@@ -436,22 +462,20 @@ public function test_get_items_format() {
 	 * @covers ::get_item_schema
 	 */
 	public function test_get_item_schema() {
-		$request  = new WP_REST_Request( 'OPTIONS', '/web-stories/v1/web-story' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
+		$this->controller->register_routes();
 
-		$this->assertNotEmpty( $data );
+		$data = $this->controller->get_item_schema();
 
-		$this->assertArrayHasKey( 'schema', $data );
-		$this->assertArrayHasKey( 'properties', $data['schema'] );
-		$properties = $data['schema']['properties'];
-		$this->assertArrayHasKey( 'story_data', $properties );
+		$this->assertArrayHasKey( 'properties', $data );
+		$this->assertArrayHasKey( 'story_data', $data['properties'] );
 	}
 
 	/**
 	 * @covers ::filter_posts_clauses
 	 */
 	public function test_filter_posts_by_author_display_names() {
+		$this->controller->register_routes();
+
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story' );
 		$request->set_param( 'order', 'asc' );
 		$request->set_param( 'orderby', 'story_author' );
@@ -499,6 +523,8 @@ public function test_filter_posts_by_author_display_names() {
 	 * @covers ::filter_posts_clauses
 	 */
 	public function test_filter_posts_clauses_irrelevant_query() {
+		$this->controller->register_routes();
+
 		$controller = new \Google\Web_Stories\REST_API\Stories_Controller( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 
 		$initial_clauses = [
@@ -525,6 +551,8 @@ public function test_filter_posts_clauses_irrelevant_query() {
 	 * @covers ::get_collection_params
 	 */
 	public function test_get_collection_params() {
+		$this->controller->register_routes();
+
 		$controller = new \Google\Web_Stories\REST_API\Stories_Controller( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 
 		$collection_params = $controller->get_collection_params();
@@ -539,6 +567,8 @@ public function test_get_collection_params() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_as_author_should_not_strip_markup() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$author_id );
 
 		$this->kses_int();
@@ -564,6 +594,7 @@ public function test_create_item_as_author_should_not_strip_markup() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_duplicate_id() {
+		$this->controller->register_routes();
 
 		$unsanitized_content    = file_get_contents( WEB_STORIES_TEST_DATA_DIR . '/story_post_content.html' );
 		$unsanitized_story_data = wp_json_encode( [ 'pages' => [] ] );
@@ -612,6 +643,8 @@ public function test_create_item_duplicate_id() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_duplicate_id_invalid_id() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$user_id );
 		$this->kses_int();
 
@@ -630,6 +663,7 @@ public function test_create_item_duplicate_id_invalid_id() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_duplicate_id_permission() {
+		$this->controller->register_routes();
 
 		$unsanitized_content    = file_get_contents( WEB_STORIES_TEST_DATA_DIR . '/story_post_content.html' );
 		$unsanitized_story_data = wp_json_encode( [ 'pages' => [] ] );
@@ -667,6 +701,8 @@ public function test_create_item_duplicate_id_permission() {
 	 * @covers \Google\Web_Stories\REST_API\Stories_Base_Controller::update_item
 	 */
 	public function test_update_item_as_author_should_not_strip_markup() {
+		$this->controller->register_routes();
+
 		wp_set_current_user( self::$author_id );
 		$this->kses_int();
 
diff --git a/tests/phpunit/integration/tests/REST_API/Lock_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Lock_Controller.php
similarity index 92%
rename from tests/phpunit/integration/tests/REST_API/Lock_Controller.php
rename to tests/phpunit/integration/tests/REST_API/Stories_Lock_Controller.php
index fe07b20b652d..1eacbc9cb592 100644
--- a/tests/phpunit/integration/tests/REST_API/Lock_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Lock_Controller.php
@@ -26,15 +26,22 @@
  *
  * @package Google\Web_Stories\Tests\REST_API
  *
- * @coversDefaultClass \Google\Web_Stories\REST_API\Lock_Controller
+ * @coversDefaultClass \Google\Web_Stories\REST_API\Stories_Lock_Controller
  */
-class Lock_Controller extends Test_REST_TestCase {
+class Stories_Lock_Controller extends Test_REST_TestCase {
 	protected $server;
 
 	protected static $author_id;
 	protected static $subscriber;
 	protected static $editor;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Stories_Lock_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$subscriber = $factory->user->create(
 			[
@@ -52,38 +59,42 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'user_email' => 'editor@example.com',
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$author_id );
 		self::delete_user( self::$subscriber );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Lock_Controller();
+
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
 	}
 
 	/**
-	 * @covers ::register_routes
+	 * @covers ::register
 	 */
-	public function test_register_routes() {
+	public function test_register() {
+		$this->controller->register();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/web-story/(?P<id>[\d]+)/lock', $routes );
@@ -96,6 +107,8 @@ public function test_register_routes() {
 	 * @covers ::get_item_permissions_check
 	 */
 	public function test_get_item() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 		$story    = self::factory()->post->create(
 			[
@@ -117,6 +130,8 @@ public function test_get_item() {
 	 * @covers ::get_item_permissions_check
 	 */
 	public function test_get_item_no_story() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 
 		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story/99999/lock' );
@@ -130,6 +145,8 @@ public function test_get_item_no_story() {
 	 * @covers ::get_item_permissions_check
 	 */
 	public function test_get_item_not_a_story() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 
 		$post_id = self::factory()->post->create(
@@ -149,6 +166,8 @@ public function test_get_item_not_a_story() {
 	 * @covers ::get_item_permissions_check
 	 */
 	public function test_get_item_no_perm() {
+		$this->controller->register();
+
 		$story    = self::factory()->post->create(
 			[
 				'post_type'   => \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
@@ -166,6 +185,8 @@ public function test_get_item_no_perm() {
 	 * @covers ::get_item_permissions_check
 	 */
 	public function test_get_item_wrong_perm() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$subscriber );
 		$story    = self::factory()->post->create(
 			[
@@ -186,6 +207,8 @@ public function test_get_item_wrong_perm() {
 	 * @covers ::get_item_permissions_check
 	 */
 	public function test_get_item_with_lock() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 		$story    = self::factory()->post->create(
 			[
@@ -213,6 +236,8 @@ public function test_get_item_with_lock() {
 	 * @covers ::update_item_permissions_check
 	 */
 	public function test_update_item() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 		$story = self::factory()->post->create(
 			[
@@ -235,6 +260,8 @@ public function test_update_item() {
 	 * @covers ::delete_item_permissions_check
 	 */
 	public function test_delete_item() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 		$story = self::factory()->post->create(
 			[
@@ -261,6 +288,8 @@ public function test_delete_item() {
 	 * @covers ::delete_item_permissions_check
 	 */
 	public function test_delete_item_with_lock() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 		$story    = self::factory()->post->create(
 			[
@@ -289,6 +318,8 @@ public function test_delete_item_with_lock() {
 	 * @covers ::delete_item_permissions_check
 	 */
 	public function test_delete_item_with_lock_another_user() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 		$story    = self::factory()->post->create(
 			[
@@ -310,6 +341,8 @@ public function test_delete_item_with_lock_another_user() {
 	 * @covers ::get_lock
 	 */
 	public function test_get_lock() {
+		$this->controller->register();
+
 		$controller = new \Google\Web_Stories\REST_API\Stories_Lock_Controller();
 		$story      = self::factory()->post->create(
 			[
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
index b4433c63e54a..86ef59b9ab52 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
@@ -34,6 +34,13 @@ class Stories_Media_Controller extends Test_REST_TestCase {
 	 */
 	protected static $user_id;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Stories_Media_Controller
+	 */
+	private $controller;
+
 	/**
 	 * @param $factory
 	 */
@@ -71,29 +78,30 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'display_name' => 'Andrea Adams',
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user_id );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Media_Controller();
+
 		$this->add_caps_to_roles();
 	}
 
 	public function tearDown() {
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		$this->remove_caps_from_roles();
 
 		parent::tearDown();
@@ -103,6 +111,8 @@ public function tearDown() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items_format() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$user_id );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/media' );
 		$request->set_param( 'context', 'edit' );
@@ -121,6 +131,8 @@ public function test_get_items_format() {
 	 * @covers ::prepare_items_query
 	 */
 	public function test_get_items_filter_mime() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$user_id );
 		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/media' );
 		$response = rest_get_server()->dispatch( $request );
@@ -138,6 +150,8 @@ public function test_get_items_filter_mime() {
 	 * @covers ::get_media_types
 	 */
 	public function test_get_items_filter_video() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$user_id );
 		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/media' );
 		$request->set_param( 'media_type', 'video' );
@@ -155,6 +169,8 @@ public function test_get_items_filter_video() {
 	 * @covers ::process_post
 	 */
 	public function test_create_item() {
+		$this->controller->register();
+
 		$poster_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/images/canola.jpg',
@@ -191,6 +207,8 @@ public function test_create_item() {
 	 * @covers ::process_post
 	 */
 	public function test_create_item_with_revision() {
+		$this->controller->register();
+
 		$revision_id = self::factory()->post->create_object(
 			[
 				'post_type'   => 'revision',
@@ -218,6 +236,8 @@ public function test_create_item_with_revision() {
 	 * @covers ::process_post
 	 */
 	public function test_create_item_migrate_data() {
+		$this->controller->register();
+
 		$original_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/uploads/test-video.mp4',
@@ -260,6 +280,8 @@ public function test_create_item_migrate_data() {
 	 * @covers ::process_post
 	 */
 	public function test_create_item_migrate_data_invalid() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$user_id );
 
 		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/web-stories/v1/media' );
@@ -281,6 +303,8 @@ public function test_create_item_migrate_data_invalid() {
 	 * @covers ::get_item_schema
 	 */
 	public function test_get_item_schema() {
+		$this->controller->register();
+
 		$request  = new WP_REST_Request( 'OPTIONS', '/web-stories/v1/media' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
index 9549243d2a7b..78253c5d50f1 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
@@ -4,6 +4,7 @@
 
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Google\Web_Stories\Tests\Integration\Fixture\DummyTaxonomy;
+use Spy_REST_Server;
 use WP_REST_Request;
 use WP_REST_Server;
 /**
@@ -16,6 +17,13 @@
 class Stories_Taxonomies_Controller extends Test_REST_TestCase {
 	protected static $taxonomy_object;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Stories_Taxonomies_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$taxonomy_object = new DummyTaxonomy();
 		self::$taxonomy_object->register_taxonomy();
@@ -25,10 +33,31 @@ public static function wpTearDownAfterClass() {
 		self::$taxonomy_object->unregister_taxonomy();
 	}
 
+	public function setUp() {
+		parent::setUp();
+
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Taxonomies_Controller();
+	}
+
+	public function tearDown() {
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
+		parent::tearDown();
+	}
+
 	/**
 	 * @covers ::prepare_item_for_response
 	 */
 	public function test_prepare_item_for_response() {
+		$this->controller->register();
+
 		$slug     = $this->get_private_property( self::$taxonomy_object, 'taxonomy_slug' );
 		$request  = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/taxonomies/' . $slug );
 		$response = rest_get_server()->dispatch( $request );
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
index e24608c5f37b..6527d21ee4e6 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
@@ -17,10 +17,8 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
-use Google\Web_Stories\Settings;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Spy_REST_Server;
-use WP_REST_Request;
 
 /**
  * Class Stories_Users_Controller
@@ -35,6 +33,13 @@ class Stories_Users_Controller extends Test_REST_TestCase {
 
 	protected static $user_id;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Stories_Users_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$user_id = $factory->user->create(
 			[
@@ -53,41 +58,43 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'post_type'   => $post_type,
 			]
 		);
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
 	public static function wpTearDownAfterClass() {
 		self::delete_user( self::$user_id );
-
-		/** @var \WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
 	}
 
 	public function setUp() {
 		parent::setUp();
 
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Users_Controller();
+
 		$this->add_caps_to_roles();
 
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	public function tearDown() {
-		$this->remove_caps_from_roles();
+		/** @var \WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
 
-		$this->set_permalink_structure( '' );
+		$this->remove_caps_from_roles();
 
 		parent::tearDown();
 	}
 
 	/**
-	 * @covers ::register_routes
+	 * @covers ::register
 	 */
-	public function test_register_routes() {
+	public function test_register() {
+		$this->controller->register();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/users', $routes );
@@ -99,11 +106,13 @@ public function test_register_routes() {
 	 * @covers \Google\Web_Stories\Story_Post_Type::clear_user_posts_count
 	 */
 	public function test_count_user_posts() {
-		$controller = new \Google\Web_Stories\REST_API\Stories_Users_Controller();
-		$post_type  = new \Google\Web_Stories\Story_Post_Type();
+		$this->controller->register();
+
+		$post_type = new \Google\Web_Stories\Story_Post_Type();
 		$post_type->register();
+
 		$result1 = $this->call_private_method(
-			$controller,
+			$this->controller,
 			'user_posts_count_public',
 			[
 				self::$user_id,
@@ -120,7 +129,7 @@ public function test_count_user_posts() {
 			]
 		);
 		$result2 = $this->call_private_method(
-			$controller,
+			$this->controller,
 			'user_posts_count_public',
 			[
 				self::$user_id,
@@ -133,7 +142,7 @@ public function test_count_user_posts() {
 		wp_delete_post( $post_id, true );
 
 		$result3 = $this->call_private_method(
-			$controller,
+			$this->controller,
 			'user_posts_count_public',
 			[
 				self::$user_id,
@@ -149,6 +158,8 @@ public function test_count_user_posts() {
 	 * @covers \Google\Web_Stories\Story_Post_Type::clear_user_posts_count
 	 */
 	public function test_count_user_posts_invalid() {
+		$this->controller->register();
+
 		$controller = new \Google\Web_Stories\REST_API\Stories_Users_Controller();
 		$post_type  = new \Google\Web_Stories\Story_Post_Type();
 		$post_type->register();
diff --git a/tests/phpunit/integration/tests/Renderer/Archives.php b/tests/phpunit/integration/tests/Renderer/Archives.php
index 61f4e93f2a92..d54d7c73427c 100644
--- a/tests/phpunit/integration/tests/Renderer/Archives.php
+++ b/tests/phpunit/integration/tests/Renderer/Archives.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Renderer;
 
-use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
diff --git a/tests/phpunit/integration/tests/Renderer/Feed.php b/tests/phpunit/integration/tests/Renderer/Feed.php
index 9e36aa96121d..4cd2cb41f310 100644
--- a/tests/phpunit/integration/tests/Renderer/Feed.php
+++ b/tests/phpunit/integration/tests/Renderer/Feed.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Renderer;
 
-use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
diff --git a/tests/phpunit/integration/tests/Renderer/Oembed.php b/tests/phpunit/integration/tests/Renderer/Oembed.php
index ffcd9605c6a8..74c520efca96 100644
--- a/tests/phpunit/integration/tests/Renderer/Oembed.php
+++ b/tests/phpunit/integration/tests/Renderer/Oembed.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Renderer;
 
-use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
diff --git a/tests/phpunit/integration/tests/Renderer/Single.php b/tests/phpunit/integration/tests/Renderer/Single.php
index a934a430e3d7..83ffe2210d3e 100644
--- a/tests/phpunit/integration/tests/Renderer/Single.php
+++ b/tests/phpunit/integration/tests/Renderer/Single.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Renderer;
 
-use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
diff --git a/tests/phpunit/integration/tests/Renderer/Stories/Generic_Renderer.php b/tests/phpunit/integration/tests/Renderer/Stories/Generic_Renderer.php
index 217f541d925b..563faf9c0068 100644
--- a/tests/phpunit/integration/tests/Renderer/Stories/Generic_Renderer.php
+++ b/tests/phpunit/integration/tests/Renderer/Stories/Generic_Renderer.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Renderer\Stories;
 
-use Google\Web_Stories\Assets;
 use Google\Web_Stories\Model\Story;
 use Google\Web_Stories\AMP_Story_Player_Assets;
 use Google\Web_Stories\Story_Query;
diff --git a/tests/phpunit/integration/tests/Renderer/Story/HTML.php b/tests/phpunit/integration/tests/Renderer/Story/HTML.php
index 31390f8c79e7..b8f51f51b599 100644
--- a/tests/phpunit/integration/tests/Renderer/Story/HTML.php
+++ b/tests/phpunit/integration/tests/Renderer/Story/HTML.php
@@ -17,9 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\Renderer\Story;
 
-use Google\Web_Stories\Experiments;
 use Google\Web_Stories\Model\Story;
-use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\TestCase;
 use WP_Post;
diff --git a/tests/phpunit/integration/tests/Tracking.php b/tests/phpunit/integration/tests/Tracking.php
index c11fdd9bcf53..000e0afb59eb 100644
--- a/tests/phpunit/integration/tests/Tracking.php
+++ b/tests/phpunit/integration/tests/Tracking.php
@@ -17,9 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration;
 
-use Spy_REST_Server;
-use WP_REST_Request;
-
 /**
  * @coversDefaultClass \Google\Web_Stories\Tracking
  */
diff --git a/tests/phpunit/integration/tests/User/Preferences.php b/tests/phpunit/integration/tests/User/Preferences.php
index e0edd3b410cd..50837f126235 100644
--- a/tests/phpunit/integration/tests/User/Preferences.php
+++ b/tests/phpunit/integration/tests/User/Preferences.php
@@ -17,8 +17,11 @@
 
 namespace Google\Web_Stories\Tests\Integration\User;
 
+use Google\Web_Stories\REST_API\Stories_Users_Controller;
 use Google\Web_Stories\Tests\Integration\TestCase;
+use Spy_REST_Server;
 use WP_REST_Request;
+use WP_REST_Server;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\User\Preferences
@@ -38,6 +41,11 @@ class Preferences extends TestCase {
 	 */
 	protected static $author_id;
 
+	/**
+	 * @var \Google\Web_Stories\User\Preferences
+	 */
+	private $instance;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$admin_id = $factory->user->create(
 			[
@@ -58,15 +66,25 @@ public static function wpTearDownAfterClass() {
 	}
 
 	public function setUp() {
-		$up = new \Google\Web_Stories\User\Preferences();
-		$up->register();
 		parent::setUp();
+
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+
+		$this->instance = new \Google\Web_Stories\User\Preferences();
 	}
 
 	public function tearDown() {
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
 		unregister_meta_key( 'user', \Google\Web_Stories\User\Preferences::OPTIN_META_KEY );
 		unregister_meta_key( 'user', \Google\Web_Stories\User\Preferences::ONBOARDING_META_KEY );
 		unregister_meta_key( 'user', \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+
 		parent::tearDown();
 	}
 
@@ -75,6 +93,9 @@ public function tearDown() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_add_optin_field_to_rest_api() {
+		$this->instance->register();
+		( new Stories_Users_Controller() )->register();
+
 		wp_set_current_user( self::$admin_id );
 
 		add_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, true );
@@ -98,6 +119,9 @@ public function test_add_optin_field_to_rest_api() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_add_optin_field_to_rest_api_for_author_user() {
+		$this->instance->register();
+		( new Stories_Users_Controller() )->register();
+
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, true );
@@ -121,6 +145,9 @@ public function test_add_optin_field_to_rest_api_for_author_user() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_enables_author_user_to_update_meta_field() {
+		$this->instance->register();
+		( new Stories_Users_Controller() )->register();
+
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, false );
@@ -156,6 +183,9 @@ public function test_enables_author_user_to_update_meta_field() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_permission_check_for_authors() {
+		$this->instance->register();
+		( new Stories_Users_Controller() )->register();
+
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, false );
@@ -183,7 +213,6 @@ public function test_permission_check_for_authors() {
 		$data = $response->get_error_data();
 		$this->assertArrayHasKey( 'status', $data );
 		$this->assertEquals( 403, $data['status'] );
-
 	}
 
 	/**
@@ -191,6 +220,9 @@ public function test_permission_check_for_authors() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_enables_author_user_to_invalid_type() {
+		$this->instance->register();
+		( new Stories_Users_Controller() )->register();
+
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, false );
@@ -208,7 +240,7 @@ public function test_enables_author_user_to_invalid_type() {
 		);
 
 		$response = rest_get_server()->dispatch( $request );
-		if ( is_a( $response, 'WP_REST_Response' ) ) {
+		if ( $response instanceof \WP_REST_Response ) {
 			$response = $response->as_error();
 		}
 

From 2e069894cad7a302bc5dfb8d8424a12a31df6926 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 23 Sep 2021 00:32:24 +0200
Subject: [PATCH 16/41] Implement `HasRequirements`

---
 includes/Admin/Cross_Origin_Isolation.php | 3 ++-
 includes/Tracking.php                     | 3 ++-
 includes/User/Capabilities.php            | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/includes/Admin/Cross_Origin_Isolation.php b/includes/Admin/Cross_Origin_Isolation.php
index f648dff81b37..7a731894b3a5 100644
--- a/includes/Admin/Cross_Origin_Isolation.php
+++ b/includes/Admin/Cross_Origin_Isolation.php
@@ -29,6 +29,7 @@
 namespace Google\Web_Stories\Admin;
 
 use Google\Web_Stories\Infrastructure\Conditional;
+use Google\Web_Stories\Infrastructure\HasRequirements;
 use Google\Web_Stories\Service_Base;
 use Google\Web_Stories\Services;
 use Google\Web_Stories\Traits\Screen;
@@ -39,7 +40,7 @@
  *
  * @package Google\Web_Stories
  */
-class Cross_Origin_Isolation extends Service_Base implements Conditional {
+class Cross_Origin_Isolation extends Service_Base implements Conditional, HasRequirements {
 	use Screen;
 
 	/**
diff --git a/includes/Tracking.php b/includes/Tracking.php
index b4f7dbe4a4a3..5a6bdb737471 100644
--- a/includes/Tracking.php
+++ b/includes/Tracking.php
@@ -28,13 +28,14 @@
 
 namespace Google\Web_Stories;
 
+use Google\Web_Stories\Infrastructure\HasRequirements;
 use Google\Web_Stories\Integrations\Site_Kit;
 use Google\Web_Stories\User\Preferences;
 
 /**
  * Tracking class.
  */
-class Tracking extends Service_Base {
+class Tracking extends Service_Base implements HasRequirements {
 	/**
 	 * Web Stories tracking script handle.
 	 *
diff --git a/includes/User/Capabilities.php b/includes/User/Capabilities.php
index 5e963fdc1924..c9a307d23268 100644
--- a/includes/User/Capabilities.php
+++ b/includes/User/Capabilities.php
@@ -192,13 +192,4 @@ protected function get_all_capabilities(): array {
 
 		return $all_capabilities;
 	}
-
-	/**
-	 * Get the list of service IDs required for this service to be registered.
-	 *
-	 * @return string[] List of required services.
-	 */
-	public static function get_requirements(): array {
-		return [ 'story_post_type', 'taxonomy.category', 'taxonomy.tag' ];
-	}
 }

From 700d36d7f77f64ba4bf5d4e3c64ad0fa2a3e8d79 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 23 Sep 2021 11:11:56 +0200
Subject: [PATCH 17/41] Add requirement for KSES class

Story post type needs to be registered for it to work.
---
 includes/KSES.php             | 14 +++++++++++++-
 includes/Traits/Post_Type.php |  8 ++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/includes/KSES.php b/includes/KSES.php
index 2a688337c421..e358a8f2dbe5 100644
--- a/includes/KSES.php
+++ b/includes/KSES.php
@@ -26,6 +26,7 @@
 
 namespace Google\Web_Stories;
 
+use Google\Web_Stories\Infrastructure\HasRequirements;
 use Google\Web_Stories\Traits\Post_Type;
 
 /**
@@ -35,7 +36,7 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class KSES extends Service_Base {
+class KSES extends Service_Base implements HasRequirements {
 	use Post_Type;
 
 	/**
@@ -68,6 +69,17 @@ public static function get_registration_action_priority(): int {
 		return 11;
 	}
 
+	/**
+	 * Get the list of service IDs required for this service to be registered.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array {
+		return [ 'story_post_type' ];
+	}
+
 	/**
 	 * Filters slashed post data just before it is inserted into the database.
 	 *
diff --git a/includes/Traits/Post_Type.php b/includes/Traits/Post_Type.php
index 1061cfbc3dd5..a94ab4017e68 100644
--- a/includes/Traits/Post_Type.php
+++ b/includes/Traits/Post_Type.php
@@ -45,7 +45,7 @@ trait Post_Type {
 	 *
 	 * @return string Rest base.
 	 */
-	protected function get_post_type_rest_base( string $slug ) {
+	protected function get_post_type_rest_base( string $slug ): string {
 		$post_type_obj = get_post_type_object( $slug );
 		$rest_base     = $slug;
 		if ( $post_type_obj instanceof WP_Post_Type ) {
@@ -65,7 +65,7 @@ protected function get_post_type_rest_base( string $slug ) {
 	 *
 	 * @return bool
 	 */
-	protected function get_post_type_cap( string $slug, string $cap ) {
+	protected function get_post_type_cap( string $slug, string $cap ): bool {
 		$capability_name = $this->get_post_type_cap_name( $slug, $cap );
 		$capability      = false;
 		if ( $capability_name ) {
@@ -110,7 +110,7 @@ protected function get_post_type_cap_name( string $slug, string $cap ) {
 	 *
 	 * @return string
 	 */
-	protected function get_post_type_label( string $slug, string $label ) {
+	protected function get_post_type_label( string $slug, string $label ): string {
 		$post_type_obj = get_post_type_object( $slug );
 		$name          = '';
 
@@ -134,7 +134,7 @@ protected function get_post_type_label( string $slug, string $label ) {
 	 *
 	 * @return bool
 	 */
-	protected function get_post_type_has_archive( string $slug ) {
+	protected function get_post_type_has_archive( string $slug ): bool {
 		$post_type_obj = get_post_type_object( $slug );
 		if ( ! $post_type_obj instanceof WP_Post_Type ) {
 			return false;

From 1aede89409aa6c1025078648e638531ac00dc9f5 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 30 Sep 2021 17:54:38 +0200
Subject: [PATCH 18/41] Add missing call

---
 tests/phpunit/integration/tests/REST_API/Embed_Controller.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
index 55adc2884837..504586636593 100644
--- a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
@@ -160,9 +160,11 @@ public function mock_http_request( $preempt, $r, $url ): array {
 	}
 
 	/**
-	 * @covers ::register
+	 * @covers ::register_routes
 	 */
 	public function test_register_routes() {
+		$this->controller->register_routes();
+
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/embed', $routes );

From 3a6c1c39d16d38d4f44c545a9fbb3f9000c9800e Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 30 Sep 2021 20:04:07 +0200
Subject: [PATCH 19/41] More dependency injection

---
 includes/AMP/Sanitization.php                 |  22 ++-
 includes/AdSense.php                          |  26 +++-
 includes/Ad_Manager.php                       |  24 +++-
 includes/Admin/Customizer.php                 |  23 ++-
 includes/Analytics.php                        |  16 ++-
 includes/Experiments.php                      |  22 ++-
 includes/Integrations/AMP.php                 |  26 +++-
 .../Migrations/Update_Publisher_Logos.php     |  21 ++-
 includes/Story_Post_Type.php                  |  28 +++-
 includes/Tracking.php                         |  32 ++++-
 .../includes/DependencyInjectedTestCase.php   |   6 +-
 .../integration/tests/AMP/Output_Buffer.php   |   5 +-
 .../integration/tests/AMP/Sanitization.php    |  27 ++--
 tests/phpunit/integration/tests/AdSense.php   |  12 +-
 .../phpunit/integration/tests/Ad_Manager.php  |  10 +-
 .../integration/tests/Admin/Customizer.php    |  54 ++++---
 tests/phpunit/integration/tests/Analytics.php |  13 +-
 .../phpunit/integration/tests/Experiments.php | 133 +++++++++++-------
 .../integration/tests/Integrations/AMP.php    |  45 +++---
 .../tests/Integrations/New_Relic.php          |   5 +-
 .../Migrations/Update_Publisher_Logos.php     |  14 +-
 .../tests/Page_Template_Post_Type.php         |   7 +-
 .../tests/REST_API/Embed_Controller.php       |   5 +-
 .../REST_API/Stories_Users_Controller.php     |   5 +-
 .../integration/tests/Story_Post_Type.php     |  31 ++--
 tests/phpunit/integration/tests/Tracking.php  |  78 +++++++---
 26 files changed, 478 insertions(+), 212 deletions(-)

diff --git a/includes/AMP/Sanitization.php b/includes/AMP/Sanitization.php
index 635b392e4bf5..08759515791c 100644
--- a/includes/AMP/Sanitization.php
+++ b/includes/AMP/Sanitization.php
@@ -55,6 +55,26 @@
  * @see \AMP_Theme_Support
  */
 class Sanitization {
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Sanitizes a document.
 	 *
@@ -404,7 +424,7 @@ protected function get_sanitizers(): array {
 		$post = get_queried_object();
 
 		if ( $post instanceof \WP_Post && Story_Post_Type::POST_TYPE_SLUG === get_post_type( $post ) ) {
-			$video_cache_enabled = (bool) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
+			$video_cache_enabled = (bool) $this->settings->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
 
 			$story = new Story();
 			$story->load_from_post( $post );
diff --git a/includes/AdSense.php b/includes/AdSense.php
index fa9415708ad8..7aa6c0fdea88 100644
--- a/includes/AdSense.php
+++ b/includes/AdSense.php
@@ -30,6 +30,26 @@
  * Class AdSense
  */
 class AdSense extends Service_Base {
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Initializes all hooks.
 	 *
@@ -49,7 +69,7 @@ public function register() {
 	 * @return string Publisher ID.
 	 */
 	private function get_publisher_id(): string {
-		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
+		return (string) $this->settings->get_setting( Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
 	}
 
 	/**
@@ -60,7 +80,7 @@ private function get_publisher_id(): string {
 	 * @return string Slot ID.
 	 */
 	private function get_slot_id(): string {
-		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ADSENSE_SLOT_ID );
+		return (string) $this->settings->get_setting( Settings::SETTING_NAME_ADSENSE_SLOT_ID );
 	}
 
 	/**
@@ -71,7 +91,7 @@ private function get_slot_id(): string {
 	 * @return bool
 	 */
 	private function is_enabled(): bool {
-		return ( 'adsense' === (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'adsense' === (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
diff --git a/includes/Ad_Manager.php b/includes/Ad_Manager.php
index b6c2bc6f6d06..c5ff2b83e99f 100644
--- a/includes/Ad_Manager.php
+++ b/includes/Ad_Manager.php
@@ -30,6 +30,26 @@
  * Class Ad_Manager
  */
 class Ad_Manager extends Service_Base {
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Initializes all hooks.
 	 *
@@ -49,7 +69,7 @@ public function register() {
 	 * @return string Slot ID.
 	 */
 	private function get_slot_id(): string {
-		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
+		return (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
 	}
 
 	/**
@@ -60,7 +80,7 @@ private function get_slot_id(): string {
 	 * @return bool
 	 */
 	private function is_enabled(): bool {
-		return ( 'admanager' === (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'admanager' === (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
diff --git a/includes/Admin/Customizer.php b/includes/Admin/Customizer.php
index 7f34e95cc6d9..c17b4e59a049 100644
--- a/includes/Admin/Customizer.php
+++ b/includes/Admin/Customizer.php
@@ -27,6 +27,7 @@
 namespace Google\Web_Stories\Admin;
 
 use Google\Web_Stories\Services;
+use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Query;
 use Google\Web_Stories\Service_Base;
 use Google\Web_Stories\Traits\Layout;
@@ -72,6 +73,26 @@ class Customizer extends Service_Base {
 	 */
 	private $wp_customize;
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Initializes the customizer logic.
 	 *
@@ -537,7 +558,7 @@ public function validate_number_of_columns( $validity, $value ) {
 	 * @return string
 	 */
 	public function render_stories(): string {
-		$options = Services::get( 'settings' )->get_setting( self::STORY_OPTION );
+		$options = $this->settings->get_setting( self::STORY_OPTION );
 
 		if ( empty( $options['show_stories'] ) || true !== $options['show_stories'] ) {
 			return '';
diff --git a/includes/Analytics.php b/includes/Analytics.php
index d9fc4c67a3c1..e401247073fd 100644
--- a/includes/Analytics.php
+++ b/includes/Analytics.php
@@ -30,6 +30,13 @@
  * Class Analytics
  */
 class Analytics extends Service_Base {
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
 	/**
 	 * Experiments instance.
 	 *
@@ -42,13 +49,16 @@ class Analytics extends Service_Base {
 	 *
 	 * @since 1.12.0
 	 *
+	 * @param Settings    $settings Settings instance.
 	 * @param Experiments $experiments Experiments instance.
 	 *
 	 * @return void
 	 */
-	public function __construct( Experiments $experiments ) {
+	public function __construct( Settings $settings, Experiments $experiments ) {
+		$this->settings    = $settings;
 		$this->experiments = $experiments;
 	}
+
 	/**
 	 * Initializes all hooks.
 	 *
@@ -68,7 +78,7 @@ public function register() {
 	 * @return string Tracking ID.
 	 */
 	public function get_tracking_id(): string {
-		return (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_TRACKING_ID );
+		return (string) $this->settings->get_setting( Settings::SETTING_NAME_TRACKING_ID );
 	}
 
 	/**
@@ -229,7 +239,7 @@ public function print_analytics_tag() {
 		}
 
 		if (
-			(bool) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) ||
+			(bool) $this->settings->get_setting( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) ||
 			! $this->experiments->is_experiment_enabled( 'enableAutoAnalyticsMigration' )
 		) {
 			$this->print_amp_analytics_tag( $tracking_id );
diff --git a/includes/Experiments.php b/includes/Experiments.php
index 10ba9d335171..610427613b62 100644
--- a/includes/Experiments.php
+++ b/includes/Experiments.php
@@ -46,6 +46,26 @@ class Experiments extends Service_Base {
 	 */
 	private $hook_suffix;
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Initializes experiments
 	 *
@@ -439,7 +459,7 @@ public function is_experiment_enabled( string $name ): bool {
 			return (bool) $experiment['default'];
 		}
 
-		$experiments = Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_EXPERIMENTS, [] );
+		$experiments = $this->settings->get_setting( Settings::SETTING_NAME_EXPERIMENTS, [] );
 		return ! empty( $experiments[ $name ] );
 	}
 
diff --git a/includes/Integrations/AMP.php b/includes/Integrations/AMP.php
index 1c9da2c58d9d..0f998a9f99e0 100644
--- a/includes/Integrations/AMP.php
+++ b/includes/Integrations/AMP.php
@@ -52,6 +52,26 @@ class AMP extends Service_Base {
 	 */
 	const AMP_VALIDATED_URL_POST_TYPE = 'amp_validated_url';
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Initializes all hooks.
 	 *
@@ -100,9 +120,9 @@ public function filter_amp_options( $options ) {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @param string[] $post_types Post types.
+	 * @param string[]|mixed $post_types Supportable post types.
 	 *
-	 * @return array Supportable post types.
+	 * @return array|mixed Supportable post types.
 	 */
 	public function filter_supportable_post_types( $post_types ) {
 		if ( ! is_array( $post_types ) ) {
@@ -139,7 +159,7 @@ public function add_amp_content_sanitizers( $sanitizers ) {
 			return $sanitizers;
 		}
 
-		$video_cache_enabled = (bool) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
+		$video_cache_enabled = (bool) $this->settings->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
 
 		$story = new Story();
 		$story->load_from_post( $post );
diff --git a/includes/Migrations/Update_Publisher_Logos.php b/includes/Migrations/Update_Publisher_Logos.php
index 73b030d1fda1..d6722a59e233 100644
--- a/includes/Migrations/Update_Publisher_Logos.php
+++ b/includes/Migrations/Update_Publisher_Logos.php
@@ -36,6 +36,25 @@
  * @package Google\Web_Stories\Migrations
  */
 class Update_Publisher_Logos extends Migrate_Base {
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
 
 	/**
 	 * Split publisher logos into two options.
@@ -46,7 +65,7 @@ class Update_Publisher_Logos extends Migrate_Base {
 	 */
 	public function migrate() {
 		$publisher_logo_id       = 0;
-		$publisher_logo_settings = (array) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] );
+		$publisher_logo_settings = (array) $this->settings->get_setting( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] );
 
 		if ( ! empty( $publisher_logo_settings['active'] ) ) {
 			$publisher_logo_id = $publisher_logo_settings['active'];
diff --git a/includes/Story_Post_Type.php b/includes/Story_Post_Type.php
index f06fcf4b6e2b..6653e6766bd9 100644
--- a/includes/Story_Post_Type.php
+++ b/includes/Story_Post_Type.php
@@ -70,6 +70,26 @@ class Story_Post_Type extends Service_Base implements PluginDeactivationAware, S
 	 */
 	const PUBLISHER_LOGO_META_KEY = 'web_stories_publisher_logo';
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Analytics constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
+
 	/**
 	 * Registers the post type for stories.
 	 *
@@ -131,8 +151,6 @@ public function on_plugin_deactivation( $network_wide ) {
 	 * @return \WP_Post_Type|\WP_Error
 	 */
 	public function register_post_type() {
-		$has_archive = 'default' === Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ARCHIVE, 'default' );
-
 		return register_post_type(
 			self::POST_TYPE_SLUG,
 			[
@@ -217,7 +235,7 @@ public function unregister_post_type() {
 	 * @return void
 	 */
 	protected function register_meta() {
-		$active_publisher_logo_id = absint( Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, 0 ) );
+		$active_publisher_logo_id = absint( $this->settings->get_setting( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, 0 ) );
 
 		register_post_meta(
 			self::POST_TYPE_SLUG,
@@ -360,8 +378,8 @@ public function update_archive_setting() {
 	 * @return bool|string Whether the post type should have an archive, or archive slug.
 	 */
 	private function get_has_archive() {
-		$archive_page_option    = get_option( Settings::SETTING_NAME_ARCHIVE );
-		$custom_archive_page_id = (int) get_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
+		$archive_page_option    = $this->settings->get_setting( Settings::SETTING_NAME_ARCHIVE );
+		$custom_archive_page_id = (int) $this->settings->get_setting( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
 		$has_archive            = true;
 
 		if ( 'disabled' === $archive_page_option ) {
diff --git a/includes/Tracking.php b/includes/Tracking.php
index 5a6bdb737471..9a883deb1f76 100644
--- a/includes/Tracking.php
+++ b/includes/Tracking.php
@@ -78,6 +78,20 @@ class Tracking extends Service_Base implements HasRequirements {
 	 */
 	private $assets;
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Preferences instance.
+	 *
+	 * @var Preferences Preferences instance.
+	 */
+	private $preferences;
+
 	/**
 	 * Tracking constructor.
 	 *
@@ -86,11 +100,21 @@ class Tracking extends Service_Base implements HasRequirements {
 	 * @param Experiments $experiments Experiments instance.
 	 * @param Site_Kit    $site_kit Site_Kit instance.
 	 * @param Assets      $assets Assets instance.
+	 * @param Settings    $settings Settings instance.
+	 * @param Preferences $preferences Preferences instance.
 	 */
-	public function __construct( Experiments $experiments, Site_Kit $site_kit, Assets $assets ) {
+	public function __construct(
+		Experiments $experiments,
+		Site_Kit $site_kit,
+		Assets $assets,
+		Settings $settings,
+		Preferences $preferences
+	) {
 		$this->assets      = $assets;
 		$this->experiments = $experiments;
 		$this->site_kit    = $site_kit;
+		$this->settings    = $settings;
+		$this->preferences = $preferences;
 	}
 
 	/**
@@ -173,7 +197,7 @@ private function get_user_properties(): array {
 
 		$site_kit_status = $this->site_kit->get_plugin_status();
 		$active_plugins  = $site_kit_status['active'] ? 'google-site-kit' : '';
-		$analytics       = $site_kit_status['analyticsActive'] ? 'google-site-kit' : ! empty( Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_TRACKING_ID ) );
+		$analytics       = $site_kit_status['analyticsActive'] ? 'google-site-kit' : ! empty( $this->settings->get_setting( Settings::SETTING_NAME_TRACKING_ID ) );
 
 		return [
 			'siteLocale'         => get_locale(),
@@ -183,7 +207,7 @@ private function get_user_properties(): array {
 			'wpVersion'          => get_bloginfo( 'version' ),
 			'phpVersion'         => PHP_VERSION,
 			'isMultisite'        => (int) is_multisite(),
-			'adNetwork'          => (string) Services::get( 'settings' )->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ),
+			'adNetwork'          => (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ),
 			'analytics'          => $analytics,
 			'activePlugins'      => $active_plugins,
 		];
@@ -195,6 +219,6 @@ private function get_user_properties(): array {
 	 * @return bool True if tracking enabled, and False if not.
 	 */
 	public function is_active(): bool {
-		return (bool) Services::get( 'user_preferences' )->get_preference( get_current_user_id(), Preferences::OPTIN_META_KEY );
+		return (bool) $this->preferences->get_preference( get_current_user_id(), Preferences::OPTIN_META_KEY );
 	}
 }
diff --git a/tests/phpunit/integration/includes/DependencyInjectedTestCase.php b/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
index ec0b0193b5cb..c57895f8051c 100644
--- a/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
+++ b/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
@@ -47,8 +47,12 @@ public function set_up() {
 		// Needed because the block will exist already after hooking up the plugin
 		// on plugins_loaded. This avoids _doing_it_wrong messages
 		// due to registering the plugin (and thus the block) again.
+		// But only du so when the block is actually registered to avoid another
+		// _doing_it_wrong message being triggered.
 		// TODO: Figure out a better way.
-		unregister_block_type( 'web-stories/embed' );
+		if ( \WP_Block_Type_Registry::get_instance()->is_registered( 'web-stories/embed' ) ) {
+			unregister_block_type( 'web-stories/embed' );
+		}
 
 		// We're intentionally avoiding the PluginFactory here as it uses a
 		// static instance, because its whole point is to allow reuse across consumers.
diff --git a/tests/phpunit/integration/tests/AMP/Output_Buffer.php b/tests/phpunit/integration/tests/AMP/Output_Buffer.php
index 05097bb9d997..0b936de89ef4 100644
--- a/tests/phpunit/integration/tests/AMP/Output_Buffer.php
+++ b/tests/phpunit/integration/tests/AMP/Output_Buffer.php
@@ -23,12 +23,13 @@
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\AMP\Sanitization;
 use Google\Web_Stories\AMP\Optimization;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\AMP\Output_Buffer
  */
-class Output_Buffer extends TestCase {
+class Output_Buffer extends DependencyInjectedTestCase {
 	public function set_up() {
 		parent::set_up();
 
@@ -46,7 +47,7 @@ public function tear_down() {
 	}
 
 	protected function prepare_response( $post ): string {
-		$instance = new \Google\Web_Stories\AMP\Output_Buffer( new Sanitization( new Experiments() ), new Optimization() );
+		$instance = $this->injector->make( \Google\Web_Stories\AMP\Output_Buffer::class );
 		$story    = new Story();
 		$story->load_from_post( $post );
 
diff --git a/tests/phpunit/integration/tests/AMP/Sanitization.php b/tests/phpunit/integration/tests/AMP/Sanitization.php
index 70f7d8ce0f90..2eb3cce2859c 100644
--- a/tests/phpunit/integration/tests/AMP/Sanitization.php
+++ b/tests/phpunit/integration/tests/AMP/Sanitization.php
@@ -18,6 +18,7 @@
 namespace Google\Web_Stories\Tests\Integration\AMP;
 
 use DOMElement;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories_Dependencies\AMP_Dev_Mode_Sanitizer;
 use Google\Web_Stories_Dependencies\AMP_Layout_Sanitizer;
 use Google\Web_Stories_Dependencies\AMP_Style_Sanitizer;
@@ -28,7 +29,7 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\AMP\Sanitization
  */
-class Sanitization extends TestCase {
+class Sanitization extends DependencyInjectedTestCase {
 	public function tear_down() {
 		remove_all_filters( 'web_stories_amp_sanitizers' );
 		remove_all_filters( 'web_stories_amp_dev_mode_enabled' );
@@ -63,7 +64,7 @@ public function test_scripts_get_moved_to_head() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$document = Document::fromHtml( $original_html );
 		$sanitization->sanitize_document( $document );
@@ -99,7 +100,7 @@ public function test_unneeded_scripts_get_removed() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$document = Document::fromHtml( $original_html );
 		$sanitization->sanitize_document( $document );
@@ -148,7 +149,7 @@ public function test_duplicate_scripts_are_removed() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$document = Document::fromHtml( $original_html );
 		$sanitization->sanitize_document( $document );
@@ -200,7 +201,7 @@ public function test_missing_scripts_get_added() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$document = Document::fromHtml( $original_html );
 		$sanitization->sanitize_document( $document );
@@ -227,7 +228,7 @@ public function test_missing_scripts_get_added() {
 	 * @covers ::get_extension_sources
 	 */
 	public function test_get_extension_sources() {
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 		$sources      = $this->call_private_method( $sanitization, 'get_extension_sources' );
 
 		$actual = [];
@@ -386,7 +387,7 @@ public function test_get_extension_sources() {
 	 * @covers ::is_amp_dev_mode
 	 */
 	public function test_is_amp_dev_mode() {
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$this->assertFalse( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
 		add_filter( 'web_stories_amp_dev_mode_enabled', '__return_true' );
@@ -400,7 +401,7 @@ public function test_is_amp_dev_mode() {
 	 * @covers ::is_amp_dev_mode
 	 */
 	public function test_is_amp_dev_mode_authenticated_user_admin_bar_showing() {
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		add_filter( 'show_admin_bar', '__return_true' );
 		wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
@@ -414,7 +415,7 @@ public function test_is_amp_dev_mode_authenticated_user_admin_bar_showing() {
 	 * @covers ::is_amp_dev_mode
 	 */
 	public function test_is_amp_dev_mode_unauthenticated_user_admin_bar_forced() {
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		// Test unauthenticated user with admin bar forced.
 		add_filter( 'show_admin_bar', '__return_true' );
@@ -439,7 +440,7 @@ static function( $sanitizers ) {
 			}
 		);
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 		$sanitizers   = $this->call_private_method( $sanitization, 'get_sanitizers' );
 
 		$ordered_sanitizers = array_keys( $sanitizers );
@@ -455,7 +456,7 @@ static function( $sanitizers ) {
 	 * @covers ::get_sanitizers
 	 */
 	public function test_get_sanitizers_with_dev_mode() {
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$element_xpaths            = [ '//script[ @id = "hello-world" ]' ];
 		$validation_error_callback = [ $sanitization, 'validation_error_callback' ];
@@ -530,7 +531,7 @@ public function test_sanitize_amp_video_with_missing_poster() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$document = Document::fromHtml( $original_html );
 		$sanitization->sanitize_document( $document );
@@ -563,7 +564,7 @@ public function test_sanitize_amp_video_with_http_source() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
+		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
 		$document = Document::fromHtml( $original_html );
 		$sanitization->sanitize_document( $document );
diff --git a/tests/phpunit/integration/tests/AdSense.php b/tests/phpunit/integration/tests/AdSense.php
index 6aadf52682ff..1322f13f619c 100644
--- a/tests/phpunit/integration/tests/AdSense.php
+++ b/tests/phpunit/integration/tests/AdSense.php
@@ -20,7 +20,7 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\AdSense
  */
-class AdSense extends TestCase {
+class AdSense extends DependencyInjectedTestCase {
 
 	public function set_up() {
 		parent::set_up();
@@ -42,7 +42,7 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$adsense = new \Google\Web_Stories\AdSense();
+		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
 		$adsense->register();
 
 		$this->assertSame( 10, has_action( 'web_stories_print_analytics', [ $adsense, 'print_adsense_tag' ] ) );
@@ -52,7 +52,7 @@ public function test_register() {
 	 * @covers ::get_publisher_id
 	 */
 	public function test_get_publisher_id() {
-		$adsense = new \Google\Web_Stories\AdSense();
+		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
 		$result  = $this->call_private_method( $adsense, 'get_publisher_id' );
 		$this->assertSame( '456', $result );
 	}
@@ -61,7 +61,7 @@ public function test_get_publisher_id() {
 	 * @covers ::get_slot_id
 	 */
 	public function test_get_slot_id() {
-		$adsense = new \Google\Web_Stories\AdSense();
+		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
 		$result  = $this->call_private_method( $adsense, 'get_slot_id' );
 		$this->assertSame( '123', $result );
 	}
@@ -70,7 +70,7 @@ public function test_get_slot_id() {
 	 * @covers ::is_enabled
 	 */
 	public function test_is_enabled() {
-		$adsense = new \Google\Web_Stories\AdSense();
+		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
 		$result  = $this->call_private_method( $adsense, 'is_enabled' );
 		$this->assertTrue( $result );
 	}
@@ -79,7 +79,7 @@ public function test_is_enabled() {
 	 * @covers ::print_adsense_tag
 	 */
 	public function test_print_adsense_tag() {
-		$adsense = new \Google\Web_Stories\AdSense();
+		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
 
 		$output = get_echo( [ $adsense, 'print_adsense_tag' ] );
 		$this->assertStringContainsString( '<amp-story-auto-ads>', $output );
diff --git a/tests/phpunit/integration/tests/Ad_Manager.php b/tests/phpunit/integration/tests/Ad_Manager.php
index 56909fac5d79..f7aacd6e8da5 100644
--- a/tests/phpunit/integration/tests/Ad_Manager.php
+++ b/tests/phpunit/integration/tests/Ad_Manager.php
@@ -20,7 +20,7 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Ad_Manager
  */
-class Ad_Manager extends TestCase {
+class Ad_Manager extends DependencyInjectedTestCase {
 
 	public function set_up() {
 		parent::set_up();
@@ -40,7 +40,7 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$adsense = new \Google\Web_Stories\Ad_Manager();
+		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
 		$adsense->register();
 
 		$this->assertSame( 10, has_action( 'web_stories_print_analytics', [ $adsense, 'print_ad_manager_tag' ] ) );
@@ -50,7 +50,7 @@ public function test_register() {
 	 * @covers ::get_slot_id
 	 */
 	public function test_get_slot_id() {
-		$adsense = new \Google\Web_Stories\Ad_Manager();
+		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
 		$result  = $this->call_private_method( $adsense, 'get_slot_id' );
 		$this->assertSame( '123', $result );
 	}
@@ -59,7 +59,7 @@ public function test_get_slot_id() {
 	 * @covers ::is_enabled
 	 */
 	public function test_is_enabled() {
-		$adsense = new \Google\Web_Stories\Ad_Manager();
+		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
 		$result  = $this->call_private_method( $adsense, 'is_enabled' );
 		$this->assertTrue( $result );
 	}
@@ -68,7 +68,7 @@ public function test_is_enabled() {
 	 * @covers ::print_ad_manager_tag
 	 */
 	public function test_print_ad_manager_tag() {
-		$adsense = new \Google\Web_Stories\Ad_Manager();
+		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
 
 		$output = get_echo( [ $adsense, 'print_ad_manager_tag' ] );
 		$this->assertStringContainsString( '<amp-story-auto-ads>', $output );
diff --git a/tests/phpunit/integration/tests/Admin/Customizer.php b/tests/phpunit/integration/tests/Admin/Customizer.php
index 37ea55768b28..7c7642f69e60 100644
--- a/tests/phpunit/integration/tests/Admin/Customizer.php
+++ b/tests/phpunit/integration/tests/Admin/Customizer.php
@@ -19,6 +19,7 @@
 namespace Google\Web_Stories\Tests\Integration\Admin;
 
 use Google\Web_Stories\Admin\Customizer as TheCustomizer;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Traits\Theme_Support;
 use Google\Web_Stories\Tests\Integration\TestCase;
 use WP_Customize_Manager;
@@ -29,7 +30,7 @@
  * @runInSeparateProcess
  * @preserveGlobalState disabled
  */
-class Customizer extends TestCase {
+class Customizer extends DependencyInjectedTestCase {
 	use Theme_Support;
 
 	/**
@@ -47,11 +48,11 @@ class Customizer extends TestCase {
 	private $customizer_mock;
 
 	/**
-	 * Testee instance.
+	 * Teste instance.
 	 *
 	 * @var \Google\Web_Stories\Admin\Customizer
 	 */
-	private $customizer;
+	private $instance;
 
 	public static function wpSetUpBeforeClass() {
 		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
@@ -66,10 +67,10 @@ public function set_up() {
 
 		global $wp_customize;
 
-		$this->customizer      = new \Google\Web_Stories\Admin\Customizer();
-		$this->wp_customize    = new \WP_Customize_Manager();
-		$wp_customize          = $this->wp_customize;
-		$this->customizer_mock = $this->createMock( WP_Customize_Manager::class );
+		$this->instance      = $this->injector->make( \Google\Web_Stories\Admin\Customizer::class );
+		$this->wp_customize  = new \WP_Customize_Manager();
+		$wp_customize        = $this->wp_customize;
+		$this->instance_mock = $this->createMock( WP_Customize_Manager::class );
 	}
 
 	/**
@@ -133,13 +134,13 @@ private function add_web_stories_theme_support() {
 	 */
 	public function test_register() {
 
-		$this->customizer->register();
+		$this->instance->register();
 		$this->assertSame(
 			10,
 			has_action(
 				'customize_register',
 				[
-					$this->customizer,
+					$this->instance,
 					'register_customizer_settings',
 				]
 			)
@@ -152,7 +153,7 @@ public function test_register() {
 	public function test_customizer_web_stories_section_added() {
 		$this->add_web_stories_theme_support();
 
-		$this->customizer_mock->expects( $this->once() )->method( 'add_section' )->with(
+		$this->instance_mock->expects( $this->once() )->method( 'add_section' )->with(
 			TheCustomizer::SECTION_SLUG,
 			[
 				'title'          => 'Web Stories',
@@ -160,7 +161,7 @@ public function test_customizer_web_stories_section_added() {
 			]
 		);
 
-		$this->customizer->register_customizer_settings( $this->customizer_mock );
+		$this->instance->register_customizer_settings( $this->instance_mock );
 	}
 
 	/**
@@ -168,8 +169,8 @@ public function test_customizer_web_stories_section_added() {
 	 */
 	public function test_customizer_settings_added() {
 		$this->add_web_stories_theme_support();
-		$this->customizer_mock->expects( $this->exactly( 14 ) )->method( 'add_setting' );
-		$this->customizer->register_customizer_settings( $this->customizer_mock );
+		$this->instance_mock->expects( $this->exactly( 14 ) )->method( 'add_setting' );
+		$this->instance->register_customizer_settings( $this->instance_mock );
 	}
 
 	/**
@@ -177,7 +178,7 @@ public function test_customizer_settings_added() {
 	 */
 	public function test_customizer_show_stories_settings_added() {
 		$this->add_web_stories_theme_support();
-		$this->customizer_mock->expects( $this->exactly( 14 ) )->
+		$this->instance_mock->expects( $this->exactly( 14 ) )->
 		method( 'add_setting' )->
 		withConsecutive(
 			[
@@ -199,7 +200,7 @@ public function test_customizer_show_stories_settings_added() {
 				[
 					'default'           => 5,
 					'type'              => 'option',
-					'validate_callback' => [ $this->customizer, 'validate_number_of_stories' ],
+					'validate_callback' => [ $this->instance, 'validate_number_of_stories' ],
 				],
 			],
 			[
@@ -207,7 +208,7 @@ public function test_customizer_show_stories_settings_added() {
 				[
 					'default'           => 4,
 					'type'              => 'option',
-					'validate_callback' => [ $this->customizer, 'validate_number_of_columns' ],
+					'validate_callback' => [ $this->instance, 'validate_number_of_columns' ],
 				],
 			],
 			[
@@ -282,23 +283,23 @@ public function test_customizer_show_stories_settings_added() {
 			]
 		);
 
-		$this->customizer->register_customizer_settings( $this->customizer_mock );
+		$this->instance->register_customizer_settings( $this->instance_mock );
 	}
 
 	/**
 	 * @covers ::validate_number_of_stories
 	 */
 	public function test_validate_number_of_stories() {
-		$output = $this->customizer->validate_number_of_stories( new WP_Error(), 20 );
+		$output = $this->instance->validate_number_of_stories( new WP_Error(), 20 );
 
 		$this->assertEmpty( $output->errors );
 
-		$output = $this->customizer->validate_number_of_stories( new WP_Error(), 30 );
+		$output = $this->instance->validate_number_of_stories( new WP_Error(), 30 );
 
 		$this->assertNotEmpty( $output->errors );
 		$this->assertNotEmpty( $output->errors['invalid_number'] );
 
-		$output = $this->customizer->validate_number_of_stories( new WP_Error(), 0 );
+		$output = $this->instance->validate_number_of_stories( new WP_Error(), 0 );
 
 		$this->assertNotEmpty( $output->errors );
 		$this->assertNotEmpty( $output->errors['invalid_number'] );
@@ -309,16 +310,16 @@ public function test_validate_number_of_stories() {
 	 * @covers ::validate_number_of_columns
 	 */
 	public function test_validate_number_of_columns() {
-		$output = $this->customizer->validate_number_of_columns( new WP_Error(), 2 );
+		$output = $this->instance->validate_number_of_columns( new WP_Error(), 2 );
 
 		$this->assertEmpty( $output->errors );
 
-		$output = $this->customizer->validate_number_of_columns( new WP_Error(), 6 );
+		$output = $this->instance->validate_number_of_columns( new WP_Error(), 6 );
 
 		$this->assertNotEmpty( $output->errors );
 		$this->assertNotEmpty( $output->errors['invalid_number'] );
 
-		$output = $this->customizer->validate_number_of_columns( new WP_Error(), 0 );
+		$output = $this->instance->validate_number_of_columns( new WP_Error(), 0 );
 
 		$this->assertNotEmpty( $output->errors );
 		$this->assertNotEmpty( $output->errors['invalid_number'] );
@@ -447,7 +448,7 @@ public function test_render_stories() {
 			'show_stories' => true,
 		];
 
-		$output = $this->customizer->render_stories();
+		$output = $this->instance->render_stories();
 
 		$this->assertEmpty( $output );
 
@@ -459,12 +460,9 @@ public function test_render_stories() {
 			]
 		);
 
-		$output = $this->customizer->render_stories();
+		$output = $this->instance->render_stories();
 
 		$this->assertNotEmpty( $output );
-
 		$this->assertStringContainsString( 'web-stories-list--customizer', $output );
-
 	}
-
 }
diff --git a/tests/phpunit/integration/tests/Analytics.php b/tests/phpunit/integration/tests/Analytics.php
index 57cb821512fd..cf43e3088b93 100644
--- a/tests/phpunit/integration/tests/Analytics.php
+++ b/tests/phpunit/integration/tests/Analytics.php
@@ -22,13 +22,12 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Analytics
  */
-class Analytics extends TestCase {
-
+class Analytics extends DependencyInjectedTestCase {
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$analytics = new \Google\Web_Stories\Analytics( new \Google\Web_Stories\Experiments() );
+		$analytics = $this->injector->make( \Google\Web_Stories\Analytics::class );
 		$analytics->register();
 
 		$this->assertSame( 10, has_filter( 'web_stories_print_analytics', [ $analytics, 'print_analytics_tag' ] ) );
@@ -39,7 +38,7 @@ public function test_register() {
 	 */
 	public function test_get_tracking_id_casts_to_string() {
 		update_option( Settings::SETTING_NAME_TRACKING_ID, 123456789, false );
-		$analytics = new \Google\Web_Stories\Analytics( new \Google\Web_Stories\Experiments() );
+		$analytics = $this->injector->make( \Google\Web_Stories\Analytics::class );
 		$this->assertSame( '123456789', $analytics->get_tracking_id() );
 	}
 
@@ -48,7 +47,7 @@ public function test_get_tracking_id_casts_to_string() {
 	 */
 	public function test_get_default_configuration() {
 		$tracking_id = '123456789';
-		$analytics   = new \Google\Web_Stories\Analytics( new \Google\Web_Stories\Experiments() );
+		$analytics   = $this->injector->make( \Google\Web_Stories\Analytics::class );
 		$actual      = $analytics->get_default_configuration( $tracking_id );
 		$this->assertArrayHasKey( 'vars', $actual );
 		$this->assertArrayHasKey( 'gtag_id', $actual['vars'] );
@@ -78,7 +77,7 @@ public function test_print_analytics_tag() {
 		$experiments->method( 'is_experiment_enabled' )
 					->willReturn( true );
 
-		$analytics     = new \Google\Web_Stories\Analytics( $experiments );
+		$analytics     = new \Google\Web_Stories\Analytics( $this->injector->make( Settings::class ), $experiments );
 		$actual_before = get_echo( [ $analytics, 'print_analytics_tag' ] );
 
 		update_option( Settings::SETTING_NAME_TRACKING_ID, 123456789, false );
@@ -94,7 +93,7 @@ public function test_print_analytics_tag() {
 	 * @covers ::print_analytics_tag
 	 */
 	public function test_print_analytics_tag_legacy() {
-		$analytics     = new \Google\Web_Stories\Analytics( new \Google\Web_Stories\Experiments() );
+		$analytics     = $this->injector->make( \Google\Web_Stories\Analytics::class );
 		$actual_before = get_echo( [ $analytics, 'print_analytics_tag' ] );
 
 		update_option( Settings::SETTING_NAME_TRACKING_ID, 123456789, false );
diff --git a/tests/phpunit/integration/tests/Experiments.php b/tests/phpunit/integration/tests/Experiments.php
index dac4b8fdddee..7b15a82ea5c6 100644
--- a/tests/phpunit/integration/tests/Experiments.php
+++ b/tests/phpunit/integration/tests/Experiments.php
@@ -20,13 +20,18 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Experiments
  */
-class Experiments extends TestCase {
+class Experiments extends DependencyInjectedTestCase {
 
 	/**
 	 * @var int
 	 */
 	protected static $user_id;
 
+	/**
+	 * @var \Google\Web_Stories\Experiments
+	 */
+	private $instance;
+
 	/**
 	 * @param $factory
 	 */
@@ -39,26 +44,39 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Experiments::class );
+	}
+
+	public function tear_down() {
+		delete_option( \Google\Web_Stories\Settings::SETTING_NAME_EXPERIMENTS );
+
+		parent::tear_down();
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$experiments = new \Google\Web_Stories\Experiments();
-		$experiments->register();
+		$this->instance->register();
 
 		// Because WEBSTORIES_DEV_MODE is false by default.
-		$this->assertFalse( has_action( 'admin_menu', [ $experiments, 'add_menu_page' ] ) );
-		$this->assertFalse( has_action( 'admin_init', [ $experiments, 'initialize_settings' ] ) );
+		$this->assertFalse( has_action( 'admin_menu', [ $this->instance, 'add_menu_page' ] ) );
+		$this->assertFalse( has_action( 'admin_init', [ $this->instance, 'initialize_settings' ] ) );
 	}
 
 	/**
 	 * @covers ::add_menu_page
 	 */
 	public function test_add_menu_page_no_capabilities() {
-		$experiments = new \Google\Web_Stories\Experiments();
-		$before      = $this->get_private_property( $experiments, 'hook_suffix' );
-		$experiments->add_menu_page();
-		$after = $this->get_private_property( $experiments, 'hook_suffix' );
+		$before = $this->get_private_property( $this->instance, 'hook_suffix' );
+
+		$this->instance->add_menu_page();
+
+		$after = $this->get_private_property( $this->instance, 'hook_suffix' );
+
 		$this->assertNull( $before );
 		$this->assertFalse( $after );
 	}
@@ -68,10 +86,13 @@ public function test_add_menu_page_no_capabilities() {
 	 */
 	public function test_add_menu_page() {
 		wp_set_current_user( self::$user_id );
-		$experiments = new \Google\Web_Stories\Experiments();
-		$before      = $this->get_private_property( $experiments, 'hook_suffix' );
-		$experiments->add_menu_page();
-		$after = $this->get_private_property( $experiments, 'hook_suffix' );
+
+		$before = $this->get_private_property( $this->instance, 'hook_suffix' );
+
+		$this->instance->add_menu_page();
+
+		$after = $this->get_private_property( $this->instance, 'hook_suffix' );
+
 		$this->assertNull( $before );
 		$this->assertSame( 'admin_page_web-stories-experiments', $after );
 	}
@@ -82,8 +103,7 @@ public function test_add_menu_page() {
 	public function test_initialize_settings() {
 		global $wp_settings_fields, $wp_settings_sections;
 
-		$experiments = new \Google\Web_Stories\Experiments();
-		$experiments->initialize_settings();
+		$this->instance->initialize_settings();
 
 		$this->assertArrayHasKey( \Google\Web_Stories\Experiments::PAGE_NAME, $wp_settings_fields );
 		$this->assertArrayHasKey( \Google\Web_Stories\Experiments::PAGE_NAME, $wp_settings_sections );
@@ -94,11 +114,11 @@ public function test_initialize_settings() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field() {
-		$experiments = $this->createPartialMock(
+		$this->instance = $this->createPartialMock(
 			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
+			[ 'get_experiments', 'is_experiment_enabled' ]
 		);
-		$experiments->method( 'get_experiments' )
+		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
 							[
@@ -108,9 +128,11 @@ public function test_display_experiment_field() {
 							],
 						]
 					);
+		$this->instance->method( 'is_experiment_enabled' )
+					->willReturn( false );
 
 		$output = get_echo(
-			[ $experiments, 'display_experiment_field' ],
+			[ $this->instance, 'display_experiment_field' ],
 			[
 				[
 					'label' => 'Foo Label',
@@ -126,11 +148,11 @@ public function test_display_experiment_field() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field_enabled() {
-		$experiments = $this->createPartialMock(
+		$this->instance = $this->createPartialMock(
 			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
+			[ 'get_experiments', 'is_experiment_enabled' ]
 		);
-		$experiments->method( 'get_experiments' )
+		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
 							[
@@ -140,11 +162,11 @@ public function test_display_experiment_field_enabled() {
 							],
 						]
 					);
-
-		update_option( \Google\Web_Stories\Settings::SETTING_NAME_EXPERIMENTS, [ 'foo' => true ], false );
+		$this->instance->method( 'is_experiment_enabled' )
+					->willReturn( true );
 
 		$output = get_echo(
-			[ $experiments, 'display_experiment_field' ],
+			[ $this->instance, 'display_experiment_field' ],
 			[
 				[
 					'label' => 'Foo Label',
@@ -159,11 +181,11 @@ public function test_display_experiment_field_enabled() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field_enabled_by_default() {
-		$experiments = $this->createPartialMock(
+		$this->instance = $this->createPartialMock(
 			\Google\Web_Stories\Experiments::class,
 			[ 'get_experiments' ]
 		);
-		$experiments->method( 'get_experiments' )
+		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
 							[
@@ -175,7 +197,7 @@ public function test_display_experiment_field_enabled_by_default() {
 					);
 
 		$output = get_echo(
-			[ $experiments, 'display_experiment_field' ],
+			[ $this->instance, 'display_experiment_field' ],
 			[
 				[
 					'label'   => 'Foo Label',
@@ -193,8 +215,7 @@ public function test_display_experiment_field_enabled_by_default() {
 	 * @covers ::get_experiment_groups
 	 */
 	public function test_get_experiment_groups() {
-		$experiments = new \Google\Web_Stories\Experiments();
-		$groups      = $experiments->get_experiment_groups();
+		$groups = $this->instance->get_experiment_groups();
 		$this->assertCount( 3, $groups );
 	}
 
@@ -202,9 +223,8 @@ public function test_get_experiment_groups() {
 	 * @covers ::get_experiments
 	 */
 	public function test_get_experiments() {
-		$experiments           = new \Google\Web_Stories\Experiments();
-		$all_experiments       = $experiments->get_experiments();
-		$all_experiment_groups = array_keys( $experiments->get_experiment_groups() );
+		$all_experiments       = $this->instance->get_experiments();
+		$all_experiment_groups = array_keys( $this->instance->get_experiment_groups() );
 
 		$experiment_names  = wp_list_pluck( $all_experiments, 'name' );
 		$experiment_groups = wp_list_pluck( $all_experiments, 'group' );
@@ -222,12 +242,11 @@ public function test_get_experiments() {
 	 * @covers ::get_experiment_statuses
 	 */
 	public function test_get_experiment_statuses() {
-		$experiments = new \Google\Web_Stories\Experiments();
-		$this->assertEmpty( $experiments->get_experiment_statuses( 'foo-bar-baz' ) );
-		$this->assertNotEmpty( $experiments->get_experiment_statuses( 'dashboard' ) );
-		$this->assertNotEmpty( $experiments->get_experiment_statuses( 'editor' ) );
+		$this->assertEmpty( $this->instance->get_experiment_statuses( 'foo-bar-baz' ) );
+		$this->assertNotEmpty( $this->instance->get_experiment_statuses( 'dashboard' ) );
+		$this->assertNotEmpty( $this->instance->get_experiment_statuses( 'editor' ) );
 
-		foreach ( $experiments->get_experiment_statuses( 'editor' ) as $key => $status ) {
+		foreach ( $this->instance->get_experiment_statuses( 'editor' ) as $key => $status ) {
 			$this->assertIsString( $key );
 			$this->assertIsBool( $status );
 		}
@@ -238,8 +257,8 @@ public function test_get_experiment_statuses() {
 	 */
 	public function test_is_experiment_enabled() {
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_EXPERIMENTS, [ 'enableInProgressTemplateActions' => true ], false );
-		$experiments = new \Google\Web_Stories\Experiments();
-		$this->assertTrue( $experiments->is_experiment_enabled( 'enableInProgressTemplateActions' ) );
+
+		$this->assertTrue( $this->instance->is_experiment_enabled( 'enableInProgressTemplateActions' ) );
 	}
 
 	/**
@@ -247,17 +266,18 @@ public function test_is_experiment_enabled() {
 	 * @covers ::get_experiment
 	 */
 	public function test_is_experiment_enabled_default_experiment() {
-		$experiments = $this->createPartialMock(
+		$this->instance = $this->createPartialMock(
 			\Google\Web_Stories\Experiments::class,
 			[ 'get_experiments' ]
 		);
-		$experiments->method( 'get_experiments' )
+		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
 							[
 								'name'        => 'foo',
 								'label'       => 'Foo Label',
 								'description' => 'Foo Desc',
+								'default'     => false,
 							],
 							[
 								'name'        => 'bar',
@@ -268,9 +288,16 @@ public function test_is_experiment_enabled_default_experiment() {
 						]
 					);
 
-		$this->assertFalse( $experiments->is_experiment_enabled( 'foo' ) );
-		$this->assertTrue( $experiments->is_experiment_enabled( 'bar' ) );
-		$this->assertFalse( $experiments->is_experiment_enabled( 'baz' ) );
+		$this->assertFalse( $this->instance->is_experiment_enabled( 'foo' ) );
+		$this->assertTrue( $this->instance->is_experiment_enabled( 'bar' ) );
+	}
+
+	/**
+	 * @covers ::is_experiment_enabled
+	 * @covers ::get_experiment
+	 */
+	public function test_is_experiment_enabled_unknown_experiment() {
+		$this->assertFalse( $this->instance->is_experiment_enabled( 'baz' ) );
 	}
 
 	/**
@@ -279,11 +306,11 @@ public function test_is_experiment_enabled_default_experiment() {
 	public function test_get_enabled_experiments() {
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_EXPERIMENTS, [ 'baz' => true ], false );
 
-		$experiments = $this->createPartialMock(
+		$this->instance = $this->createPartialMock(
 			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
+			[ 'get_experiments', 'is_experiment_enabled' ]
 		);
-		$experiments->method( 'get_experiments' )
+		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
 							[
@@ -305,12 +332,20 @@ public function test_get_enabled_experiments() {
 							],
 						]
 					);
+		$this->instance->method( 'is_experiment_enabled' )
+					->willReturnMap(
+						[
+							[ 'foo', false ],
+							[ 'bar', true ],
+							[ 'baz', true ],
+						]
+					);
 
 		$expected = [
 			'bar',
 			'baz',
 		];
 
-		$this->assertEqualSets( $expected, $experiments->get_enabled_experiments() );
+		$this->assertEqualSets( $expected, $this->instance->get_enabled_experiments() );
 	}
 }
diff --git a/tests/phpunit/integration/tests/Integrations/AMP.php b/tests/phpunit/integration/tests/Integrations/AMP.php
index 7126cf331cb4..1c6132ad05d3 100644
--- a/tests/phpunit/integration/tests/Integrations/AMP.php
+++ b/tests/phpunit/integration/tests/Integrations/AMP.php
@@ -19,24 +19,34 @@
 
 use DOMDocument;
 use Google\Web_Stories\Story_Post_Type;
-use Google\Web_Stories\Tests\Integration\TestCase;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Integrations\AMP
  */
-class AMP extends TestCase {
+class AMP extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Integrations\AMP
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Integrations\AMP::class );
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$amp = new \Google\Web_Stories\Integrations\AMP();
-		$amp->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_filter( 'option_amp-options', [ $amp, 'filter_amp_options' ] ) );
-		$this->assertSame( 10, has_filter( 'amp_supportable_post_types', [ $amp, 'filter_supportable_post_types' ] ) );
-		$this->assertSame( 10, has_filter( 'amp_to_amp_linking_element_excluded', [ $amp, 'filter_amp_to_amp_linking_element_excluded' ] ) );
-		$this->assertSame( 10, has_filter( 'amp_validation_error_sanitized', [ $amp, 'filter_amp_validation_error_sanitized' ] ) );
-		$this->assertSame( 10, has_filter( 'web_stories_amp_validation_error_sanitized', [ $amp, 'filter_amp_validation_error_sanitized' ] ) );
+		$this->assertSame( 10, has_filter( 'option_amp-options', [ $this->instance, 'filter_amp_options' ] ) );
+		$this->assertSame( 10, has_filter( 'amp_supportable_post_types', [ $this->instance, 'filter_supportable_post_types' ] ) );
+		$this->assertSame( 10, has_filter( 'amp_to_amp_linking_element_excluded', [ $this->instance, 'filter_amp_to_amp_linking_element_excluded' ] ) );
+		$this->assertSame( 10, has_filter( 'amp_validation_error_sanitized', [ $this->instance, 'filter_amp_validation_error_sanitized' ] ) );
+		$this->assertSame( 10, has_filter( 'web_stories_amp_validation_error_sanitized', [ $this->instance, 'filter_amp_validation_error_sanitized' ] ) );
 
 		remove_all_filters( 'option_amp-options' );
 		remove_all_filters( 'amp_supportable_post_types' );
@@ -49,8 +59,7 @@ public function test_register() {
 	 * @covers ::filter_amp_options
 	 */
 	public function test_filter_amp_options_if_not_requested_post_type() {
-		$amp = new \Google\Web_Stories\Integrations\AMP();
-		$this->assertEqualSets( [], $amp->filter_amp_options( [] ) );
+		$this->assertEqualSets( [], $this->instance->filter_amp_options( [] ) );
 	}
 
 	/**
@@ -71,8 +80,7 @@ public function test_filter_amp_options() {
 			'supported_templates'  => [ 'is_page', 'is_singular' ],
 		];
 
-		$amp    = new \Google\Web_Stories\Integrations\AMP();
-		$actual = $amp->filter_amp_options( $before );
+		$actual = $this->instance->filter_amp_options( $before );
 
 		$this->assertEqualSets( $expected, $actual );
 	}
@@ -81,8 +89,8 @@ public function test_filter_amp_options() {
 	 * @covers ::filter_supportable_post_types
 	 */
 	public function test_filter_supportable_post_types_if_not_requested_post_type() {
-		$amp = new \Google\Web_Stories\Integrations\AMP();
-		$this->assertEqualSets( [], $amp->filter_supportable_post_types( [ Story_Post_Type::POST_TYPE_SLUG ] ) );
+
+		$this->assertEqualSets( [], $this->instance->filter_supportable_post_types( [ Story_Post_Type::POST_TYPE_SLUG ] ) );
 	}
 
 	/**
@@ -91,8 +99,7 @@ public function test_filter_supportable_post_types_if_not_requested_post_type()
 	public function test_filter_supportable_post_types() {
 		$GLOBALS['current_screen'] = convert_to_screen( Story_Post_Type::POST_TYPE_SLUG );
 
-		$amp    = new \Google\Web_Stories\Integrations\AMP();
-		$actual = $amp->filter_supportable_post_types( [] );
+		$actual = $this->instance->filter_supportable_post_types( [] );
 
 		$this->assertEqualSets( [ Story_Post_Type::POST_TYPE_SLUG ], $actual );
 	}
@@ -136,9 +143,7 @@ public function data_test_filter_amp_to_amp_linking_element_excluded(): array {
 	 * @dataProvider data_test_filter_amp_to_amp_linking_element_excluded
 	 */
 	public function test_filter_amp_to_amp_linking_element_excluded( $args, $expected ) {
-		$amp = new \Google\Web_Stories\Integrations\AMP();
-
-		$actual = call_user_func_array( [ $amp, 'filter_amp_to_amp_linking_element_excluded' ], $args );
+		$actual = $this->instance->filter_amp_to_amp_linking_element_excluded( ...$args );
 		$this->assertSame( $actual, $expected );
 	}
 }
diff --git a/tests/phpunit/integration/tests/Integrations/New_Relic.php b/tests/phpunit/integration/tests/Integrations/New_Relic.php
index 0e83fb4e9b46..4f44390f651a 100644
--- a/tests/phpunit/integration/tests/Integrations/New_Relic.php
+++ b/tests/phpunit/integration/tests/Integrations/New_Relic.php
@@ -28,9 +28,6 @@ class New_Relic extends TestCase {
 	 * @covers ::is_needed
 	 */
 	public function test_is_needed() {
-		$new_relic = new New_Relic_Integration();
-		$result    = $this->call_private_method( $new_relic, 'is_needed' );
-
-		$this->assertSame( function_exists( 'newrelic_disable_autorum' ), $result );
+		$this->assertSame( function_exists( 'newrelic_disable_autorum' ), New_Relic_Integration::is_needed() );
 	}
 }
diff --git a/tests/phpunit/integration/tests/Migrations/Update_Publisher_Logos.php b/tests/phpunit/integration/tests/Migrations/Update_Publisher_Logos.php
index 771b4c32b010..8487c3dbbe37 100644
--- a/tests/phpunit/integration/tests/Migrations/Update_Publisher_Logos.php
+++ b/tests/phpunit/integration/tests/Migrations/Update_Publisher_Logos.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\Migrations;
 
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
@@ -25,16 +26,21 @@
  * @coversDefaultClass \Google\Web_Stories\Migrations\Update_Publisher_Logos
  *
  */
-class Update_Publisher_Logos extends TestCase {
+class Update_Publisher_Logos extends DependencyInjectedTestCase {
+	public function tear_down() {
+		delete_option( \Google\Web_Stories\Settings::SETTING_NAME_PUBLISHER_LOGOS );
+
+		parent::tear_down();
+	}
+
 	/**
 	 * @covers ::migrate
 	 */
 	public function test_migrate() {
-		$object = new \Google\Web_Stories\Migrations\Update_Publisher_Logos();
-
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_PUBLISHER_LOGOS, [ 'active' => 123 ] );
 
-		$object->migrate();
+		$instance = $this->injector->make( \Google\Web_Stories\Migrations\Update_Publisher_Logos::class );
+		$instance->migrate();
 
 		$all_publisher_logos   = get_option( \Google\Web_Stories\Settings::SETTING_NAME_PUBLISHER_LOGOS );
 		$active_publisher_logo = (int) get_option( \Google\Web_Stories\Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO );
diff --git a/tests/phpunit/integration/tests/Page_Template_Post_Type.php b/tests/phpunit/integration/tests/Page_Template_Post_Type.php
index b5538d179395..491396d2e185 100644
--- a/tests/phpunit/integration/tests/Page_Template_Post_Type.php
+++ b/tests/phpunit/integration/tests/Page_Template_Post_Type.php
@@ -20,14 +20,15 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Page_Template_Post_Type
  */
-class Page_Template_Post_Type extends TestCase {
+class Page_Template_Post_Type extends DependencyInjectedTestCase {
 	use Capabilities_Setup;
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$story = new \Google\Web_Stories\Story_Post_Type();
-		$story->register();
+		$instance = $this->injector->make( \Google\Web_Stories\Story_Post_Type::class );
+		$instance->register();
 
 		$ptpt = new \Google\Web_Stories\Page_Template_Post_Type();
 		$ptpt->register();
diff --git a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
index 582da3e993e6..f5ac341e2d3f 100644
--- a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
+use Google\Web_Stories\Settings;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use WP_REST_Request;
@@ -298,7 +299,7 @@ public function test_local_url_pretty_permalinks() {
 		// and get_permalink() will return "http://example.org/?web-story=embed-controller-test-story"
 		// instead of "http://example.org/web-stories/embed-controller-test-story/".
 		// @todo Investigate why this is  needed (leakage between tests?)
-		$story_post_type = new Story_Post_Type();
+		$story_post_type = new Story_Post_Type( new Settings() );
 		$story_post_type->register();
 
 		flush_rewrite_rules( false );
@@ -330,7 +331,7 @@ public function test_local_url_pretty_permalinks_multisite() {
 		// and get_permalink() will return "http://example.org/?web-story=embed-controller-test-story"
 		// instead of "http://example.org/web-stories/embed-controller-test-story/".
 		// @todo Investigate why this is  needed (leakage between tests?).
-		$story_post_type = new Story_Post_Type();
+		$story_post_type = new Story_Post_Type( new Settings() );
 		$story_post_type->register();
 
 		flush_rewrite_rules( false );
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
index 99a287c1b0f3..2f3a87d32388 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
+use Google\Web_Stories\Settings;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 
 /**
@@ -92,7 +93,7 @@ public function test_register() {
 	public function test_count_user_posts() {
 		$this->controller->register();
 
-		$post_type = new \Google\Web_Stories\Story_Post_Type();
+		$post_type = new \Google\Web_Stories\Story_Post_Type( new Settings() );
 		$post_type->register();
 
 		$result1 = $this->call_private_method(
@@ -145,7 +146,7 @@ public function test_count_user_posts_invalid() {
 		$this->controller->register();
 
 		$controller = new \Google\Web_Stories\REST_API\Stories_Users_Controller();
-		$post_type  = new \Google\Web_Stories\Story_Post_Type();
+		$post_type  = new \Google\Web_Stories\Story_Post_Type( new Settings() );
 		$post_type->register();
 		$result1 = $this->call_private_method(
 			$controller,
diff --git a/tests/phpunit/integration/tests/Story_Post_Type.php b/tests/phpunit/integration/tests/Story_Post_Type.php
index 625691883230..142d9dc9db90 100644
--- a/tests/phpunit/integration/tests/Story_Post_Type.php
+++ b/tests/phpunit/integration/tests/Story_Post_Type.php
@@ -22,7 +22,7 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Story_Post_Type
  */
-class Story_Post_Type extends TestCase {
+class Story_Post_Type extends DependencyInjectedTestCase {
 	use Capabilities_Setup;
 
 	/**
@@ -88,7 +88,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->instance = new \Google\Web_Stories\Story_Post_Type();
+		$this->instance = $this->injector->make( \Google\Web_Stories\Story_Post_Type::class );
 
 		$this->add_caps_to_roles();
 	}
@@ -177,8 +177,7 @@ public function test_change_default_title() {
 	 * @covers ::get_has_archive
 	 */
 	public function test_get_has_archive_default() {
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'get_has_archive' );
+		$actual = $this->call_private_method( $this->instance, 'get_has_archive' );
 		$this->assertTrue( $actual );
 	}
 
@@ -188,8 +187,7 @@ public function test_get_has_archive_default() {
 	public function test_get_has_archive_disabled() {
 		update_option( Settings::SETTING_NAME_ARCHIVE, 'disabled' );
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'get_has_archive' );
+		$actual = $this->call_private_method( $this->instance, 'get_has_archive' );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 
@@ -202,8 +200,7 @@ public function test_get_has_archive_disabled() {
 	public function test_get_has_archive_custom_but_no_page() {
 		update_option( Settings::SETTING_NAME_ARCHIVE, 'custom' );
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'get_has_archive' );
+		$actual = $this->call_private_method( $this->instance, 'get_has_archive' );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 
@@ -217,8 +214,7 @@ public function test_get_has_archive_custom_but_invalid_page() {
 		update_option( Settings::SETTING_NAME_ARCHIVE, 'custom' );
 		update_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID, PHP_INT_MAX );
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'get_has_archive' );
+		$actual = $this->call_private_method( $this->instance, 'get_has_archive' );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 		delete_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
@@ -233,8 +229,7 @@ public function test_get_has_archive_custom() {
 		update_option( Settings::SETTING_NAME_ARCHIVE, 'custom' );
 		update_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID, self::$archive_page_id );
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'get_has_archive' );
+		$actual = $this->call_private_method( $this->instance, 'get_has_archive' );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 		delete_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
@@ -257,8 +252,7 @@ public function test_get_has_archive_custom_not_published() {
 			]
 		);
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'get_has_archive' );
+		$actual = $this->call_private_method( $this->instance, 'get_has_archive' );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 		delete_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
@@ -340,8 +334,7 @@ public function test_pre_get_posts_custom_archive_not_published() {
 	 * @covers ::filter_display_post_states
 	 */
 	public function test_filter_display_post_states() {
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'filter_display_post_states', [ [], get_post( self::$archive_page_id ) ] );
+		$actual = $this->call_private_method( $this->instance, 'filter_display_post_states', [ [], get_post( self::$archive_page_id ) ] );
 
 		$this->assertSame( [], $actual );
 	}
@@ -353,8 +346,7 @@ public function test_filter_display_post_states_custom_archive() {
 		update_option( Settings::SETTING_NAME_ARCHIVE, 'custom' );
 		update_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID, self::$archive_page_id );
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'filter_display_post_states', [ [], get_post( self::$archive_page_id ) ] );
+		$actual = $this->call_private_method( $this->instance, 'filter_display_post_states', [ [], get_post( self::$archive_page_id ) ] );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 		delete_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
@@ -380,8 +372,7 @@ public function test_filter_display_post_states_custom_archive_not_published() {
 			]
 		);
 
-		$story_post_type = new \Google\Web_Stories\Story_Post_Type();
-		$actual          = $this->call_private_method( $story_post_type, 'filter_display_post_states', [ [], get_post( self::$archive_page_id ) ] );
+		$actual = $this->call_private_method( $this->instance, 'filter_display_post_states', [ [], get_post( self::$archive_page_id ) ] );
 
 		delete_option( Settings::SETTING_NAME_ARCHIVE );
 		delete_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
diff --git a/tests/phpunit/integration/tests/Tracking.php b/tests/phpunit/integration/tests/Tracking.php
index 064b68977a80..0029433ad61a 100644
--- a/tests/phpunit/integration/tests/Tracking.php
+++ b/tests/phpunit/integration/tests/Tracking.php
@@ -17,12 +17,44 @@
 
 namespace Google\Web_Stories\Tests\Integration;
 
+use Google\Web_Stories\Integrations\Site_Kit;
+
 /**
  * @coversDefaultClass \Google\Web_Stories\Tracking
  */
 class Tracking extends TestCase {
 	protected static $user_id;
 
+	/**
+	 * @var Site_Kit
+	 */
+	private $site_kit;
+
+	/**
+	 * @var \Google\Web_Stories\Experiments
+	 */
+	private $experiments;
+
+	/**
+	 * @var \Google\Web_Stories\Assets
+	 */
+	private $assets;
+
+	/**
+	 * @var \Google\Web_Stories\Settings
+	 */
+	private $settings;
+
+	/**
+	 * @var \Google\Web_Stories\User\Preferences
+	 */
+	private $preferences;
+
+	/**
+	 * @var \Google\Web_Stories\Tracking
+	 */
+	private $instance;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$user_id = $factory->user->create(
 			[
@@ -31,12 +63,22 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
+		$this->site_kit    = $this->createMock( \Google\Web_Stories\Integrations\Site_Kit::class );
+		$this->assets      = new \Google\Web_Stories\Assets();
+		$this->settings    = new \Google\Web_Stories\Settings();
+		$this->preferences = new \Google\Web_Stories\User\Preferences();
+		$this->instance    = new \Google\Web_Stories\Tracking( $this->experiments, $this->site_kit, $this->assets, $this->settings, $this->preferences );
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register_tracking_script() {
-		$site_kit = $this->createMock( \Google\Web_Stories\Integrations\Site_Kit::class );
-		$site_kit->method( 'get_plugin_status' )->willReturn(
+		$this->site_kit->method( 'get_plugin_status' )->willReturn(
 			[
 				'installed'       => true,
 				'active'          => true,
@@ -44,13 +86,11 @@ public function test_register_tracking_script() {
 				'link'            => 'https://example.com',
 			]
 		);
-
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_enabled_experiments' )
+		$this->experiments->method( 'get_enabled_experiments' )
 					->willReturn( [ 'enableFoo', 'enableBar' ] );
-		$assets   = new \Google\Web_Stories\Assets();
-		$tracking = new \Google\Web_Stories\Tracking( $experiments, $site_kit, $assets );
-		$tracking->register();
+
+		$this->instance->register();
+
 		$this->assertTrue( wp_script_is( \Google\Web_Stories\Tracking::SCRIPT_HANDLE, 'registered' ) );
 		$this->assertFalse( wp_scripts()->registered[ \Google\Web_Stories\Tracking::SCRIPT_HANDLE ]->src );
 		$after = wp_scripts()->get_data( \Google\Web_Stories\Tracking::SCRIPT_HANDLE, 'after' );
@@ -63,8 +103,7 @@ public function test_register_tracking_script() {
 	public function test_get_settings() {
 		wp_set_current_user( self::$user_id );
 
-		$site_kit = $this->createMock( \Google\Web_Stories\Integrations\Site_Kit::class );
-		$site_kit->method( 'get_plugin_status' )->willReturn(
+		$this->site_kit->method( 'get_plugin_status' )->willReturn(
 			[
 				'installed'       => true,
 				'active'          => true,
@@ -72,12 +111,10 @@ public function test_get_settings() {
 				'link'            => 'https://example.com',
 			]
 		);
-
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_enabled_experiments' )
+		$this->experiments->method( 'get_enabled_experiments' )
 					->willReturn( [ 'enableFoo', 'enableBar' ] );
-		$assets   = new \Google\Web_Stories\Assets();
-		$settings = ( new \Google\Web_Stories\Tracking( $experiments, $site_kit, $assets ) )->get_settings();
+
+		$settings = $this->instance->get_settings();
 
 		$this->assertArrayHasKey( 'trackingAllowed', $settings );
 		$this->assertArrayHasKey( 'trackingId', $settings );
@@ -120,8 +157,7 @@ public function test_get_settings_with_optin() {
 		wp_set_current_user( self::$user_id );
 		add_user_meta( get_current_user_id(), \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, true );
 
-		$site_kit = $this->createMock( \Google\Web_Stories\Integrations\Site_Kit::class );
-		$site_kit->method( 'get_plugin_status' )->willReturn(
+		$this->site_kit->method( 'get_plugin_status' )->willReturn(
 			[
 				'installed'       => true,
 				'active'          => true,
@@ -129,12 +165,10 @@ public function test_get_settings_with_optin() {
 				'link'            => 'https://example.com',
 			]
 		);
-
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_enabled_experiments' )
+		$this->experiments->method( 'get_enabled_experiments' )
 					->willReturn( [ 'enableFoo', 'enableBar' ] );
-		$assets           = new \Google\Web_Stories\Assets();
-		$settings         = ( new \Google\Web_Stories\Tracking( $experiments, $site_kit, $assets ) )->get_settings();
+
+		$settings         = $this->instance->get_settings();
 		$tracking_allowed = $settings['trackingAllowed'];
 
 		delete_user_meta( get_current_user_id(), \Google\Web_Stories\User\Preferences::OPTIN_META_KEY );

From 6e8263fbc92b32cc6aae90d3f566850cf786f53a Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 30 Sep 2021 20:10:17 +0200
Subject: [PATCH 20/41] Some cleanup

---
 includes/Admin/Cross_Origin_Isolation.php      |  2 ++
 includes/KSES.php                              |  2 ++
 includes/Tracking.php                          | 13 +------------
 .../integration/tests/User/Preferences.php     | 18 ++++++++++++------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/includes/Admin/Cross_Origin_Isolation.php b/includes/Admin/Cross_Origin_Isolation.php
index 96dcc21b5018..87a8fe39110b 100644
--- a/includes/Admin/Cross_Origin_Isolation.php
+++ b/includes/Admin/Cross_Origin_Isolation.php
@@ -107,6 +107,8 @@ public static function is_needed(): bool {
 	/**
 	 * Get the list of service IDs required for this service to be registered.
 	 *
+	 * Needed because the service is used in the static `is_needed()` method.
+	 *
 	 * @since 1.12.0
 	 *
 	 * @return string[] List of required services.
diff --git a/includes/KSES.php b/includes/KSES.php
index e358a8f2dbe5..a92a3f40f1c8 100644
--- a/includes/KSES.php
+++ b/includes/KSES.php
@@ -72,6 +72,8 @@ public static function get_registration_action_priority(): int {
 	/**
 	 * Get the list of service IDs required for this service to be registered.
 	 *
+	 * @todo Inject post type instance via constructor instead.
+	 *
 	 * @since 1.12.0
 	 *
 	 * @return string[] List of required services.
diff --git a/includes/Tracking.php b/includes/Tracking.php
index 9a883deb1f76..cf6d08e14623 100644
--- a/includes/Tracking.php
+++ b/includes/Tracking.php
@@ -35,7 +35,7 @@
 /**
  * Tracking class.
  */
-class Tracking extends Service_Base implements HasRequirements {
+class Tracking extends Service_Base {
 	/**
 	 * Web Stories tracking script handle.
 	 *
@@ -153,17 +153,6 @@ public static function get_registration_action(): string {
 		return 'admin_init';
 	}
 
-	/**
-	 * Get the list of service IDs required for this service to be registered.
-	 *
-	 * @since 1.12.0
-	 *
-	 * @return string[] List of required services.
-	 */
-	public static function get_requirements(): array {
-		return [ 'user_preferences' ];
-	}
-
 	/**
 	 * Returns tracking settings to pass to the inline script.
 	 *
diff --git a/tests/phpunit/integration/tests/User/Preferences.php b/tests/phpunit/integration/tests/User/Preferences.php
index 3fdaa3e40734..60f0ca39a554 100644
--- a/tests/phpunit/integration/tests/User/Preferences.php
+++ b/tests/phpunit/integration/tests/User/Preferences.php
@@ -46,6 +46,11 @@ class Preferences extends TestCase {
 	 */
 	private $instance;
 
+	/**
+	 * @var Stories_Users_Controller
+	 */
+	private $users_controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$admin_id = $factory->user->create(
 			[
@@ -69,7 +74,8 @@ public function set_up() {
 		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 
-		$this->instance = new \Google\Web_Stories\User\Preferences();
+		$this->instance         = new \Google\Web_Stories\User\Preferences();
+		$this->users_controller = new Stories_Users_Controller();
 	}
 
 	public function tear_down() {
@@ -90,7 +96,7 @@ public function tear_down() {
 	 */
 	public function test_add_optin_field_to_rest_api() {
 		$this->instance->register();
-		( new Stories_Users_Controller() )->register();
+		$this->users_controller->register();
 
 		wp_set_current_user( self::$admin_id );
 
@@ -116,7 +122,7 @@ public function test_add_optin_field_to_rest_api() {
 	 */
 	public function test_add_optin_field_to_rest_api_for_author_user() {
 		$this->instance->register();
-		( new Stories_Users_Controller() )->register();
+		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
@@ -142,7 +148,7 @@ public function test_add_optin_field_to_rest_api_for_author_user() {
 	 */
 	public function test_enables_author_user_to_update_meta_field() {
 		$this->instance->register();
-		( new Stories_Users_Controller() )->register();
+		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
@@ -180,7 +186,7 @@ public function test_enables_author_user_to_update_meta_field() {
 	 */
 	public function test_permission_check_for_authors() {
 		$this->instance->register();
-		( new Stories_Users_Controller() )->register();
+		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
@@ -217,7 +223,7 @@ public function test_permission_check_for_authors() {
 	 */
 	public function test_enables_author_user_to_invalid_type() {
 		$this->instance->register();
-		( new Stories_Users_Controller() )->register();
+		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 

From 371dff48feb4a99f78b8c5aed4b7c0307492a84e Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 30 Sep 2021 20:24:34 +0200
Subject: [PATCH 21/41] Delete user meta in tear down to prevent leaking

---
 .../integration/tests/Admin/Cross_Origin_Isolation.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
index bf62780f3ffd..ba34e8291ff5 100644
--- a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
+++ b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
@@ -60,6 +60,13 @@ public function set_up() {
 		$this->instance = $this->injector->make( \Google\Web_Stories\Admin\Cross_Origin_Isolation::class );
 	}
 
+	public function tear_down() {
+		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+		delete_user_meta( self::$contributor_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+
+		parent::tear_down();
+	}
+
 	/**
 	 * @covers ::register
 	 */
@@ -77,8 +84,6 @@ public function test_register() {
 		$this->assertSame( 10, has_filter( 'style_loader_tag', [ $this->instance, 'style_loader_tag' ] ) );
 		$this->assertSame( 10, has_filter( 'script_loader_tag', [ $this->instance, 'script_loader_tag' ] ) );
 		$this->assertSame( 10, has_filter( 'get_avatar', [ $this->instance, 'get_avatar' ] ) );
-
-		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
 	}
 
 	/**
@@ -96,7 +101,6 @@ public function test_is_needed() {
 	 */
 	public function test_is_needed_default_user_meta_value() {
 		wp_set_current_user( self::$admin_id );
-		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
 
 		$this->assertTrue( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}

From 431bc407ed35597c12877678b4a1c60fa6c66c67 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 30 Sep 2021 21:27:38 +0200
Subject: [PATCH 22/41] More dependency injection

---
 .../tests/Block/Web_Stories_Block.php         | 54 ++++++--------
 .../integration/tests/Media/Video/Muting.php  | 47 +++++++-----
 .../integration/tests/Media/Video/Poster.php  | 71 ++++++++++---------
 .../Stories_Taxonomies_Controller.php         |  2 +-
 .../integration/tests/User/Preferences.php    |  1 -
 5 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/tests/phpunit/integration/tests/Block/Web_Stories_Block.php b/tests/phpunit/integration/tests/Block/Web_Stories_Block.php
index 708875d891e8..6858b6c4829f 100644
--- a/tests/phpunit/integration/tests/Block/Web_Stories_Block.php
+++ b/tests/phpunit/integration/tests/Block/Web_Stories_Block.php
@@ -19,13 +19,25 @@
 
 use Google\Web_Stories\Assets;
 use Google\Web_Stories\Block\Web_Stories_Block as Block;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 use WP_Block_Type_Registry;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Block\Web_Stories_Block
  */
-class Web_Stories_Block extends TestCase {
+class Web_Stories_Block extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Block\Web_Stories_Block
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Block\Web_Stories_Block::class );
+	}
+
 	public function tear_down() {
 		unregister_block_type( 'web-stories/embed' );
 
@@ -47,18 +59,14 @@ public function test_registers_block_type() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Embed::render
 	 */
 	public function test_render_block() {
-		$assets      = new Assets();
-		$embed_block = new Block( $assets );
-
-		$actual = $embed_block->render_block(
+		$actual = $this->instance->render_block(
 			[
 				'url'    => 'https://example.com/story.html',
 				'title'  => 'Example Story',
 				'align'  => 'none',
 				'width'  => 360,
 				'height' => 600,
-			],
-			''
+			]
 		);
 
 		$this->assertStringContainsString( '<amp-story-player', $actual );
@@ -71,18 +79,14 @@ public function test_render_block() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Embed::render
 	 */
 	public function test_render_block_missing_url() {
-		$assets      = new Assets();
-		$embed_block = new Block( $assets );
-
-		$actual = $embed_block->render_block(
+		$actual = $this->instance->render_block(
 			[
 				'url'    => '',
 				'title'  => 'Example Story',
 				'align'  => 'none',
 				'width'  => 360,
 				'height' => 600,
-			],
-			''
+			]
 		);
 
 		$this->assertEmpty( $actual );
@@ -95,18 +99,14 @@ public function test_render_block_missing_url() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Embed::render
 	 */
 	public function test_render_block_missing_title() {
-		$assets      = new Assets();
-		$embed_block = new Block( $assets );
-
-		$actual = $embed_block->render_block(
+		$actual = $this->instance->render_block(
 			[
 				'url'    => 'https://example.com/story.html',
 				'title'  => '',
 				'align'  => 'none',
 				'width'  => 360,
 				'height' => 600,
-			],
-			''
+			]
 		);
 
 		$this->assertStringContainsString( __( 'Web Story', 'web-stories' ), $actual );
@@ -119,17 +119,13 @@ public function test_render_block_missing_title() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Image::render
 	 */
 	public function test_render_block_feed_no_poster() {
-		$assets      = new Assets();
-		$embed_block = new Block( $assets );
-
 		$this->go_to( '/?feed=rss2' );
 
-		$actual = $embed_block->render_block(
+		$actual = $this->instance->render_block(
 			[
 				'url'   => 'https://example.com/story.html',
 				'title' => 'Example Story',
-			],
-			''
+			]
 		);
 
 		$this->assertStringNotContainsString( '<amp-story-player', $actual );
@@ -143,20 +139,16 @@ public function test_render_block_feed_no_poster() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Image::render
 	 */
 	public function test_render_block_with_poster() {
-		$assets      = new Assets();
-		$embed_block = new Block( $assets );
-
 		$this->go_to( '/?feed=rss2' );
 
-		$actual = $embed_block->render_block(
+		$actual = $this->instance->render_block(
 			[
 				'url'    => 'https://example.com/story.html',
 				'title'  => 'Example Story',
 				'poster' => 'https://example.com/story.jpg',
 				'width'  => 360,
 				'height' => 600,
-			],
-			''
+			]
 		);
 
 		$this->assertStringNotContainsString( '<amp-story-player', $actual );
diff --git a/tests/phpunit/integration/tests/Media/Video/Muting.php b/tests/phpunit/integration/tests/Media/Video/Muting.php
index c5231a394b17..a22540e43476 100644
--- a/tests/phpunit/integration/tests/Media/Video/Muting.php
+++ b/tests/phpunit/integration/tests/Media/Video/Muting.php
@@ -17,27 +17,38 @@
 
 namespace Google\Web_Stories\Tests\Integration\Media\Video;
 
-use Google\Web_Stories\Tests\Integration\TestCase;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use WP_REST_Request;
+use WP_REST_Server;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Media\Video\Muting
  */
-class Muting extends TestCase {
+class Muting extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Media\Video\Muting
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Media\Video\Muting::class );
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$video_muting = new \Google\Web_Stories\Media\Video\Muting();
-		$video_muting->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_action( 'rest_api_init', [ $video_muting, 'rest_api_init' ] ) );
+		$this->assertSame( 10, has_action( 'rest_api_init', [ $this->instance, 'rest_api_init' ] ) );
 		$this->assertSame(
 			10,
 			has_filter(
 				'wp_prepare_attachment_for_js',
 				[
-					$video_muting,
+					$this->instance,
 					'wp_prepare_attachment_for_js',
 				]
 			)
@@ -48,8 +59,7 @@ public function test_register() {
 	 * @covers ::register_meta
 	 */
 	public function test_register_meta() {
-		$video_muting = new \Google\Web_Stories\Media\Video\Muting();
-		$this->call_private_method( $video_muting, 'register_meta' );
+		$this->call_private_method( $this->instance, 'register_meta' );
 
 		$this->assertTrue( registered_meta_key_exists( 'post', \Google\Web_Stories\Media\Video\Muting::IS_MUTED_POST_META_KEY, 'attachment' ) );
 		$this->assertTrue( registered_meta_key_exists( 'post', \Google\Web_Stories\Media\Video\Muting::MUTED_ID_POST_META_KEY, 'attachment' ) );
@@ -80,15 +90,15 @@ public function test_wp_prepare_attachment_for_js() {
 
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
 
-		$video_muting = new \Google\Web_Stories\Media\Video\Muting();
-		$image        = $video_muting->wp_prepare_attachment_for_js(
+
+		$image = $this->instance->wp_prepare_attachment_for_js(
 			[
 				'id'   => $poster_attachment_id,
 				'type' => 'image',
 				'url'  => wp_get_attachment_url( $poster_attachment_id ),
 			]
 		);
-		$video        = $video_muting->wp_prepare_attachment_for_js(
+		$video = $this->instance->wp_prepare_attachment_for_js(
 			[
 				'id'   => $video_attachment_id,
 				'type' => 'video',
@@ -106,6 +116,7 @@ public function test_wp_prepare_attachment_for_js() {
 	 */
 	public function test_rest_api_init() {
 		wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
+
 		$video_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/uploads/test-video.mp4',
@@ -115,7 +126,7 @@ public function test_rest_api_init() {
 			]
 		);
 
-		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, sprintf( '/web-stories/v1/media/%d', $video_attachment_id ) );
+		$request  = new WP_REST_Request( WP_REST_Server::READABLE, sprintf( '/web-stories/v1/media/%d', $video_attachment_id ) );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
@@ -127,7 +138,6 @@ public function test_rest_api_init() {
 	 * @covers ::get_callback_is_muted
 	 */
 	public function test_get_callback_is_muted() {
-		$video_muting        = new \Google\Web_Stories\Media\Video\Muting();
 		$video_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/uploads/test-video.mp4',
@@ -137,7 +147,7 @@ public function test_get_callback_is_muted() {
 			]
 		);
 		update_post_meta( $video_attachment_id, \Google\Web_Stories\Media\Video\Muting::IS_MUTED_POST_META_KEY, '1' );
-		$result = $video_muting->get_callback_is_muted( [ 'id' => $video_attachment_id ] );
+		$result = $this->instance->get_callback_is_muted( [ 'id' => $video_attachment_id ] );
 		$this->assertTrue( $result );
 	}
 
@@ -146,7 +156,7 @@ public function test_get_callback_is_muted() {
 	 */
 	public function test_update_callback_is_muted() {
 		wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
-		$video_muting        = new \Google\Web_Stories\Media\Video\Muting();
+
 		$video_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/uploads/test-video.mp4',
@@ -156,9 +166,9 @@ public function test_update_callback_is_muted() {
 			]
 		);
 
-		$result = $video_muting->update_callback_is_muted( true, get_post( $video_attachment_id ) );
+		$result = $this->instance->update_callback_is_muted( true, get_post( $video_attachment_id ) );
 		$this->assertTrue( $result );
-		$result = $video_muting->update_callback_is_muted( true, get_post( $video_attachment_id ) );
+		$result = $this->instance->update_callback_is_muted( true, get_post( $video_attachment_id ) );
 		$this->assertFalse( $result );
 	}
 
@@ -166,7 +176,6 @@ public function test_update_callback_is_muted() {
 	 * @covers ::update_callback_is_muted
 	 */
 	public function test_update_callback_is_muted_error() {
-		$video_muting        = new \Google\Web_Stories\Media\Video\Muting();
 		$video_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/uploads/test-video.mp4',
@@ -176,7 +185,7 @@ public function test_update_callback_is_muted_error() {
 			]
 		);
 
-		$result = $video_muting->update_callback_is_muted( true, get_post( $video_attachment_id ) );
+		$result = $this->instance->update_callback_is_muted( true, get_post( $video_attachment_id ) );
 		$this->assertInstanceOf( 'WP_Error', $result );
 	}
 }
diff --git a/tests/phpunit/integration/tests/Media/Video/Poster.php b/tests/phpunit/integration/tests/Media/Video/Poster.php
index c22be409b000..534ea23be9d5 100644
--- a/tests/phpunit/integration/tests/Media/Video/Poster.php
+++ b/tests/phpunit/integration/tests/Media/Video/Poster.php
@@ -18,33 +18,42 @@
 namespace Google\Web_Stories\Tests\Integration\Media\Video;
 
 use Google\Web_Stories\Media\Media_Source_Taxonomy;
+use Google\Web_Stories\Services;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 use WP_REST_Request;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Media\Video\Poster
  */
-class Poster extends TestCase {
+class Poster extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Media\Video\Poster
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Media\Video\Poster::class );
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$media_source = new Media_Source_Taxonomy();
-		$poster       = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$poster->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_action( 'rest_api_init', [ $poster, 'rest_api_init' ] ) );
-		$this->assertSame( 10, has_action( 'delete_attachment', [ $poster, 'delete_video_poster' ] ) );
-		$this->assertSame( 10, has_filter( 'wp_prepare_attachment_for_js', [ $poster, 'wp_prepare_attachment_for_js' ] ) );
+		$this->assertSame( 10, has_action( 'rest_api_init', [ $this->instance, 'rest_api_init' ] ) );
+		$this->assertSame( 10, has_action( 'delete_attachment', [ $this->instance, 'delete_video_poster' ] ) );
+		$this->assertSame( 10, has_filter( 'wp_prepare_attachment_for_js', [ $this->instance, 'wp_prepare_attachment_for_js' ] ) );
 	}
 
 	/**
 	 * @covers ::register_meta
 	 */
 	public function test_register_meta() {
-		$media_source = new Media_Source_Taxonomy();
-		$poster       = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$this->call_private_method( $poster, 'register_meta' );
+		$this->call_private_method( $this->instance, 'register_meta' );
 
 		$this->assertTrue( registered_meta_key_exists( 'post', \Google\Web_Stories\Media\Video\Poster::POSTER_ID_POST_META_KEY, 'attachment' ) );
 		$this->assertFalse( registered_meta_key_exists( 'post', \Google\Web_Stories\Media\Video\Poster::POSTER_POST_META_KEY, 'attachment' ) );
@@ -107,9 +116,7 @@ public function test_wp_prepare_attachment_for_js() {
 
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
 
-		$media_source = new Media_Source_Taxonomy();
-		$poster       = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$image        = $poster->wp_prepare_attachment_for_js(
+		$image = $this->instance->wp_prepare_attachment_for_js(
 			[
 				'id'   => $poster_attachment_id,
 				'type' => 'image',
@@ -117,7 +124,7 @@ public function test_wp_prepare_attachment_for_js() {
 			],
 			get_post( $poster_attachment_id )
 		);
-		$video        = $poster->wp_prepare_attachment_for_js(
+		$video = $this->instance->wp_prepare_attachment_for_js(
 			[
 				'id'   => $video_attachment_id,
 				'type' => 'video',
@@ -144,9 +151,9 @@ public function test_get_thumbnail_data() {
 				'post_title'     => 'Test Image',
 			]
 		);
-		$media_source  = new Media_Source_Taxonomy();
-		$poster        = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$result        = $poster->get_thumbnail_data( $attachment_id );
+
+		$result = $this->instance->get_thumbnail_data( $attachment_id );
+
 		$this->assertCount( 4, $result );
 		$this->assertArrayHasKey( 'src', $result );
 		$this->assertArrayHasKey( 'width', $result );
@@ -168,11 +175,9 @@ public function test_get_thumbnail_data_generated() {
 			]
 		);
 
-		$media_source = new Media_Source_Taxonomy();
-		wp_set_object_terms( $poster_attachment_id, 'poster-generation', $media_source->get_taxonomy_slug() );
+		wp_set_object_terms( $poster_attachment_id, 'poster-generation', Services::get( 'media.media_source' )->get_taxonomy_slug() );
 
-		$poster = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$result = $poster->get_thumbnail_data( $poster_attachment_id );
+		$result = $this->instance->get_thumbnail_data( $poster_attachment_id );
 		$this->assertTrue( $result['generated'] );
 	}
 
@@ -198,13 +203,11 @@ public function test_delete_video_poster() {
 			]
 		);
 
-		$media_source = new Media_Source_Taxonomy();
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
-		wp_set_object_terms( $poster_attachment_id, 'poster-generation', $media_source->get_taxonomy_slug() );
+		wp_set_object_terms( $poster_attachment_id, 'poster-generation', Services::get( 'media.media_source' )->get_taxonomy_slug() );
 		add_post_meta( $video_attachment_id, \Google\Web_Stories\Media\Video\Poster::POSTER_ID_POST_META_KEY, $poster_attachment_id );
 
-		$poster = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$poster->delete_video_poster( $video_attachment_id );
+		$this->instance->delete_video_poster( $video_attachment_id );
 		$this->assertNull( get_post( $poster_attachment_id ) );
 	}
 
@@ -229,10 +232,10 @@ public function test_delete_video_poster_no_generated_poster() {
 				'post_title'     => 'Test Image',
 			]
 		);
+
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
-		$media_source = new Media_Source_Taxonomy();
-		$poster       = new \Google\Web_Stories\Media\Video\Poster( $media_source );
-		$poster->delete_video_poster( $video_attachment_id );
+
+		$this->instance->delete_video_poster( $video_attachment_id );
 		$this->assertNotNull( get_post( $poster_attachment_id ) );
 	}
 
@@ -278,18 +281,16 @@ public function test_is_poster() {
 				'post_title'     => 'Test Image',
 			]
 		);
-		$media_source         = new Media_Source_Taxonomy();
-		$poster               = new \Google\Web_Stories\Media\Video\Poster( $media_source );
 
-		$result1 = $this->call_private_method( $poster, 'is_poster', [ $poster_attachment_id ] );
+		$result1 = $this->call_private_method( $this->instance, 'is_poster', [ $poster_attachment_id ] );
 		$this->assertFalse( $result1 );
 
-		wp_set_object_terms( $poster_attachment_id, 'editor', $media_source->get_taxonomy_slug() );
-		$result2 = $this->call_private_method( $poster, 'is_poster', [ $poster_attachment_id ] );
+		wp_set_object_terms( $poster_attachment_id, 'editor', Services::get( 'media.media_source' )->get_taxonomy_slug() );
+		$result2 = $this->call_private_method( $this->instance, 'is_poster', [ $poster_attachment_id ] );
 		$this->assertFalse( $result2 );
 
-		wp_set_object_terms( $poster_attachment_id, 'poster-generation', $media_source->get_taxonomy_slug() );
-		$result3 = $this->call_private_method( $poster, 'is_poster', [ $poster_attachment_id ] );
+		wp_set_object_terms( $poster_attachment_id, 'poster-generation', Services::get( 'media.media_source' )->get_taxonomy_slug() );
+		$result3 = $this->call_private_method( $this->instance, 'is_poster', [ $poster_attachment_id ] );
 		$this->assertTrue( $result3 );
 	}
 }
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
index 020be5475091..7198cde0a60b 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
@@ -4,9 +4,9 @@
 
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Google\Web_Stories\Tests\Integration\Fixture\DummyTaxonomy;
-use Spy_REST_Server;
 use WP_REST_Request;
 use WP_REST_Server;
+
 /**
  * Class Stories_Taxonomies_Controller
  *
diff --git a/tests/phpunit/integration/tests/User/Preferences.php b/tests/phpunit/integration/tests/User/Preferences.php
index 60f0ca39a554..ceef4d529cd9 100644
--- a/tests/phpunit/integration/tests/User/Preferences.php
+++ b/tests/phpunit/integration/tests/User/Preferences.php
@@ -65,7 +65,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
-
 	public function set_up() {
 		parent::set_up();
 

From 11782d4819294c2f0a61b0b6c0bd0e9cb47d079f Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 10:24:34 +0200
Subject: [PATCH 23/41] Further improve tests

---
 .../tests/Media/Media_Source_Taxonomy.php     | 92 ++++++++++---------
 .../integration/tests/User/Preferences.php    | 35 ++-----
 2 files changed, 59 insertions(+), 68 deletions(-)

diff --git a/tests/phpunit/integration/tests/Media/Media_Source_Taxonomy.php b/tests/phpunit/integration/tests/Media/Media_Source_Taxonomy.php
index e7fa54fdba5b..79dfa819a6ca 100644
--- a/tests/phpunit/integration/tests/Media/Media_Source_Taxonomy.php
+++ b/tests/phpunit/integration/tests/Media/Media_Source_Taxonomy.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\Media;
 
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 use WP_Query;
 use WP_REST_Request;
@@ -24,43 +25,54 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Media\Media_Source_Taxonomy
  */
-class Media_Source_Taxonomy extends TestCase {
+class Media_Source_Taxonomy extends DependencyInjectedTestCase {
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\Media\Media_Source_Taxonomy
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Media\Media_Source_Taxonomy::class );
+	}
 
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$media_source->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_action( 'rest_api_init', [ $media_source, 'rest_api_init' ] ) );
+		$this->assertSame( 10, has_action( 'rest_api_init', [ $this->instance, 'rest_api_init' ] ) );
 		$this->assertSame(
 			10,
 			has_filter(
 				'wp_prepare_attachment_for_js',
 				[
-					$media_source,
+					$this->instance,
 					'wp_prepare_attachment_for_js',
-				] 
-			) 
+				]
+			)
 		);
 		$this->assertSame(
 			10,
 			has_filter(
 				'ajax_query_attachments_args',
 				[
-					$media_source,
+					$this->instance,
 					'filter_ajax_query_attachments_args',
-				] 
-			) 
+				]
+			)
 		);
-		$this->assertSame( 10, has_filter( 'pre_get_posts', [ $media_source, 'filter_generated_media_attachments' ] ) );
+		$this->assertSame( 10, has_filter( 'pre_get_posts', [ $this->instance, 'filter_generated_media_attachments' ] ) );
 		$this->assertSame(
 			10,
 			has_filter(
 				'web_stories_rest_attachment_query',
 				[
-					$media_source,
+					$this->instance,
 					'filter_rest_generated_media_attachments',
 				]
 			)
@@ -71,19 +83,17 @@ public function test_register() {
 	 * @covers ::register_taxonomy
 	 */
 	public function test_register_taxonomy() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$this->call_private_method( $media_source, 'register_taxonomy' );
+		$this->call_private_method( $this->instance, 'register_taxonomy' );
 
-		$this->assertTrue( taxonomy_exists( $media_source->get_taxonomy_slug() ) );
+		$this->assertTrue( taxonomy_exists( $this->instance->get_taxonomy_slug() ) );
 	}
 
 	/**
 	 * @covers ::rest_api_init
 	 */
 	public function test_rest_api_init() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-
 		wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
+
 		$poster_attachment_id = self::factory()->attachment->create_object(
 			[
 				'file'           => DIR_TESTDATA . '/images/canola.jpg',
@@ -102,9 +112,9 @@ public function test_rest_api_init() {
 		);
 
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
-		wp_set_object_terms( $video_attachment_id, 'editor', $media_source->get_taxonomy_slug() );
+		wp_set_object_terms( $video_attachment_id, 'editor', $this->instance->get_taxonomy_slug() );
 
-		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, sprintf( '/web-stories/v1/media/%d', $video_attachment_id ) );
+		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, sprintf( '/wp/v2/media/%d', $video_attachment_id ) );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
@@ -136,8 +146,7 @@ public function test_wp_prepare_attachment_for_js() {
 
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
 
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$image        = $media_source->wp_prepare_attachment_for_js(
+		$image = $this->instance->wp_prepare_attachment_for_js(
 			[
 				'id'   => $poster_attachment_id,
 				'type' => 'image',
@@ -145,7 +154,7 @@ public function test_wp_prepare_attachment_for_js() {
 			],
 			get_post( $poster_attachment_id )
 		);
-		$video        = $media_source->wp_prepare_attachment_for_js(
+		$video = $this->instance->wp_prepare_attachment_for_js(
 			[
 				'id'   => $video_attachment_id,
 				'type' => 'video',
@@ -174,8 +183,7 @@ public function test_wp_prepare_attachment_for_js() {
 	 * @covers ::get_exclude_tax_query
 	 */
 	public function test_filter_ajax_query_attachments_args() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$tax_slug     = $media_source->get_taxonomy_slug();
+		$tax_slug = $this->instance->get_taxonomy_slug();
 
 		$expected = [
 			'tax_query' => [
@@ -189,7 +197,7 @@ public function test_filter_ajax_query_attachments_args() {
 		];
 
 
-		$actual = $media_source->filter_ajax_query_attachments_args( [] );
+		$actual = $this->instance->filter_ajax_query_attachments_args( [] );
 
 		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
@@ -199,9 +207,9 @@ public function test_filter_ajax_query_attachments_args() {
 	 * @covers ::get_exclude_tax_query
 	 */
 	public function test_filter_ajax_query_attachments_args_existing_tax_query() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$tax_slug     = $media_source->get_taxonomy_slug();
-		$expected     = [
+		$tax_slug = $this->instance->get_taxonomy_slug();
+
+		$expected = [
 			'tax_query' => [
 				[
 					'taxonomy' => $tax_slug,
@@ -221,7 +229,7 @@ public function test_filter_ajax_query_attachments_args_existing_tax_query() {
 		];
 
 
-		$actual = $media_source->filter_ajax_query_attachments_args(
+		$actual = $this->instance->filter_ajax_query_attachments_args(
 			[
 				'tax_query' => [
 					[
@@ -244,8 +252,7 @@ public function test_filter_generated_media_attachments_no_screen() {
 		$query    = new WP_Query();
 		$expected = $query->get( 'tax_query' );
 
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$media_source->filter_generated_media_attachments( $query );
+		$this->instance->filter_generated_media_attachments( $query );
 		$actual = $query->get( 'tax_query' );
 
 		$this->assertSame( $expected, $actual );
@@ -260,8 +267,8 @@ public function test_filter_generated_media_attachments_not_main_query() {
 		$query    = new WP_Query();
 		$expected = $query->get( 'tax_query' );
 
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$media_source->filter_generated_media_attachments( $query );
+
+		$this->instance->filter_generated_media_attachments( $query );
 		$actual = $query->get( 'tax_query' );
 
 		$this->assertSame( $expected, $actual );
@@ -277,8 +284,7 @@ public function test_filter_generated_media_attachments_not_upload_screen() {
 		$GLOBALS['wp_the_query'] = $query;
 		$expected                = $query->get( 'tax_query' );
 
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$media_source->filter_generated_media_attachments( $query );
+		$this->instance->filter_generated_media_attachments( $query );
 		$actual = $query->get( 'tax_query' );
 
 		$this->assertSame( $expected, $actual );
@@ -288,10 +294,10 @@ public function test_filter_generated_media_attachments_not_upload_screen() {
 	 * @covers ::filter_generated_media_attachments
 	 */
 	public function test_filter_generated_media_attachmentss() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$expected     = [
+
+		$expected = [
 			[
-				'taxonomy' => $media_source->get_taxonomy_slug(),
+				'taxonomy' => $this->instance->get_taxonomy_slug(),
 				'field'    => 'slug',
 				'terms'    => [ 'poster-generation', 'source-video', 'source-image' ],
 				'operator' => 'NOT IN',
@@ -322,7 +328,7 @@ public function test_filter_generated_media_attachmentss() {
 			]
 		);
 
-		$media_source->filter_generated_media_attachments( $query );
+		$this->instance->filter_generated_media_attachments( $query );
 		$actual = $query->get( 'tax_query' );
 
 		$this->assertEqualSetsWithIndex( $expected, $actual );
@@ -332,9 +338,9 @@ public function test_filter_generated_media_attachmentss() {
 	 * @covers ::filter_rest_generated_media_attachments
 	 */
 	public function test_filter_rest_generated_media_attachments() {
-		$media_source = new \Google\Web_Stories\Media\Media_Source_Taxonomy();
-		$tax_slug     = $media_source->get_taxonomy_slug();
-		$expected     = [
+		$tax_slug = $this->instance->get_taxonomy_slug();
+
+		$expected = [
 			'tax_query' => [
 				[
 					'taxonomy' => $tax_slug,
@@ -345,7 +351,7 @@ public function test_filter_rest_generated_media_attachments() {
 			],
 		];
 
-		$actual = $media_source->filter_rest_generated_media_attachments( [] );
+		$actual = $this->instance->filter_rest_generated_media_attachments( [] );
 
 		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
diff --git a/tests/phpunit/integration/tests/User/Preferences.php b/tests/phpunit/integration/tests/User/Preferences.php
index ceef4d529cd9..498cca3007e9 100644
--- a/tests/phpunit/integration/tests/User/Preferences.php
+++ b/tests/phpunit/integration/tests/User/Preferences.php
@@ -46,11 +46,6 @@ class Preferences extends TestCase {
 	 */
 	private $instance;
 
-	/**
-	 * @var Stories_Users_Controller
-	 */
-	private $users_controller;
-
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$admin_id = $factory->user->create(
 			[
@@ -68,19 +63,14 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-
-		$this->instance         = new \Google\Web_Stories\User\Preferences();
-		$this->users_controller = new Stories_Users_Controller();
+		$this->instance = new \Google\Web_Stories\User\Preferences();
 	}
 
 	public function tear_down() {
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
+		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY );
+		delete_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+		delete_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY );
 
 		unregister_meta_key( 'user', \Google\Web_Stories\User\Preferences::OPTIN_META_KEY );
 		unregister_meta_key( 'user', \Google\Web_Stories\User\Preferences::ONBOARDING_META_KEY );
@@ -95,14 +85,13 @@ public function tear_down() {
 	 */
 	public function test_add_optin_field_to_rest_api() {
 		$this->instance->register();
-		$this->users_controller->register();
 
 		wp_set_current_user( self::$admin_id );
 
 		add_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, true );
 		add_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
 
-		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, sprintf( '/web-stories/v1/users/%d', self::$admin_id ) );
+		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, sprintf( '/wp/v2/users/%d', self::$admin_id ) );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
@@ -121,14 +110,13 @@ public function test_add_optin_field_to_rest_api() {
 	 */
 	public function test_add_optin_field_to_rest_api_for_author_user() {
 		$this->instance->register();
-		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, true );
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
 
-		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/users/me' );
+		$request  = new WP_REST_Request( \WP_REST_Server::READABLE, '/wp/v2/users/me' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
@@ -147,14 +135,13 @@ public function test_add_optin_field_to_rest_api_for_author_user() {
 	 */
 	public function test_enables_author_user_to_update_meta_field() {
 		$this->instance->register();
-		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, false );
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, false );
 
-		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/web-stories/v1/users/me' );
+		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/wp/v2/users/me' );
 		$request->set_body_params(
 			[
 				'meta' => [
@@ -185,14 +172,13 @@ public function test_enables_author_user_to_update_meta_field() {
 	 */
 	public function test_permission_check_for_authors() {
 		$this->instance->register();
-		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, false );
 		add_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, false );
 
-		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/web-stories/v1/users/' . self::$admin_id );
+		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/wp/v2/users/' . self::$admin_id );
 		$request->set_body_params(
 			[
 				'meta' => [
@@ -222,14 +208,13 @@ public function test_permission_check_for_authors() {
 	 */
 	public function test_enables_author_user_to_invalid_type() {
 		$this->instance->register();
-		$this->users_controller->register();
 
 		wp_set_current_user( self::$author_id );
 
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::OPTIN_META_KEY, false );
 		add_user_meta( self::$author_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, false );
 
-		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/web-stories/v1/users/me' );
+		$request = new WP_REST_Request( \WP_REST_Server::CREATABLE, '/wp/v2/users/me' );
 		$request->set_body_params(
 			[
 				'meta' => [

From 26daf06a3ce6f3d2d171a326d7fd10f84eccc34c Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 11:53:00 +0200
Subject: [PATCH 24/41] Remove unneeded code

---
 includes/REST_API/Status_Check_Controller.php       | 13 +------------
 .../tests/REST_API/Status_Check_Controller.php      |  3 +--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/includes/REST_API/Status_Check_Controller.php b/includes/REST_API/Status_Check_Controller.php
index 1f66e4d25d9a..93ae83c284dd 100644
--- a/includes/REST_API/Status_Check_Controller.php
+++ b/includes/REST_API/Status_Check_Controller.php
@@ -26,7 +26,6 @@
 
 namespace Google\Web_Stories\REST_API;
 
-use Google\Web_Stories\Decoder;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Traits\Post_Type;
 use WP_REST_Server;
@@ -42,22 +41,12 @@
 class Status_Check_Controller extends REST_Controller {
 	use Post_Type;
 
-	/**
-	 * Decoder instance.
-	 *
-	 * @var Decoder Decoder instance.
-	 */
-	private $decoder;
-
 	/**
 	 * Constructor.
-	 *
-	 * @param Decoder $decoder Decoder instance.
 	 */
-	public function __construct( Decoder $decoder ) {
+	public function __construct() {
 		$this->namespace = 'web-stories/v1';
 		$this->rest_base = 'status-check';
-		$this->decoder   = $decoder;
 	}
 
 	/**
diff --git a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
index 0dc944d3176b..d9ab4731412b 100644
--- a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
-use Google\Web_Stories\Decoder;
 use WP_REST_Request;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 
@@ -61,7 +60,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->controller = new \Google\Web_Stories\REST_API\Status_Check_Controller( new Decoder() );
+		$this->controller = new \Google\Web_Stories\REST_API\Status_Check_Controller();
 	}
 
 	/**

From 0490ff2b20a418f55e00df5f37756182211c8bc4 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 11:55:45 +0200
Subject: [PATCH 25/41] Remove count

---
 .../integration/tests/REST_API/Status_Check_Controller.php     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
index d9ab4731412b..a785f5c2cb3f 100644
--- a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
@@ -72,9 +72,6 @@ public function test_register() {
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/web-stories/v1/status-check', $routes );
-
-		$route = $routes['/web-stories/v1/status-check'];
-		$this->assertCount( 1, $route );
 	}
 
 	/**

From 6d515790856c8334dab63fe11b7a08642ec444c3 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:10:36 +0200
Subject: [PATCH 26/41] Remove unneeded function call

Already called in `parent::set_up()`
---
 tests/phpunit/integration/includes/TestCase.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/phpunit/integration/includes/TestCase.php b/tests/phpunit/integration/includes/TestCase.php
index b8ff892e64ba..31d5731f24c5 100644
--- a/tests/phpunit/integration/includes/TestCase.php
+++ b/tests/phpunit/integration/includes/TestCase.php
@@ -45,8 +45,6 @@ public function tear_down() {
 			$_SERVER['HTTPS']
 		);
 
-		$this->clean_up_global_scope();
-
 		$this->set_permalink_structure( '' );
 
 		$_SERVER['REQUEST_URI'] = '';

From ffca829197bc29fb72df3ebb03e53129ce09d0be Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:11:20 +0200
Subject: [PATCH 27/41] Fix fixture setup when running tests in random order

---
 .../tests/Admin/Cross_Origin_Isolation.php    | 67 ++++++++++---------
 .../integration/tests/Admin/Meta_Boxes.php    | 11 ++-
 .../tests/Integrations/Site_Kit.php           | 29 +++-----
 3 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
index ba34e8291ff5..afc1487e9d42 100644
--- a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
+++ b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
@@ -28,14 +28,14 @@ class Cross_Origin_Isolation extends DependencyInjectedTestCase {
 	 *
 	 * @var int
 	 */
-	protected static $admin_id;
+	private $admin_id;
 
 	/**
 	 * Contributor user for test.
 	 *
 	 * @var int
 	 */
-	protected static $contributor_id;
+	private $contributor_id;
 
 	/**
 	 * Test instance.
@@ -44,25 +44,26 @@ class Cross_Origin_Isolation extends DependencyInjectedTestCase {
 	 */
 	private $instance;
 
-	public static function wpSetUpBeforeClass( $factory ) {
-		self::$admin_id = $factory->user->create(
+	public function set_up() {
+		parent::set_up();
+
+		// Deliberately NOT created in wpSetUpBeforeClass() because this class contains running
+		// in separate processes, which means tearDownAfterClass() (which deletes all WP data)
+		// is run multiple times, causing the story not to be available anymore.
+		$this->admin_id = self::factory()->user->create(
 			[ 'role' => 'administrator' ]
 		);
 
-		self::$contributor_id = $factory->user->create(
+		$this->contributor_id = self::factory()->user->create(
 			[ 'role' => 'contributor' ]
 		);
-	}
-
-	public function set_up() {
-		parent::set_up();
 
 		$this->instance = $this->injector->make( \Google\Web_Stories\Admin\Cross_Origin_Isolation::class );
 	}
 
 	public function tear_down() {
-		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
-		delete_user_meta( self::$contributor_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+		delete_user_meta( $this->admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+		delete_user_meta( $this->contributor_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
 
 		parent::tear_down();
 	}
@@ -71,8 +72,8 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_register() {
-		wp_set_current_user( self::$admin_id );
-		update_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
+		wp_set_current_user( $this->admin_id );
+		update_user_meta( $this->admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
 
 		$GLOBALS['current_screen'] = convert_to_screen( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 
@@ -90,8 +91,8 @@ public function test_register() {
 	 * @covers ::is_needed
 	 */
 	public function test_is_needed() {
-		wp_set_current_user( self::$admin_id );
-		update_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
+		wp_set_current_user( $this->admin_id );
+		update_user_meta( $this->admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
 
 		$this->assertTrue( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
@@ -100,7 +101,7 @@ public function test_is_needed() {
 	 * @covers ::is_needed
 	 */
 	public function test_is_needed_default_user_meta_value() {
-		wp_set_current_user( self::$admin_id );
+		wp_set_current_user( $this->admin_id );
 
 		$this->assertTrue( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
@@ -116,8 +117,8 @@ public function test_is_needed_no_user() {
 	 * @covers ::is_needed
 	 */
 	public function test_is_needed_opt_out() {
-		wp_set_current_user( self::$admin_id );
-		update_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, false );
+		wp_set_current_user( $this->admin_id );
+		update_user_meta( $this->admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, false );
 
 		$this->assertFalse( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
@@ -126,8 +127,8 @@ public function test_is_needed_opt_out() {
 	 * @covers ::is_needed
 	 */
 	public function test_is_needed_no_upload_caps() {
-		wp_set_current_user( self::$contributor_id );
-		update_user_meta( self::$contributor_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
+		wp_set_current_user( $this->contributor_id );
+		update_user_meta( $this->contributor_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY, true );
 
 		$this->assertFalse( \Google\Web_Stories\Admin\Cross_Origin_Isolation::is_needed() );
 	}
@@ -249,17 +250,17 @@ public function test_replace_in_dom_invalid() {
 		$result = $this->call_private_method( $this->instance, 'replace_in_dom', [ $html ] );
 		$this->assertStringContainsString( '<img crossorigin="anonymous" src="http://www.example.com/test1.jpg" />', $result );
 	}
-
-	/**
-	 * @covers ::custom_print_media_templates
-	 * @runInSeparateProcess
-	 * @preserveGlobalState disabled
-	 */
-	public function test_custom_print_media_templates() {
-		require_once ABSPATH . WPINC . '/media-template.php';
-		$output = get_echo( [ $this->instance, 'custom_print_media_templates' ] );
-		$this->assertStringContainsString( '<audio crossorigin="anonymous"', $output );
-		$this->assertStringContainsString( '<img crossorigin="anonymous"', $output );
-		$this->assertStringContainsString( '<video crossorigin="anonymous"', $output );
-	}
+//
+//	/**
+//	 * @covers ::custom_print_media_templates
+//	 * @runInSeparateProcess
+//	 * @preserveGlobalState disabled
+//	 */
+//	public function test_custom_print_media_templates() {
+//		require_once ABSPATH . WPINC . '/media-template.php';
+//		$output = get_echo( [ $this->instance, 'custom_print_media_templates' ] );
+//		$this->assertStringContainsString( '<audio crossorigin="anonymous"', $output );
+//		$this->assertStringContainsString( '<img crossorigin="anonymous"', $output );
+//		$this->assertStringContainsString( '<video crossorigin="anonymous"', $output );
+//	}
 }
diff --git a/tests/phpunit/integration/tests/Admin/Meta_Boxes.php b/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
index 98b114df3ace..95eb66dbc16f 100644
--- a/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
+++ b/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
@@ -29,10 +29,15 @@ class Meta_Boxes extends TestCase {
 	 *
 	 * @var int
 	 */
-	protected static $story_id;
+	private $story_id;
 
-	public static function wpSetUpBeforeClass( $factory ) {
-		self::$story_id = $factory->post->create(
+	public function set_up() {
+		parent::set_up();
+
+		// Deliberately NOT created in wpSetUpBeforeClass() because this class contains running
+		// in separate processes, which means tearDownAfterClass() (which deletes all WP data)
+		// is run multiple times, causing the story not to be available anymore.
+		$this->story_id = self::factory()->post->create(
 			[
 				'post_type'    => \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG,
 				'post_title'   => 'Meta Boxes Test Story',
diff --git a/tests/phpunit/integration/tests/Integrations/Site_Kit.php b/tests/phpunit/integration/tests/Integrations/Site_Kit.php
index 3ea5d1e28a57..2bfbe9be72dc 100644
--- a/tests/phpunit/integration/tests/Integrations/Site_Kit.php
+++ b/tests/phpunit/integration/tests/Integrations/Site_Kit.php
@@ -24,24 +24,6 @@
  * @coversDefaultClass \Google\Web_Stories\Integrations\Site_Kit
  */
 class Site_Kit extends TestCase {
-	/**
-	 * Story id.
-	 *
-	 * @var int
-	 */
-	protected static $story_id;
-
-	public static function wpSetUpBeforeClass( $factory ) {
-		self::$story_id = $factory->post->create(
-			[
-				'post_type'    => Story_Post_Type::POST_TYPE_SLUG,
-				'post_title'   => 'Site Kit Test Story',
-				'post_status'  => 'publish',
-				'post_content' => 'Example content',
-			]
-		);
-	}
-
 	/**
 	 * @covers ::register
 	 */
@@ -107,7 +89,16 @@ public function test_filter_site_kit_gtag_opt_single_story() {
 			'triggers' => [],
 		];
 
-		$this->go_to( get_permalink( self::$story_id ) );
+		$story_id = self::factory()->post->create(
+			[
+				'post_type'    => Story_Post_Type::POST_TYPE_SLUG,
+				'post_title'   => 'Site Kit Test Story',
+				'post_status'  => 'publish',
+				'post_content' => 'Example content',
+			]
+		);
+
+		$this->go_to( get_permalink( $story_id ) );
 
 		$analytics = $this->createMock( \Google\Web_Stories\Analytics::class );
 		$analytics->method( 'get_default_configuration' )

From 03dc2fd614a724954eb5634e450d690cd297b8bb Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:15:00 +0200
Subject: [PATCH 28/41] Remove debug cruft

---
 .../tests/Admin/Cross_Origin_Isolation.php    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
index afc1487e9d42..ce54d4a552f0 100644
--- a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
+++ b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
@@ -250,17 +250,17 @@ public function test_replace_in_dom_invalid() {
 		$result = $this->call_private_method( $this->instance, 'replace_in_dom', [ $html ] );
 		$this->assertStringContainsString( '<img crossorigin="anonymous" src="http://www.example.com/test1.jpg" />', $result );
 	}
-//
-//	/**
-//	 * @covers ::custom_print_media_templates
-//	 * @runInSeparateProcess
-//	 * @preserveGlobalState disabled
-//	 */
-//	public function test_custom_print_media_templates() {
-//		require_once ABSPATH . WPINC . '/media-template.php';
-//		$output = get_echo( [ $this->instance, 'custom_print_media_templates' ] );
-//		$this->assertStringContainsString( '<audio crossorigin="anonymous"', $output );
-//		$this->assertStringContainsString( '<img crossorigin="anonymous"', $output );
-//		$this->assertStringContainsString( '<video crossorigin="anonymous"', $output );
-//	}
+
+	/**
+	 * @covers ::custom_print_media_templates
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 */
+	public function test_custom_print_media_templates() {
+		require_once ABSPATH . WPINC . '/media-template.php';
+		$output = get_echo( [ $this->instance, 'custom_print_media_templates' ] );
+		$this->assertStringContainsString( '<audio crossorigin="anonymous"', $output );
+		$this->assertStringContainsString( '<img crossorigin="anonymous"', $output );
+		$this->assertStringContainsString( '<video crossorigin="anonymous"', $output );
+	}
 }

From 2d001bdfd899dbe769c6f49c9ec2238d764d58e7 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:15:39 +0200
Subject: [PATCH 29/41] Update variables

---
 tests/phpunit/integration/tests/Admin/Meta_Boxes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/integration/tests/Admin/Meta_Boxes.php b/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
index 95eb66dbc16f..9628d32765ae 100644
--- a/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
+++ b/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
@@ -71,7 +71,7 @@ public function test_register() {
 	 */
 	public function test_get_meta_box_url() {
 		$meta_boxes = new \Google\Web_Stories\Admin\Meta_Boxes();
-		$url        = $meta_boxes->get_meta_box_url( self::$story_id );
+		$url        = $meta_boxes->get_meta_box_url( $this->story_id );
 
 		$this->assertStringContainsString( 'wp-admin/post.php', $url );
 		$this->assertStringContainsString( 'meta-box-loader=1', $url );
@@ -93,7 +93,7 @@ public function test_remove_meta_boxes() {
 		add_action( 'add_meta_boxes', [ $this, 'register_test_meta_boxes' ] );
 
 		// Registers default meta boxes.
-		register_and_do_post_meta_boxes( get_post( self::$story_id ) );
+		register_and_do_post_meta_boxes( get_post( $this->story_id ) );
 
 		$registered_meta_boxes = [];
 
@@ -134,7 +134,7 @@ public function test_get_meta_boxes_per_location() {
 		add_action( 'add_meta_boxes', [ $this, 'register_test_meta_boxes' ] );
 
 		// Registers default meta boxes.
-		register_and_do_post_meta_boxes( get_post( self::$story_id ) );
+		register_and_do_post_meta_boxes( get_post( $this->story_id ) );
 
 		$meta_boxes = new \Google\Web_Stories\Admin\Meta_Boxes();
 		$actual     = $meta_boxes->get_meta_boxes_per_location();

From 435cc1cca45af162ed3e2b03813dad53030c8c55 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:21:20 +0200
Subject: [PATCH 30/41] Add missing `parent::set_up()` call

---
 .../integration/tests/Integrations/Core_Themes_Support.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php b/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
index e29730ed9514..95f978ada0ad 100644
--- a/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
+++ b/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
@@ -42,6 +42,8 @@ class Core_Themes_Support extends TestCase {
 	 * Runs prior to each test and sets up the testee object.
 	 */
 	public function set_up() {
+		parent::set_up();
+
 		$this->stylesheet = get_stylesheet();
 
 		// Set stylesheet from one of the supported themes.

From 3ad286fdf9b53fe16e8d68d4e3db346b8bf4d039 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:21:45 +0200
Subject: [PATCH 31/41] Use `DependencyInjectedTestCase`

---
 .../Integrations/Core_Themes_Support.php      | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php b/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
index 95f978ada0ad..8ede9dedd4be 100644
--- a/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
+++ b/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
@@ -18,25 +18,25 @@
 namespace Google\Web_Stories\Tests\Integration\Integrations;
 
 use Google\Web_Stories\Admin\Customizer;
-use Google\Web_Stories\Tests\Integration\TestCase;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Integrations\Core_Themes_Support
  */
-class Core_Themes_Support extends TestCase {
+class Core_Themes_Support extends DependencyInjectedTestCase {
 	/**
-	 * Stub for the conditional tests.
+	 * Test instance.
 	 *
-	 * @var null
+	 * @var \Google\Web_Stories\Integrations\Core_Themes_Support
 	 */
-	protected $stub = null;
+	protected $instance;
 
 	/**
 	 * Current template.
 	 *
-	 * @var null
+	 * @var string
 	 */
-	protected $stylesheet = null;
+	protected $stylesheet;
 
 	/**
 	 * Runs prior to each test and sets up the testee object.
@@ -49,15 +49,15 @@ public function set_up() {
 		// Set stylesheet from one of the supported themes.
 		update_option( 'stylesheet', 'twentytwentyone' );
 		update_option( Customizer::STORY_OPTION, [ 'show_stories' => true ] );
-		$assets     = new \Google\Web_Stories\Assets();
-		$this->stub = new \Google\Web_Stories\Integrations\Core_Themes_Support( $assets );
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Integrations\Core_Themes_Support::class );
 	}
 
 	/**
 	 * Runs after each test and resets the actions.
 	 */
 	public function tear_down() {
-		remove_action( 'wp_body_open', [ $this->stub, 'embed_web_stories' ] );
+		remove_action( 'wp_body_open', [ $this->instance, 'embed_web_stories' ] );
 
 		if ( get_theme_support( 'web-stories' ) ) {
 			remove_theme_support( 'web-stories' );
@@ -65,9 +65,6 @@ public function tear_down() {
 
 		update_option( 'stylesheet', $this->stylesheet );
 
-		unset( $this->stub );
-		unset( $this->stylesheet );
-
 		parent::tear_down();
 	}
 
@@ -77,10 +74,10 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$this->stub->register();
+		$this->instance->register();
 
-		$this->assertEquals( 10, has_filter( 'body_class', [ $this->stub, 'add_core_theme_classes' ] ) );
-		$this->assertEquals( 10, has_action( 'wp_body_open', [ $this->stub, 'embed_web_stories' ] ) );
+		$this->assertEquals( 10, has_filter( 'body_class', [ $this->instance, 'add_core_theme_classes' ] ) );
+		$this->assertEquals( 10, has_action( 'wp_body_open', [ $this->instance, 'embed_web_stories' ] ) );
 	}
 
 	/**
@@ -91,9 +88,9 @@ public function test_register() {
 	public function test_register_non_core_theme() {
 		update_option( 'stylesheet', '' );
 
-		$this->stub->register();
+		$this->instance->register();
 
-		$this->assertFalse( has_action( 'wp_body_open', [ $this->stub, 'embed_web_stories' ] ) );
+		$this->assertFalse( has_action( 'wp_body_open', [ $this->instance, 'embed_web_stories' ] ) );
 	}
 
 
@@ -113,7 +110,7 @@ public function test_get_supported_themes() {
 			'twentyten',
 		];
 
-		$actual = $this->get_static_private_property( $this->stub, 'supported_themes' );
+		$actual = $this->get_static_private_property( $this->instance, 'supported_themes' );
 
 		$this->assertEquals( $actual, $expected );
 	}
@@ -124,7 +121,7 @@ public function test_get_supported_themes() {
 	 * @covers ::extend_theme_support
 	 */
 	public function test_extend_theme_support() {
-		$this->stub->register();
+		$this->instance->register();
 
 		$this->assertTrue( get_theme_support( 'web-stories' ) );
 	}
@@ -136,7 +133,7 @@ public function test_extend_theme_support() {
 	 */
 	public function test_extend_theme_support_non_core_themes() {
 		update_option( 'stylesheet', '' );
-		$this->stub->register();
+		$this->instance->register();
 
 		$this->assertFalse( get_theme_support( 'web-stories' ) );
 	}
@@ -147,7 +144,7 @@ public function test_extend_theme_support_non_core_themes() {
 	 */
 	public function embed_web_stories() {
 		ob_start();
-		$this->stub->embed_web_stories();
+		$this->instance->embed_web_stories();
 
 		$actual = ob_get_clean();
 

From 7256371077773970af47479ee6549b73d926b0f5 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Fri, 1 Oct 2021 14:49:07 +0200
Subject: [PATCH 32/41] More test improvements

---
 .../integration/tests/Admin/Editor.php        | 175 ++++++++----------
 .../integration/tests/Admin/TinyMCE.php       |  55 +++---
 .../tests/Shortcode/Embed_Shortcode.php       |  48 +++--
 .../integration/tests/Widgets/Stories.php     |  41 ++--
 4 files changed, 144 insertions(+), 175 deletions(-)

diff --git a/tests/phpunit/integration/tests/Admin/Editor.php b/tests/phpunit/integration/tests/Admin/Editor.php
index 5836a26b9299..7dcd16de709e 100644
--- a/tests/phpunit/integration/tests/Admin/Editor.php
+++ b/tests/phpunit/integration/tests/Admin/Editor.php
@@ -47,6 +47,41 @@ class Editor extends TestCase {
 	 */
 	protected static $story_id;
 
+	/**
+	 * @var \Google\Web_Stories\Experiments
+	 */
+	private $experiments;
+
+	/**
+	 * @var \Google\Web_Stories\Assets
+	 */
+	private $assets;
+
+	/**
+	 * @var \Google\Web_Stories\Admin\Meta_Boxes
+	 */
+	private $meta_boxes;
+
+	/**
+	 * @var \Google\Web_Stories\Admin\Google_Fonts
+	 */
+	private $google_fonts;
+
+	/**
+	 * @var \Google\Web_Stories\Decoder
+	 */
+	private $decoder;
+
+	/**
+	 * @var \Google\Web_Stories\Locale
+	 */
+	private $locale;
+
+	/**
+	 * @var \Google\Web_Stories\Admin\Editor
+	 */
+	private $instance;
+
 	/**
 	 * @param \WP_UnitTest_Factory $factory
 	 */
@@ -81,7 +116,24 @@ public static function wpSetUpBeforeClass( $factory ) {
 
 	public function set_up() {
 		parent::set_up();
+
 		$this->add_caps_to_roles();
+
+		$this->experiments  = $this->createMock( \Google\Web_Stories\Experiments::class );
+		$this->meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
+		$this->decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
+		$this->locale       = $this->createMock( \Google\Web_Stories\Locale::class );
+		$this->google_fonts = $this->createMock( \Google\Web_Stories\Admin\Google_Fonts::class );
+		$this->assets       = $this->createMock( \Google\Web_Stories\Assets::class );
+
+		$this->instance = new \Google\Web_Stories\Admin\Editor(
+			$this->experiments,
+			$this->meta_boxes,
+			$this->decoder,
+			$this->locale,
+			$this->google_fonts,
+			$this->assets
+		);
 	}
 
 	public function tear_down() {
@@ -98,35 +150,14 @@ public function tear_down() {
 	 * @covers ::admin_enqueue_scripts
 	 */
 	public function test_admin_enqueue_scripts() {
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = $this->getMockBuilder( \Google\Web_Stories\Assets::class )->setMethods( [ 'get_asset_metadata' ] )->getMock();
-		$assets->method( 'get_asset_metadata' )
-			->willReturn(
-				[
-					'dependencies' => [],
-					'version'      => '9.9.9',
-					'js'           => [ 'fake_js_chunk' ],
-					'css'          => [ 'fake_css_chunk' ],
-					'chunks'       => [],
-				]
-			);
-
-		$editor = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
+		$this->assets->expects( $this->once() )->method( 'enqueue_script_asset' )->with(
+			\Google\Web_Stories\Admin\Editor::SCRIPT_HANDLE
+		);
+		$this->assets->expects( $this->once() )->method( 'remove_admin_style' )->with( [ 'forms' ] );
 
 		$GLOBALS['current_screen'] = convert_to_screen( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
-		$editor->admin_enqueue_scripts( 'post.php' );
 
-		$this->assertTrue( wp_script_is( \Google\Web_Stories\Admin\Editor::SCRIPT_HANDLE ) );
-		$this->assertTrue( wp_script_is( 'fake_js_chunk', 'registered' ) );
-
-		$this->assertTrue( wp_style_is( \Google\Web_Stories\Admin\Editor::SCRIPT_HANDLE ) );
-		$this->assertTrue( wp_style_is( 'fake_css_chunk', 'registered' ) );
+		$this->instance->admin_enqueue_scripts( 'post.php' );
 	}
 
 	/**
@@ -135,17 +166,9 @@ public function test_admin_enqueue_scripts() {
 	public function test_get_editor_settings_admin() {
 		wp_set_current_user( self::$admin_id );
 
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = new \Google\Web_Stories\Assets();
-
-		$editor  = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
-		$results = $editor->get_editor_settings();
+		$this->experiments->method( 'get_experiment_statuses' )->willReturn( [] );
+
+		$results = $this->instance->get_editor_settings();
 		$this->assertTrue( $results['config']['capabilities']['hasUploadMediaAction'] );
 	}
 
@@ -155,18 +178,9 @@ public function test_get_editor_settings_admin() {
 	public function test_get_editor_settings_subscriber() {
 		wp_set_current_user( self::$subscriber_id );
 
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = new \Google\Web_Stories\Assets();
+		$this->experiments->method( 'get_experiment_statuses' )->willReturn( [] );
 
-
-		$editor  = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
-		$results = $editor->get_editor_settings();
+		$results = $this->instance->get_editor_settings();
 		$this->assertFalse( $results['config']['capabilities']['hasUploadMediaAction'] );
 	}
 
@@ -175,21 +189,11 @@ public function test_get_editor_settings_subscriber() {
 	 */
 	public function test_setup_lock_admin() {
 		wp_set_current_user( self::$admin_id );
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$experiments->method( 'is_experiment_enabled' )
-					->willReturn( true );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = new \Google\Web_Stories\Assets();
-
 
-		$editor = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
+		$this->experiments->method( 'get_experiment_statuses' )->willReturn( [] );
+		$this->experiments->method( 'is_experiment_enabled' )->willReturn( true );
 
-		$this->call_private_method( $editor, 'setup_lock', [ self::$story_id ] );
+		$this->call_private_method( $this->instance, 'setup_lock', [ self::$story_id ] );
 
 		$value = get_post_meta( self::$story_id, '_edit_lock', true );
 
@@ -201,19 +205,11 @@ public function test_setup_lock_admin() {
 	 */
 	public function test_setup_lock_experiment_disabled() {
 		wp_set_current_user( self::$admin_id );
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$experiments->method( 'is_experiment_enabled' )
-					->willReturn( false );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = new \Google\Web_Stories\Assets();
-		$editor       = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
-
-		$this->call_private_method( $editor, 'setup_lock', [ self::$story_id ] );
+
+		$this->experiments->method( 'get_experiment_statuses' )->willReturn( [] );
+		$this->experiments->method( 'is_experiment_enabled' )->willReturn( false );
+
+		$this->call_private_method( $this->instance, 'setup_lock', [ self::$story_id ] );
 
 		$value = get_post_meta( self::$story_id, '_edit_lock', true );
 
@@ -226,21 +222,10 @@ public function test_setup_lock_experiment_disabled() {
 	public function test_setup_lock_subscriber() {
 		wp_set_current_user( self::$subscriber_id );
 
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$experiments->method( 'is_experiment_enabled' )
-					->willReturn( true );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = new \Google\Web_Stories\Assets();
+		$this->experiments->method( 'get_experiment_statuses' )->willReturn( [] );
+		$this->experiments->method( 'is_experiment_enabled' )->willReturn( true );
 
-
-		$editor = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
-
-		$this->call_private_method( $editor, 'setup_lock', [ self::$story_id ] );
+		$this->call_private_method( $this->instance, 'setup_lock', [ self::$story_id ] );
 
 		$value = get_post_meta( self::$story_id, '_edit_lock', true );
 
@@ -251,19 +236,9 @@ public function test_setup_lock_subscriber() {
 	 * @covers ::filter_use_block_editor_for_post_type
 	 */
 	public function test_filter_use_block_editor_for_post_type() {
-		$experiments = $this->createMock( \Google\Web_Stories\Experiments::class );
-		$experiments->method( 'get_experiment_statuses' )
-					->willReturn( [] );
-		$meta_boxes   = $this->createMock( \Google\Web_Stories\Admin\Meta_Boxes::class );
-		$decoder      = $this->createMock( \Google\Web_Stories\Decoder::class );
-		$locale       = $this->createMock( \Google\Web_Stories\Locale::class );
-		$google_fonts = new \Google\Web_Stories\Admin\Google_Fonts();
-		$assets       = new \Google\Web_Stories\Assets();
-
-
-		$editor = new \Google\Web_Stories\Admin\Editor( $experiments, $meta_boxes, $decoder, $locale, $google_fonts, $assets );
+		$this->experiments->method( 'get_experiment_statuses' )->willReturn( [] );
 
-		$use_block_editor = $editor->filter_use_block_editor_for_post_type( true, \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
+		$use_block_editor = $this->instance->filter_use_block_editor_for_post_type( true, \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
 		$this->assertFalse( $use_block_editor );
 	}
 
diff --git a/tests/phpunit/integration/tests/Admin/TinyMCE.php b/tests/phpunit/integration/tests/Admin/TinyMCE.php
index e67cbbac40ff..565aa87993bd 100644
--- a/tests/phpunit/integration/tests/Admin/TinyMCE.php
+++ b/tests/phpunit/integration/tests/Admin/TinyMCE.php
@@ -17,35 +17,42 @@
 
 namespace Google\Web_Stories\Tests\Integration\Admin;
 
-use Google\Web_Stories\Tests\Integration\TestCase;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Admin\TinyMCE
  */
-class TinyMCE extends TestCase {
+class TinyMCE extends DependencyInjectedTestCase {
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\Admin\TinyMCE
+	 */
+	protected $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Admin\TinyMCE::class );
+	}
 
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-
-		$tinymce->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_filter( 'mce_buttons', [ $tinymce, 'tinymce_web_stories_button' ] ) );
-		$this->assertSame( 10, has_filter( 'mce_external_plugins', [ $tinymce, 'web_stories_mce_plugin' ] ) );
-		$this->assertSame( 10, has_filter( 'admin_footer', [ $tinymce, 'web_stories_tinymce_root_element' ] ) );
-		$this->assertSame( 10, has_filter( 'script_loader_tag', [ $tinymce, 'script_loader_tag' ] ) );
+		$this->assertSame( 10, has_filter( 'mce_buttons', [ $this->instance, 'tinymce_web_stories_button' ] ) );
+		$this->assertSame( 10, has_filter( 'mce_external_plugins', [ $this->instance, 'web_stories_mce_plugin' ] ) );
+		$this->assertSame( 10, has_filter( 'admin_footer', [ $this->instance, 'web_stories_tinymce_root_element' ] ) );
+		$this->assertSame( 10, has_filter( 'script_loader_tag', [ $this->instance, 'script_loader_tag' ] ) );
 	}
 
 	/**
 	 * @covers ::register_assets
 	 */
 	public function test_register_assets() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-		$tinymce->register_assets();
+		$this->instance->register_assets();
 
 		$this->assertTrue( wp_script_is( \Google\Web_Stories\Admin\TinyMCE::SCRIPT_HANDLE, 'registered' ) );
 	}
@@ -54,9 +61,7 @@ public function test_register_assets() {
 	 * @covers ::tinymce_web_stories_button
 	 */
 	public function test_tinymce_web_stories_button() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-		$result  = $tinymce->tinymce_web_stories_button( [] );
+		$result = $this->instance->tinymce_web_stories_button( [] );
 
 		$this->assertContains( 'web_stories', $result );
 	}
@@ -65,9 +70,7 @@ public function test_tinymce_web_stories_button() {
 	 * @covers ::web_stories_mce_plugin
 	 */
 	public function test_web_stories_mce_plugin() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-		$result  = $tinymce->web_stories_mce_plugin( [] );
+		$result = $this->instance->web_stories_mce_plugin( [] );
 
 		$this->assertArrayHasKey( 'web_stories', $result );
 	}
@@ -76,10 +79,8 @@ public function test_web_stories_mce_plugin() {
 	 * @covers ::web_stories_tinymce_root_element
 	 */
 	public function test_web_stories_tinymce_root_element() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-		$result  = get_echo( [ $tinymce, 'web_stories_tinymce_root_element' ] );
-		$result  = trim( $result );
+		$result = get_echo( [ $this->instance, 'web_stories_tinymce_root_element' ] );
+		$result = trim( $result );
 
 		$this->assertSame( '<div id="web-stories-tinymce"></div>', $result );
 	}
@@ -88,9 +89,7 @@ public function test_web_stories_tinymce_root_element() {
 	 * @covers ::script_loader_tag
 	 */
 	public function test_script_loader_tag() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-		$result  = $tinymce->script_loader_tag( "<script src='http://www.example.com/test.js'></script>", \Google\Web_Stories\Admin\TinyMCE::SCRIPT_HANDLE, 'http://www.example.com/test.js' );
+		$result = $this->instance->script_loader_tag( "<script src='http://www.example.com/test.js'></script>", \Google\Web_Stories\Admin\TinyMCE::SCRIPT_HANDLE, 'http://www.example.com/test.js' );
 
 		$this->assertSame( '', $result );
 	}
@@ -100,9 +99,7 @@ public function test_script_loader_tag() {
 	 * @covers \Google\Web_Stories\Traits\Screen::is_block_editor
 	 */
 	public function test_is_block_editor() {
-		$assets  = new \Google\Web_Stories\Assets();
-		$tinymce = new \Google\Web_Stories\Admin\TinyMCE( $assets );
-		$result  = $this->call_private_method( $tinymce, 'is_block_editor' );
+		$result = $this->call_private_method( $this->instance, 'is_block_editor' );
 
 		$this->assertFalse( $result );
 	}
diff --git a/tests/phpunit/integration/tests/Shortcode/Embed_Shortcode.php b/tests/phpunit/integration/tests/Shortcode/Embed_Shortcode.php
index 9e30d0a2cf35..70a08c547b1e 100644
--- a/tests/phpunit/integration/tests/Shortcode/Embed_Shortcode.php
+++ b/tests/phpunit/integration/tests/Shortcode/Embed_Shortcode.php
@@ -17,12 +17,25 @@
 
 namespace Google\Web_Stories\Tests\Integration\Shortcode;
 
-use Google\Web_Stories\Tests\Integration\TestCase;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Shortcode\Embed_Shortcode
  */
-class Embed_Shortcode extends TestCase {
+class Embed_Shortcode extends DependencyInjectedTestCase {
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\Shortcode\Embed_Shortcode
+	 */
+	protected $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Shortcode\Embed_Shortcode::class );
+	}
+
 	public function tear_down() {
 		remove_shortcode( \Google\Web_Stories\Shortcode\Embed_Shortcode::SHORTCODE_NAME );
 
@@ -33,10 +46,7 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_registers_shortcode() {
-		$assets          = new \Google\Web_Stories\Assets();
-		$embed_shortcode = new \Google\Web_Stories\Shortcode\Embed_Shortcode( $assets );
-
-		$embed_shortcode->register();
+		$this->instance->register();
 		$this->assertTrue( shortcode_exists( \Google\Web_Stories\Shortcode\Embed_Shortcode::SHORTCODE_NAME ) );
 	}
 
@@ -47,10 +57,7 @@ public function test_registers_shortcode() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Embed::render
 	 */
 	public function test_render_shortcode() {
-		$assets          = new \Google\Web_Stories\Assets();
-		$embed_shortcode = new \Google\Web_Stories\Shortcode\Embed_Shortcode( $assets );
-
-		$actual = $embed_shortcode->render_shortcode(
+		$actual = $this->instance->render_shortcode(
 			[
 				'url'    => 'https://example.com/story.html',
 				'title'  => 'Example Story',
@@ -71,10 +78,7 @@ public function test_render_shortcode() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Embed::render
 	 */
 	public function test_render_shortcode_missing_url() {
-		$assets          = new \Google\Web_Stories\Assets();
-		$embed_shortcode = new \Google\Web_Stories\Shortcode\Embed_Shortcode( $assets );
-
-		$actual = $embed_shortcode->render_shortcode(
+		$actual = $this->instance->render_shortcode(
 			[
 				'url'    => '',
 				'title'  => 'Example Story',
@@ -95,10 +99,7 @@ public function test_render_shortcode_missing_url() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Embed::render
 	 */
 	public function test_render_shortcode_missing_title() {
-		$assets          = new \Google\Web_Stories\Assets();
-		$embed_shortcode = new \Google\Web_Stories\Shortcode\Embed_Shortcode( $assets );
-
-		$actual = $embed_shortcode->render_shortcode(
+		$actual = $this->instance->render_shortcode(
 			[
 				'url'    => 'https://example.com/story.html',
 				'title'  => '',
@@ -119,12 +120,9 @@ public function test_render_shortcode_missing_title() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Image::render
 	 */
 	public function test_render_shortcode_feed_no_poster() {
-		$assets          = new \Google\Web_Stories\Assets();
-		$embed_shortcode = new \Google\Web_Stories\Shortcode\Embed_Shortcode( $assets );
-
 		$this->go_to( '/?feed=rss2' );
 
-		$actual = $embed_shortcode->render_shortcode(
+		$actual = $this->instance->render_shortcode(
 			[
 				'url'   => 'https://example.com/story.html',
 				'title' => 'Example Story',
@@ -143,13 +141,11 @@ public function test_render_shortcode_feed_no_poster() {
 	 * @covers \Google\Web_Stories\Renderer\Story\Image::render
 	 */
 	public function test_render_shortcode_with_poster() {
-		$assets          = new \Google\Web_Stories\Assets();
-		$embed_shortcode = new \Google\Web_Stories\Shortcode\Embed_Shortcode( $assets );
-		$embed_shortcode->register();
+		$this->instance->register();
 
 		$this->go_to( '/?feed=rss2' );
 
-		$actual = $embed_shortcode->render_shortcode(
+		$actual = $this->instance->render_shortcode(
 			[
 				'url'    => 'https://example.com/story.html',
 				'title'  => 'Example Story',
diff --git a/tests/phpunit/integration/tests/Widgets/Stories.php b/tests/phpunit/integration/tests/Widgets/Stories.php
index 7a7a9a94f147..34ad2a24cc2a 100644
--- a/tests/phpunit/integration/tests/Widgets/Stories.php
+++ b/tests/phpunit/integration/tests/Widgets/Stories.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\Widgets;
 
-use Google\Web_Stories\Widgets\Stories as Testee;
 use WP_Widget;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
@@ -28,50 +27,52 @@
  */
 class Stories extends TestCase {
 	/**
-	 * Object in test.
+	 * Test instance.
 	 *
-	 * @var Testee
+	 * @var \Google\Web_Stories\Widgets\Stories
 	 */
-	private static $testee;
+	private $instance;
 
 	/**
 	 * Runs before any method in class is run.
 	 *
 	 * @return void
 	 */
-	public static function set_up_before_class() {
-		$assets       = new \Google\Web_Stories\Assets();
-		self::$testee = new Testee( $assets );
+	public function set_up() {
+		parent::set_up();
+
+		$assets         = new \Google\Web_Stories\Assets();
+		$this->instance = new \Google\Web_Stories\Widgets\Stories( $assets );
 	}
 
 	/**
 	 * Test that object is instance of WP_Widget.
 	 */
 	public function test_instance() {
-		$this->assertInstanceOf( WP_Widget::class, self::$testee );
+		$this->assertInstanceOf( WP_Widget::class, $this->instance );
 	}
 
 	/**
 	 * Test ID Base is set.
 	 */
 	public function test_id_base() {
-		$this->assertEquals( 'string', gettype( self::$testee->id_base ) );
-		$this->assertNotEmpty( self::$testee->id_base );
+		$this->assertEquals( 'string', gettype( $this->instance->id_base ) );
+		$this->assertNotEmpty( $this->instance->id_base );
 	}
 
 	/**
 	 * Test name is set.
 	 */
 	public function test_name() {
-		$this->assertEquals( 'string', gettype( self::$testee->name ) );
-		$this->assertNotEmpty( self::$testee->name );
+		$this->assertEquals( 'string', gettype( $this->instance->name ) );
+		$this->assertNotEmpty( $this->instance->name );
 	}
 
 	/**
 	 * @covers ::enqueue_scripts
 	 */
 	public function test_enqueue_scripts() {
-		self::$testee->enqueue_scripts();
+		$this->instance->enqueue_scripts();
 		$this->assertTrue( wp_script_is( 'web-stories-widget' ) );
 	}
 
@@ -110,7 +111,7 @@ public function test_update() {
 			'order'              => 'DESC',
 		];
 
-		$instance = self::$testee->update( $new_instance, $old_instance );
+		$instance = $this->instance->update( $new_instance, $old_instance );
 
 		$this->assertEqualSetsWithIndex( $expected, $instance );
 	}
@@ -124,10 +125,10 @@ public function test_update_default() {
 
 		$old_instance = [];
 
-		$expected = $this->call_private_method( self::$testee, 'default_values' );
+		$expected = $this->call_private_method( $this->instance, 'default_values' );
 
 
-		$instance = self::$testee->update( $new_instance, $old_instance );
+		$instance = $this->instance->update( $new_instance, $old_instance );
 
 		$this->assertEqualSetsWithIndex( $expected, $instance );
 	}
@@ -142,7 +143,7 @@ public function test_input() {
 				'label' => 'Test input',
 				'value' => 3,
 			];
-			$this->call_private_method( self::$testee, 'input', [ $args ] );
+			$this->call_private_method( $this->instance, 'input', [ $args ] );
 		};
 
 		$dropdown = get_echo( $function );
@@ -163,7 +164,7 @@ public function test_dropdown() {
 				'options'  => range( 'A', 'Z' ),
 				'selected' => 3,
 			];
-			$this->call_private_method( self::$testee, 'dropdown', [ $args ] );
+			$this->call_private_method( $this->instance, 'dropdown', [ $args ] );
 		};
 
 		$dropdown = get_echo( $function );
@@ -185,7 +186,7 @@ public function test_radio() {
 				'options'  => range( 'A', 'Z' ),
 				'selected' => 3,
 			];
-			$this->call_private_method( self::$testee, 'radio', [ $args ] );
+			$this->call_private_method( $this->instance, 'radio', [ $args ] );
 		};
 
 		$radio = get_echo( $function );
@@ -205,7 +206,7 @@ public function test_label() {
 			'id'    => '123',
 		];
 
-		$label = $this->call_private_method( self::$testee, 'label', [ $args ] );
+		$label = $this->call_private_method( $this->instance, 'label', [ $args ] );
 
 		$this->assertStringContainsString( 'Test input', $label );
 		$this->assertStringContainsString( '<label', $label );

From 73267e911fc51fbec757b75c10aefdf756e06f69 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 4 Oct 2021 14:49:49 +0200
Subject: [PATCH 33/41] Get settings name via instance

---
 includes/AMP/Sanitization.php                 |  2 +-
 includes/AdSense.php                          |  6 +--
 includes/Ad_Manager.php                       |  4 +-
 includes/Analytics.php                        |  4 +-
 includes/Experiments.php                      |  4 +-
 includes/Integrations/AMP.php                 |  2 +-
 .../Set_Legacy_Analytics_Usage_Flag.php       | 24 +++++++++++-
 .../Migrations/Update_Publisher_Logos.php     |  6 +--
 .../REST_API/Publisher_Logos_Controller.php   | 37 ++++++++++++-------
 includes/Settings.php                         | 13 +++++++
 includes/Story_Post_Type.php                  | 18 ++++-----
 includes/Tracking.php                         |  4 +-
 .../Set_Legacy_Analytics_Usage_Flag.php       | 28 ++++++++++----
 .../REST_API/Publisher_Logos_Controller.php   |  4 +-
 14 files changed, 107 insertions(+), 49 deletions(-)

diff --git a/includes/AMP/Sanitization.php b/includes/AMP/Sanitization.php
index 08759515791c..dfc423b06fbf 100644
--- a/includes/AMP/Sanitization.php
+++ b/includes/AMP/Sanitization.php
@@ -424,7 +424,7 @@ protected function get_sanitizers(): array {
 		$post = get_queried_object();
 
 		if ( $post instanceof \WP_Post && Story_Post_Type::POST_TYPE_SLUG === get_post_type( $post ) ) {
-			$video_cache_enabled = (bool) $this->settings->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
+			$video_cache_enabled = (bool) $this->settings->get_setting( $this->settings::SETTING_NAME_VIDEO_CACHE );
 
 			$story = new Story();
 			$story->load_from_post( $post );
diff --git a/includes/AdSense.php b/includes/AdSense.php
index 7aa6c0fdea88..db3a40cc2863 100644
--- a/includes/AdSense.php
+++ b/includes/AdSense.php
@@ -69,7 +69,7 @@ public function register() {
 	 * @return string Publisher ID.
 	 */
 	private function get_publisher_id(): string {
-		return (string) $this->settings->get_setting( Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
+		return (string) $this->settings->get_setting( $this->settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
 	}
 
 	/**
@@ -80,7 +80,7 @@ private function get_publisher_id(): string {
 	 * @return string Slot ID.
 	 */
 	private function get_slot_id(): string {
-		return (string) $this->settings->get_setting( Settings::SETTING_NAME_ADSENSE_SLOT_ID );
+		return (string) $this->settings->get_setting( $this->settings::SETTING_NAME_ADSENSE_SLOT_ID );
 	}
 
 	/**
@@ -91,7 +91,7 @@ private function get_slot_id(): string {
 	 * @return bool
 	 */
 	private function is_enabled(): bool {
-		return ( 'adsense' === (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'adsense' === (string) $this->settings->get_setting( $this->settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
diff --git a/includes/Ad_Manager.php b/includes/Ad_Manager.php
index c5ff2b83e99f..56ae14bfdd91 100644
--- a/includes/Ad_Manager.php
+++ b/includes/Ad_Manager.php
@@ -69,7 +69,7 @@ public function register() {
 	 * @return string Slot ID.
 	 */
 	private function get_slot_id(): string {
-		return (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
+		return (string) $this->settings->get_setting( $this->settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
 	}
 
 	/**
@@ -80,7 +80,7 @@ private function get_slot_id(): string {
 	 * @return bool
 	 */
 	private function is_enabled(): bool {
-		return ( 'admanager' === (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'admanager' === (string) $this->settings->get_setting( $this->settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
diff --git a/includes/Analytics.php b/includes/Analytics.php
index e401247073fd..f647d429bbed 100644
--- a/includes/Analytics.php
+++ b/includes/Analytics.php
@@ -78,7 +78,7 @@ public function register() {
 	 * @return string Tracking ID.
 	 */
 	public function get_tracking_id(): string {
-		return (string) $this->settings->get_setting( Settings::SETTING_NAME_TRACKING_ID );
+		return (string) $this->settings->get_setting( $this->settings::SETTING_NAME_TRACKING_ID );
 	}
 
 	/**
@@ -239,7 +239,7 @@ public function print_analytics_tag() {
 		}
 
 		if (
-			(bool) $this->settings->get_setting( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) ||
+			(bool) $this->settings->get_setting( $this->settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) ||
 			! $this->experiments->is_experiment_enabled( 'enableAutoAnalyticsMigration' )
 		) {
 			$this->print_amp_analytics_tag( $tracking_id );
diff --git a/includes/Experiments.php b/includes/Experiments.php
index 610427613b62..bb4a93eaca67 100644
--- a/includes/Experiments.php
+++ b/includes/Experiments.php
@@ -185,7 +185,7 @@ public function display_experiment_field( array $args ) {
 		<label for="<?php echo esc_attr( $args['id'] ); ?>">
 			<input
 				type="checkbox"
-				name="<?php echo esc_attr( sprintf( '%1$s[%2$s]', Settings::SETTING_NAME_EXPERIMENTS, $args['id'] ) ); ?>"
+				name="<?php echo esc_attr( sprintf( '%1$s[%2$s]', $this->settings::SETTING_NAME_EXPERIMENTS, $args['id'] ) ); ?>"
 				id="<?php echo esc_attr( $args['id'] ); ?>"
 				value="1"
 				<?php echo esc_attr( $disabled ); ?>
@@ -459,7 +459,7 @@ public function is_experiment_enabled( string $name ): bool {
 			return (bool) $experiment['default'];
 		}
 
-		$experiments = $this->settings->get_setting( Settings::SETTING_NAME_EXPERIMENTS, [] );
+		$experiments = $this->settings->get_setting( $this->settings::SETTING_NAME_EXPERIMENTS, [] );
 		return ! empty( $experiments[ $name ] );
 	}
 
diff --git a/includes/Integrations/AMP.php b/includes/Integrations/AMP.php
index 0f998a9f99e0..93b626f2fc8c 100644
--- a/includes/Integrations/AMP.php
+++ b/includes/Integrations/AMP.php
@@ -159,7 +159,7 @@ public function add_amp_content_sanitizers( $sanitizers ) {
 			return $sanitizers;
 		}
 
-		$video_cache_enabled = (bool) $this->settings->get_setting( Settings::SETTING_NAME_VIDEO_CACHE );
+		$video_cache_enabled = (bool) $this->settings->get_setting( $this->settings::SETTING_NAME_VIDEO_CACHE );
 
 		$story = new Story();
 		$story->load_from_post( $post );
diff --git a/includes/Migrations/Set_Legacy_Analytics_Usage_Flag.php b/includes/Migrations/Set_Legacy_Analytics_Usage_Flag.php
index cb04f115c97e..214337329bd3 100644
--- a/includes/Migrations/Set_Legacy_Analytics_Usage_Flag.php
+++ b/includes/Migrations/Set_Legacy_Analytics_Usage_Flag.php
@@ -34,6 +34,25 @@
  * @package Google\Web_Stories\Migrations
  */
 class Set_Legacy_Analytics_Usage_Flag extends Migrate_Base {
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Migration constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Settings $settings Settings instance.
+	 *
+	 * @return void
+	 */
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+	}
 
 	/**
 	 * Set legacy analytics usage flag.
@@ -43,6 +62,9 @@ class Set_Legacy_Analytics_Usage_Flag extends Migrate_Base {
 	 * @return void
 	 */
 	public function migrate() {
-		update_option( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS, ! empty( get_option( Settings::SETTING_NAME_TRACKING_ID ) ) );
+		$this->settings->update_setting(
+			$this->settings::SETTING_NAME_USING_LEGACY_ANALYTICS,
+			! empty( $this->settings->get_setting( $this->settings::SETTING_NAME_TRACKING_ID ) )
+		);
 	}
 }
diff --git a/includes/Migrations/Update_Publisher_Logos.php b/includes/Migrations/Update_Publisher_Logos.php
index d6722a59e233..2eeb5856bb44 100644
--- a/includes/Migrations/Update_Publisher_Logos.php
+++ b/includes/Migrations/Update_Publisher_Logos.php
@@ -65,13 +65,13 @@ public function __construct( Settings $settings ) {
 	 */
 	public function migrate() {
 		$publisher_logo_id       = 0;
-		$publisher_logo_settings = (array) $this->settings->get_setting( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] );
+		$publisher_logo_settings = (array) $this->settings->get_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, [] );
 
 		if ( ! empty( $publisher_logo_settings['active'] ) ) {
 			$publisher_logo_id = $publisher_logo_settings['active'];
 		}
 
-		update_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $publisher_logo_id, false );
-		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, array_filter( [ $publisher_logo_id ] ), false );
+		$this->settings->update_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $publisher_logo_id );
+		$this->settings->update_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, array_filter( [ $publisher_logo_id ] ) );
 	}
 }
diff --git a/includes/REST_API/Publisher_Logos_Controller.php b/includes/REST_API/Publisher_Logos_Controller.php
index 77d19ed73cc5..9f6589a6037a 100644
--- a/includes/REST_API/Publisher_Logos_Controller.php
+++ b/includes/REST_API/Publisher_Logos_Controller.php
@@ -43,10 +43,21 @@
 class Publisher_Logos_Controller extends REST_Controller {
 	use Post_Type;
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
 	/**
 	 * Constructor.
+	 *
+	 * @param Settings $settings Settings instance.
 	 */
-	public function __construct() {
+	public function __construct( Settings $settings ) {
+		$this->settings = $settings;
+
 		$this->namespace = 'web-stories/v1';
 		$this->rest_base = 'publisher-logos';
 	}
@@ -153,7 +164,7 @@ public function update_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_items( $request ) {
-		$publisher_logos = $this->filter_publisher_logos( (array) get_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
+		$publisher_logos = $this->filter_publisher_logos( (array) $this->settings->get_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
 		$results         = [];
 
 		foreach ( $publisher_logos as $logo ) {
@@ -184,7 +195,7 @@ public function get_items( $request ) {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function create_item( $request ) {
-		$publisher_logos = $this->filter_publisher_logos( (array) get_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
+		$publisher_logos = $this->filter_publisher_logos( (array) $this->settings->get_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
 
 		$post = get_post( $request['id'] );
 
@@ -206,12 +217,12 @@ public function create_item( $request ) {
 
 		$publisher_logos[] = $post->ID;
 
-		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, $publisher_logos );
+		$this->settings->update_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, $publisher_logos );
 
-		$active_publisher_logo_id = absint( get_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
+		$active_publisher_logo_id = absint( $this->settings->get_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
 
 		if ( 1 === count( $publisher_logos ) || ! in_array( $active_publisher_logo_id, $publisher_logos, true ) ) {
-			update_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $post->ID );
+			$this->settings->update_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $post->ID );
 		}
 
 		return $this->prepare_item_for_response( $post, $request );
@@ -234,17 +245,17 @@ public function delete_item( $request ) {
 
 		$prepared = $this->prepare_item_for_response( $post, $request );
 
-		$publisher_logos = $this->filter_publisher_logos( (array) get_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
+		$publisher_logos = $this->filter_publisher_logos( (array) $this->settings->get_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
 		$publisher_logos = array_values( array_diff( $publisher_logos, [ $post->ID ] ) );
 
-		$active_publisher_logo_id = absint( get_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
+		$active_publisher_logo_id = absint( $this->settings->get_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
 
 		if ( $post->ID === $active_publisher_logo_id || ! in_array( $active_publisher_logo_id, $publisher_logos, true ) ) {
 			// Mark the first available publisher logo as the new default.
-			update_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, ! empty( $publisher_logos[0] ) ? $publisher_logos[0] : 0 );
+			$this->settings->update_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, ! empty( $publisher_logos[0] ) ? $publisher_logos[0] : 0 );
 		}
 
-		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, $publisher_logos );
+		$this->settings->update_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, $publisher_logos );
 
 		return new WP_REST_Response(
 			[
@@ -272,7 +283,7 @@ public function update_item( $request ) {
 		}
 
 		if ( $request['active'] ) {
-			update_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $post->ID );
+			$this->settings->update_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $post->ID );
 		}
 
 		return $this->prepare_item_for_response( $post, $request );
@@ -287,7 +298,7 @@ public function update_item( $request ) {
 	 * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
 	 */
 	protected function get_publisher_logo( $id ) {
-		$publisher_logos = $this->filter_publisher_logos( (array) get_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
+		$publisher_logos = $this->filter_publisher_logos( (array) $this->settings->get_setting( $this->settings::SETTING_NAME_PUBLISHER_LOGOS, [] ) );
 
 		$post = get_post( $id );
 
@@ -326,7 +337,7 @@ public function prepare_item_for_response( $post, $request ): WP_REST_Response {
 		}
 
 		if ( rest_is_field_included( 'active', $fields ) ) {
-			$active_publisher_logo_id = absint( get_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
+			$active_publisher_logo_id = absint( $this->settings->get_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO ) );
 			$data['active']           = $post->ID === $active_publisher_logo_id;
 		}
 
diff --git a/includes/Settings.php b/includes/Settings.php
index ef88e1f71af3..e609688a3697 100644
--- a/includes/Settings.php
+++ b/includes/Settings.php
@@ -315,4 +315,17 @@ public static function get_registration_action_priority(): int {
 	public function get_setting( $key, $default = false ) {
 		return get_option( $key, $default );
 	}
+
+	/**
+	 * Updates the given setting with a new value.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param string $key Setting key.
+	 * @param mixed  $value Setting value.
+	 * @return mixed Setting value.
+	 */
+	public function update_setting( $key, $value ) {
+		return update_option( $key, $value );
+	}
 }
diff --git a/includes/Story_Post_Type.php b/includes/Story_Post_Type.php
index 6653e6766bd9..cc12d3a2e10b 100644
--- a/includes/Story_Post_Type.php
+++ b/includes/Story_Post_Type.php
@@ -110,10 +110,10 @@ public function register() {
 		add_filter( 'bulk_post_updated_messages', [ $this, 'bulk_post_updated_messages' ], 10, 2 );
 		add_action( 'clean_post_cache', [ $this, 'clear_user_posts_count' ], 10, 2 );
 
-		add_action( 'add_option_' . Settings::SETTING_NAME_ARCHIVE, [ $this, 'update_archive_setting' ] );
-		add_action( 'update_option_' . Settings::SETTING_NAME_ARCHIVE, [ $this, 'update_archive_setting' ] );
-		add_action( 'add_option_' . Settings::SETTING_NAME_ARCHIVE_PAGE_ID, [ $this, 'update_archive_setting' ] );
-		add_action( 'update_option_' . Settings::SETTING_NAME_ARCHIVE_PAGE_ID, [ $this, 'update_archive_setting' ] );
+		add_action( 'add_option_' . $this->settings::SETTING_NAME_ARCHIVE, [ $this, 'update_archive_setting' ] );
+		add_action( 'update_option_' . $this->settings::SETTING_NAME_ARCHIVE, [ $this, 'update_archive_setting' ] );
+		add_action( 'add_option_' . $this->settings::SETTING_NAME_ARCHIVE_PAGE_ID, [ $this, 'update_archive_setting' ] );
+		add_action( 'update_option_' . $this->settings::SETTING_NAME_ARCHIVE_PAGE_ID, [ $this, 'update_archive_setting' ] );
 
 		add_filter( 'display_post_states', [ $this, 'filter_display_post_states' ], 10, 2 );
 		add_action( 'pre_get_posts', [ $this, 'pre_get_posts' ] );
@@ -235,7 +235,7 @@ public function unregister_post_type() {
 	 * @return void
 	 */
 	protected function register_meta() {
-		$active_publisher_logo_id = absint( $this->settings->get_setting( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, 0 ) );
+		$active_publisher_logo_id = absint( $this->settings->get_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, 0 ) );
 
 		register_post_meta(
 			self::POST_TYPE_SLUG,
@@ -378,8 +378,8 @@ public function update_archive_setting() {
 	 * @return bool|string Whether the post type should have an archive, or archive slug.
 	 */
 	private function get_has_archive() {
-		$archive_page_option    = $this->settings->get_setting( Settings::SETTING_NAME_ARCHIVE );
-		$custom_archive_page_id = (int) $this->settings->get_setting( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
+		$archive_page_option    = $this->settings->get_setting( $this->settings::SETTING_NAME_ARCHIVE );
+		$custom_archive_page_id = (int) $this->settings->get_setting( $this->settings::SETTING_NAME_ARCHIVE_PAGE_ID );
 		$has_archive            = true;
 
 		if ( 'disabled' === $archive_page_option ) {
@@ -419,7 +419,7 @@ public function pre_get_posts( WP_Query $query ) {
 			return;
 		}
 
-		$custom_archive_page_id = (int) get_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
+		$custom_archive_page_id = (int) $this->settings->get_setting( $this->settings::SETTING_NAME_ARCHIVE_PAGE_ID );
 
 		$query->set( 'page_id', $custom_archive_page_id );
 		$query->set( 'post_type', 'page' );
@@ -447,7 +447,7 @@ public function filter_display_post_states( $post_states, WP_Post $post ) {
 			return $post_states;
 		}
 
-		$custom_archive_page_id = (int) get_option( Settings::SETTING_NAME_ARCHIVE_PAGE_ID );
+		$custom_archive_page_id = (int) $this->settings->get_setting( $this->settings::SETTING_NAME_ARCHIVE_PAGE_ID );
 
 		if ( $post->ID === $custom_archive_page_id ) {
 			$post_states['web_stories_archive_page'] = __( 'Web Stories Archive Page', 'web-stories' );
diff --git a/includes/Tracking.php b/includes/Tracking.php
index cf6d08e14623..6635e0760a03 100644
--- a/includes/Tracking.php
+++ b/includes/Tracking.php
@@ -186,7 +186,7 @@ private function get_user_properties(): array {
 
 		$site_kit_status = $this->site_kit->get_plugin_status();
 		$active_plugins  = $site_kit_status['active'] ? 'google-site-kit' : '';
-		$analytics       = $site_kit_status['analyticsActive'] ? 'google-site-kit' : ! empty( $this->settings->get_setting( Settings::SETTING_NAME_TRACKING_ID ) );
+		$analytics       = $site_kit_status['analyticsActive'] ? 'google-site-kit' : ! empty( $this->settings->get_setting( $this->settings::SETTING_NAME_TRACKING_ID ) );
 
 		return [
 			'siteLocale'         => get_locale(),
@@ -196,7 +196,7 @@ private function get_user_properties(): array {
 			'wpVersion'          => get_bloginfo( 'version' ),
 			'phpVersion'         => PHP_VERSION,
 			'isMultisite'        => (int) is_multisite(),
-			'adNetwork'          => (string) $this->settings->get_setting( Settings::SETTING_NAME_AD_NETWORK, 'none' ),
+			'adNetwork'          => (string) $this->settings->get_setting( $this->settings::SETTING_NAME_AD_NETWORK, 'none' ),
 			'analytics'          => $analytics,
 			'activePlugins'      => $active_plugins,
 		];
diff --git a/tests/phpunit/integration/tests/Migrations/Set_Legacy_Analytics_Usage_Flag.php b/tests/phpunit/integration/tests/Migrations/Set_Legacy_Analytics_Usage_Flag.php
index 6bcc163ece7b..4608492957e4 100644
--- a/tests/phpunit/integration/tests/Migrations/Set_Legacy_Analytics_Usage_Flag.php
+++ b/tests/phpunit/integration/tests/Migrations/Set_Legacy_Analytics_Usage_Flag.php
@@ -17,6 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration\Migrations;
 
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 
 /**
@@ -25,16 +26,31 @@
  * @coversDefaultClass \Google\Web_Stories\Migrations\Set_Legacy_Analytics_Usage_Flag
  *
  */
-class Set_Legacy_Analytics_Usage_Flag extends TestCase {
+class Set_Legacy_Analytics_Usage_Flag extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Migrations\Set_Legacy_Analytics_Usage_Flag
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Migrations\Set_Legacy_Analytics_Usage_Flag::class );
+	}
+
+	public function tear_down() {
+		delete_option( \Google\Web_Stories\Settings::SETTING_NAME_TRACKING_ID );
+
+		parent::tear_down();
+	}
+
 	/**
 	 * @covers ::migrate
 	 */
 	public function test_migrate_true() {
-		$instance = new \Google\Web_Stories\Migrations\Set_Legacy_Analytics_Usage_Flag();
-
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_TRACKING_ID, 'UA-12345678-9' );
 
-		$instance->migrate();
+		$this->instance->migrate();
 
 		$this->assertTrue( get_option( \Google\Web_Stories\Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) );
 	}
@@ -43,11 +59,9 @@ public function test_migrate_true() {
 	 * @covers ::migrate
 	 */
 	public function test_migrate_false() {
-		$instance = new \Google\Web_Stories\Migrations\Set_Legacy_Analytics_Usage_Flag();
-
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_TRACKING_ID, '' );
 
-		$instance->migrate();
+		$this->instance->migrate();
 
 		$this->assertFalse( get_option( \Google\Web_Stories\Settings::SETTING_NAME_USING_LEGACY_ANALYTICS ) );
 	}
diff --git a/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php b/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php
index ccaef2788060..a2afc31e7ab2 100644
--- a/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php
@@ -90,10 +90,9 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->controller = new \Google\Web_Stories\REST_API\Publisher_Logos_Controller();
+		$this->controller = new \Google\Web_Stories\REST_API\Publisher_Logos_Controller( new Settings() );
 	}
 
-
 	public function tear_down() {
 		delete_option( Settings::SETTING_NAME_PUBLISHER_LOGOS );
 		delete_option( Settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO );
@@ -112,7 +111,6 @@ public function test_register_routes() {
 		$this->assertArrayHasKey( '/web-stories/v1/publisher-logos', $routes );
 
 		$route = $routes['/web-stories/v1/publisher-logos'];
-		$this->assertCount( 2, $route );
 		$this->assertArrayHasKey( 'callback', $route[0] );
 		$this->assertArrayHasKey( 'permission_callback', $route[0] );
 		$this->assertArrayHasKey( 'methods', $route[0] );

From 042279f80e7327962489251a099b62f70f353013 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 4 Oct 2021 17:11:16 +0200
Subject: [PATCH 34/41] More test updates

---
 includes/KSES.php                             | 39 +++++-----
 includes/Page_Template_Post_Type.php          | 23 +++++-
 .../integration/includes/Kses_Setup.php       |  4 +-
 .../integration/tests/AMP/Sanitization.php    | 74 +++++++++----------
 tests/phpunit/integration/tests/AdSense.php   | 24 +++---
 .../phpunit/integration/tests/Ad_Manager.php  | 21 +++---
 .../integration/tests/Admin/Customizer.php    | 38 ++++------
 .../integration/tests/Admin/Editor.php        |  2 -
 tests/phpunit/integration/tests/Analytics.php | 34 +++++----
 .../phpunit/integration/tests/Experiments.php | 40 +++++-----
 tests/phpunit/integration/tests/KSES.php      | 35 +++++----
 .../integration/tests/Media/Video/Poster.php  | 16 ++--
 .../tests/Page_Template_Post_Type.php         | 17 +++--
 .../tests/REST_API/Embed_Controller.php       |  2 +
 .../REST_API/Page_Template_Controller.php     | 37 +++++-----
 .../tests/REST_API/Stories_Controller.php     |  2 -
 .../REST_API/Stories_Media_Controller.php     |  6 --
 .../REST_API/Stories_Users_Controller.php     |  6 --
 .../integration/tests/User/Preferences.php    |  5 +-
 19 files changed, 227 insertions(+), 198 deletions(-)

diff --git a/includes/KSES.php b/includes/KSES.php
index a92a3f40f1c8..da4ce11ef1fb 100644
--- a/includes/KSES.php
+++ b/includes/KSES.php
@@ -36,9 +36,27 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class KSES extends Service_Base implements HasRequirements {
+class KSES extends Service_Base {
 	use Post_Type;
 
+	/**
+	 * Story_Post_Type instance.
+	 *
+	 * @var Story_Post_Type Story_Post_Type instance.
+	 */
+	private $story_post_type;
+
+	/**
+	 * KSES constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Story_Post_Type $story_post_type Story_Post_Type instance.
+	 */
+	public function __construct( Story_Post_Type $story_post_type ) {
+		$this->story_post_type = $story_post_type;
+	}
+
 	/**
 	 * Initializes KSES filters for stories.
 	 *
@@ -47,7 +65,7 @@ class KSES extends Service_Base implements HasRequirements {
 	 * @return void
 	 */
 	public function register() {
-		if ( ! $this->get_post_type_cap( Story_Post_Type::POST_TYPE_SLUG, 'edit_posts' ) ) {
+		if ( ! $this->get_post_type_cap( $this->story_post_type::POST_TYPE_SLUG, 'edit_posts' ) ) {
 			return;
 		}
 
@@ -69,19 +87,6 @@ public static function get_registration_action_priority(): int {
 		return 11;
 	}
 
-	/**
-	 * Get the list of service IDs required for this service to be registered.
-	 *
-	 * @todo Inject post type instance via constructor instead.
-	 *
-	 * @since 1.12.0
-	 *
-	 * @return string[] List of required services.
-	 */
-	public static function get_requirements(): array {
-		return [ 'story_post_type' ];
-	}
-
 	/**
 	 * Filters slashed post data just before it is inserted into the database.
 	 *
@@ -101,11 +106,11 @@ public static function get_requirements(): array {
 	 */
 	public function filter_insert_post_data( $data, $postarr, $unsanitized_postarr ) {
 		if (
-			( Story_Post_Type::POST_TYPE_SLUG !== $data['post_type'] ) && !
+			( $this->story_post_type::POST_TYPE_SLUG !== $data['post_type'] ) && !
 			(
 				'revision' === $data['post_type'] &&
 				! empty( $data['post_parent'] ) &&
-				Story_Post_Type::POST_TYPE_SLUG === get_post_type( $data['post_parent'] )
+				$this->story_post_type::POST_TYPE_SLUG === get_post_type( $data['post_parent'] )
 			)
 		) {
 			return $data;
diff --git a/includes/Page_Template_Post_Type.php b/includes/Page_Template_Post_Type.php
index dcb55749d3e4..d075e8302879 100644
--- a/includes/Page_Template_Post_Type.php
+++ b/includes/Page_Template_Post_Type.php
@@ -34,6 +34,7 @@
  */
 class Page_Template_Post_Type extends Service_Base {
 	use Post_Type;
+
 	/**
 	 * The slug of the page template post type.
 	 * Limited to web-story-page as web-story-page-template goes over character limit.
@@ -42,6 +43,24 @@ class Page_Template_Post_Type extends Service_Base {
 	 */
 	const POST_TYPE_SLUG = 'web-story-page';
 
+	/**
+	 * Story_Post_Type instance.
+	 *
+	 * @var Story_Post_Type Story_Post_Type instance.
+	 */
+	private $story_post_type;
+
+	/**
+	 * Page_Template_Post_Type constructor.
+	 *
+	 * @since 1.12.0
+	 *
+	 * @param Story_Post_Type $story_post_type Story_Post_Type instance.
+	 */
+	public function __construct( Story_Post_Type $story_post_type ) {
+		$this->story_post_type = $story_post_type;
+	}
+
 	/**
 	 * Registers the post type for page templates.
 	 *
@@ -50,8 +69,8 @@ class Page_Template_Post_Type extends Service_Base {
 	 * @return void
 	 */
 	public function register() {
-		$edit_posts   = $this->get_post_type_cap_name( Story_Post_Type::POST_TYPE_SLUG, 'edit_posts' );
-		$delete_posts = $this->get_post_type_cap_name( Story_Post_Type::POST_TYPE_SLUG, 'delete_posts' );
+		$edit_posts   = $this->get_post_type_cap_name( $this->story_post_type::POST_TYPE_SLUG, 'edit_posts' );
+		$delete_posts = $this->get_post_type_cap_name( $this->story_post_type::POST_TYPE_SLUG, 'delete_posts' );
 		$capabilities = [
 			'edit_post'              => $edit_posts,
 			'read_post'              => $edit_posts,
diff --git a/tests/phpunit/integration/includes/Kses_Setup.php b/tests/phpunit/integration/includes/Kses_Setup.php
index 038a831e7089..175a0a18b4fa 100644
--- a/tests/phpunit/integration/includes/Kses_Setup.php
+++ b/tests/phpunit/integration/includes/Kses_Setup.php
@@ -34,7 +34,9 @@ trait Kses_Setup {
 	 * Setup KSES init class.
 	 */
 	protected function kses_int() {
-		$this->kses = new \Google\Web_Stories\KSES();
+		$this->kses = new \Google\Web_Stories\KSES(
+			new \Google\Web_Stories\Story_Post_Type( new \Google\Web_Stories\Settings() )
+		);
 		$this->kses->register();
 	}
 
diff --git a/tests/phpunit/integration/tests/AMP/Sanitization.php b/tests/phpunit/integration/tests/AMP/Sanitization.php
index 2eb3cce2859c..9806a44d3c91 100644
--- a/tests/phpunit/integration/tests/AMP/Sanitization.php
+++ b/tests/phpunit/integration/tests/AMP/Sanitization.php
@@ -30,6 +30,17 @@
  * @coversDefaultClass \Google\Web_Stories\AMP\Sanitization
  */
 class Sanitization extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\AMP\Sanitization
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
+	}
+
 	public function tear_down() {
 		remove_all_filters( 'web_stories_amp_sanitizers' );
 		remove_all_filters( 'web_stories_amp_dev_mode_enabled' );
@@ -64,10 +75,8 @@ public function test_scripts_get_moved_to_head() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$document = Document::fromHtml( $original_html );
-		$sanitization->sanitize_document( $document );
+		$this->instance->sanitize_document( $document );
 
 		$scripts = $document->xpath->query( '//script[ not( @type ) or @type = "text/javascript" ]' );
 		$this->assertSame( 2, $scripts->length );
@@ -100,10 +109,8 @@ public function test_unneeded_scripts_get_removed() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$document = Document::fromHtml( $original_html );
-		$sanitization->sanitize_document( $document );
+		$this->instance->sanitize_document( $document );
 
 		/** @var DOMElement $script Script. */
 		$actual_script_srcs = [];
@@ -149,10 +156,8 @@ public function test_duplicate_scripts_are_removed() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$document = Document::fromHtml( $original_html );
-		$sanitization->sanitize_document( $document );
+		$this->instance->sanitize_document( $document );
 
 		$script_srcs = [];
 
@@ -201,10 +206,8 @@ public function test_missing_scripts_get_added() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$document = Document::fromHtml( $original_html );
-		$sanitization->sanitize_document( $document );
+		$this->instance->sanitize_document( $document );
 
 		/** @var DOMElement $script Script. */
 		$actual_script_srcs = [];
@@ -228,8 +231,7 @@ public function test_missing_scripts_get_added() {
 	 * @covers ::get_extension_sources
 	 */
 	public function test_get_extension_sources() {
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-		$sources      = $this->call_private_method( $sanitization, 'get_extension_sources' );
+		$sources = $this->call_private_method( $this->instance, 'get_extension_sources' );
 
 		$actual = [];
 
@@ -387,13 +389,12 @@ public function test_get_extension_sources() {
 	 * @covers ::is_amp_dev_mode
 	 */
 	public function test_is_amp_dev_mode() {
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
 
-		$this->assertFalse( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertFalse( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 		add_filter( 'web_stories_amp_dev_mode_enabled', '__return_true' );
-		$this->assertTrue( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertTrue( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 		remove_filter( 'web_stories_amp_dev_mode_enabled', '__return_true' );
-		$this->assertFalse( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertFalse( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 	}
 
 	/**
@@ -401,13 +402,13 @@ public function test_is_amp_dev_mode() {
 	 * @covers ::is_amp_dev_mode
 	 */
 	public function test_is_amp_dev_mode_authenticated_user_admin_bar_showing() {
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		add_filter( 'show_admin_bar', '__return_true' );
+
 		wp_set_current_user( self::factory()->user->create( [ 'role' => 'administrator' ] ) );
+
 		$this->assertTrue( is_admin_bar_showing() );
 		$this->assertTrue( is_user_logged_in() );
-		$this->assertTrue( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertTrue( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 	}
 
 	/**
@@ -415,15 +416,13 @@ public function test_is_amp_dev_mode_authenticated_user_admin_bar_showing() {
 	 * @covers ::is_amp_dev_mode
 	 */
 	public function test_is_amp_dev_mode_unauthenticated_user_admin_bar_forced() {
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		// Test unauthenticated user with admin bar forced.
 		add_filter( 'show_admin_bar', '__return_true' );
 		wp_set_current_user( 0 );
 
 		$this->assertFalse( is_user_logged_in() );
 		$this->assertTrue( is_admin_bar_showing() );
-		$this->assertFalse( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertFalse( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 	}
 
 	/**
@@ -440,8 +439,7 @@ static function( $sanitizers ) {
 			}
 		);
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-		$sanitizers   = $this->call_private_method( $sanitization, 'get_sanitizers' );
+		$sanitizers = $this->call_private_method( $this->instance, 'get_sanitizers' );
 
 		$ordered_sanitizers = array_keys( $sanitizers );
 		$this->assertEquals( 'Even_After_Validating_Sanitizer', $ordered_sanitizers[ count( $ordered_sanitizers ) - 5 ] );
@@ -456,10 +454,8 @@ static function( $sanitizers ) {
 	 * @covers ::get_sanitizers
 	 */
 	public function test_get_sanitizers_with_dev_mode() {
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$element_xpaths            = [ '//script[ @id = "hello-world" ]' ];
-		$validation_error_callback = [ $sanitization, 'validation_error_callback' ];
+		$validation_error_callback = [ $this->instance, 'validation_error_callback' ];
 		add_filter(
 			'web_stories_amp_dev_mode_element_xpaths',
 			function ( $xpaths ) use ( $element_xpaths ) {
@@ -468,15 +464,15 @@ function ( $xpaths ) use ( $element_xpaths ) {
 		);
 
 		// Check that AMP_Dev_Mode_Sanitizer is not registered if not in dev mode.
-		$sanitizers = $this->call_private_method( $sanitization, 'get_sanitizers' );
-		$this->assertFalse( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$sanitizers = $this->call_private_method( $this->instance, 'get_sanitizers' );
+		$this->assertFalse( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 		$this->assertArrayNotHasKey( AMP_Dev_Mode_Sanitizer::class, $sanitizers );
 
 		// Check that AMP_Dev_Mode_Sanitizer is registered once in dev mode, but not with admin bar showing yet.
 		add_filter( 'web_stories_amp_dev_mode_enabled', '__return_true' );
-		$sanitizers = $this->call_private_method( $sanitization, 'get_sanitizers' );
+		$sanitizers = $this->call_private_method( $this->instance, 'get_sanitizers' );
 		$this->assertFalse( is_admin_bar_showing() );
-		$this->assertTrue( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertTrue( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 		$this->assertArrayHasKey( AMP_Dev_Mode_Sanitizer::class, $sanitizers );
 		$this->assertEquals( AMP_Dev_Mode_Sanitizer::class, current( array_keys( $sanitizers ) ) );
 		$this->assertEquals(
@@ -489,10 +485,10 @@ function ( $xpaths ) use ( $element_xpaths ) {
 		add_filter( 'web_stories_amp_dev_mode_enabled', '__return_true' );
 		add_filter( 'show_admin_bar', '__return_true' );
 
-		$sanitizers = $this->call_private_method( $sanitization, 'get_sanitizers' );
+		$sanitizers = $this->call_private_method( $this->instance, 'get_sanitizers' );
 
 		$this->assertTrue( is_admin_bar_showing() );
-		$this->assertTrue( $this->call_private_method( $sanitization, 'is_amp_dev_mode' ) );
+		$this->assertTrue( $this->call_private_method( $this->instance, 'is_amp_dev_mode' ) );
 		$this->assertArrayHasKey( AMP_Dev_Mode_Sanitizer::class, $sanitizers );
 		$this->assertEqualSets(
 			array_merge(
@@ -531,10 +527,8 @@ public function test_sanitize_amp_video_with_missing_poster() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$document = Document::fromHtml( $original_html );
-		$sanitization->sanitize_document( $document );
+		$this->instance->sanitize_document( $document );
 
 		$video_element = $document->body->getElementsByTagName( 'amp-video' )->item( 0 );
 		$this->assertInstanceOf( DOMElement::class, $video_element );
@@ -564,10 +558,8 @@ public function test_sanitize_amp_video_with_http_source() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = $this->injector->make( \Google\Web_Stories\AMP\Sanitization::class );
-
 		$document = Document::fromHtml( $original_html );
-		$sanitization->sanitize_document( $document );
+		$this->instance->sanitize_document( $document );
 
 		$video_element = $document->body->getElementsByTagName( 'amp-video' )->item( 0 );
 		$this->assertInstanceOf( DOMElement::class, $video_element );
diff --git a/tests/phpunit/integration/tests/AdSense.php b/tests/phpunit/integration/tests/AdSense.php
index 1322f13f619c..274bca444f20 100644
--- a/tests/phpunit/integration/tests/AdSense.php
+++ b/tests/phpunit/integration/tests/AdSense.php
@@ -21,6 +21,10 @@
  * @coversDefaultClass \Google\Web_Stories\AdSense
  */
 class AdSense extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\AdSense
+	 */
+	private $instance;
 
 	public function set_up() {
 		parent::set_up();
@@ -28,6 +32,8 @@ public function set_up() {
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_AD_NETWORK, 'adsense' );
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_ADSENSE_SLOT_ID, '123' );
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID, '456' );
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\AdSense::class );
 	}
 
 	public function tear_down() {
@@ -42,18 +48,16 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
-		$adsense->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_action( 'web_stories_print_analytics', [ $adsense, 'print_adsense_tag' ] ) );
+		$this->assertSame( 10, has_action( 'web_stories_print_analytics', [ $this->instance, 'print_adsense_tag' ] ) );
 	}
 
 	/**
 	 * @covers ::get_publisher_id
 	 */
 	public function test_get_publisher_id() {
-		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
-		$result  = $this->call_private_method( $adsense, 'get_publisher_id' );
+		$result = $this->call_private_method( $this->instance, 'get_publisher_id' );
 		$this->assertSame( '456', $result );
 	}
 
@@ -61,8 +65,7 @@ public function test_get_publisher_id() {
 	 * @covers ::get_slot_id
 	 */
 	public function test_get_slot_id() {
-		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
-		$result  = $this->call_private_method( $adsense, 'get_slot_id' );
+		$result = $this->call_private_method( $this->instance, 'get_slot_id' );
 		$this->assertSame( '123', $result );
 	}
 
@@ -70,8 +73,7 @@ public function test_get_slot_id() {
 	 * @covers ::is_enabled
 	 */
 	public function test_is_enabled() {
-		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
-		$result  = $this->call_private_method( $adsense, 'is_enabled' );
+		$result = $this->call_private_method( $this->instance, 'is_enabled' );
 		$this->assertTrue( $result );
 	}
 
@@ -79,9 +81,7 @@ public function test_is_enabled() {
 	 * @covers ::print_adsense_tag
 	 */
 	public function test_print_adsense_tag() {
-		$adsense = $this->injector->make( \Google\Web_Stories\AdSense::class );
-
-		$output = get_echo( [ $adsense, 'print_adsense_tag' ] );
+		$output = get_echo( [ $this->instance, 'print_adsense_tag' ] );
 		$this->assertStringContainsString( '<amp-story-auto-ads>', $output );
 	}
 }
diff --git a/tests/phpunit/integration/tests/Ad_Manager.php b/tests/phpunit/integration/tests/Ad_Manager.php
index f7aacd6e8da5..b8f0c6d57eb4 100644
--- a/tests/phpunit/integration/tests/Ad_Manager.php
+++ b/tests/phpunit/integration/tests/Ad_Manager.php
@@ -21,12 +21,18 @@
  * @coversDefaultClass \Google\Web_Stories\Ad_Manager
  */
 class Ad_Manager extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Ad_Manager
+	 */
+	private $instance;
 
 	public function set_up() {
 		parent::set_up();
 
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_AD_NETWORK, 'admanager' );
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_AD_MANAGER_SLOT_ID, '123' );
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
 	}
 
 	public function tear_down() {
@@ -40,18 +46,16 @@ public function tear_down() {
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
-		$adsense->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_action( 'web_stories_print_analytics', [ $adsense, 'print_ad_manager_tag' ] ) );
+		$this->assertSame( 10, has_action( 'web_stories_print_analytics', [ $this->instance, 'print_ad_manager_tag' ] ) );
 	}
 
 	/**
 	 * @covers ::get_slot_id
 	 */
 	public function test_get_slot_id() {
-		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
-		$result  = $this->call_private_method( $adsense, 'get_slot_id' );
+		$result = $this->call_private_method( $this->instance, 'get_slot_id' );
 		$this->assertSame( '123', $result );
 	}
 
@@ -59,8 +63,7 @@ public function test_get_slot_id() {
 	 * @covers ::is_enabled
 	 */
 	public function test_is_enabled() {
-		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
-		$result  = $this->call_private_method( $adsense, 'is_enabled' );
+		$result = $this->call_private_method( $this->instance, 'is_enabled' );
 		$this->assertTrue( $result );
 	}
 
@@ -68,9 +71,7 @@ public function test_is_enabled() {
 	 * @covers ::print_ad_manager_tag
 	 */
 	public function test_print_ad_manager_tag() {
-		$adsense = $this->injector->make( \Google\Web_Stories\Ad_Manager::class );
-
-		$output = get_echo( [ $adsense, 'print_ad_manager_tag' ] );
+		$output = get_echo( [ $this->instance, 'print_ad_manager_tag' ] );
 		$this->assertStringContainsString( '<amp-story-auto-ads>', $output );
 	}
 }
diff --git a/tests/phpunit/integration/tests/Admin/Customizer.php b/tests/phpunit/integration/tests/Admin/Customizer.php
index 7c7642f69e60..3d7cea8b58ea 100644
--- a/tests/phpunit/integration/tests/Admin/Customizer.php
+++ b/tests/phpunit/integration/tests/Admin/Customizer.php
@@ -34,25 +34,18 @@ class Customizer extends DependencyInjectedTestCase {
 	use Theme_Support;
 
 	/**
-	 * Instance of WP_Customize_Manager which is reset for each test.
+	 * Test instance.
 	 *
-	 * @var WP_Customize_Manager
-	 */
-	public $wp_customize;
-
-	/**
-	 * Customizer mock object.
-	 *
-	 * @var \PHPUnit\Framework\MockObject\MockObject|\WP_Customize_Manager
+	 * @var \Google\Web_Stories\Admin\Customizer
 	 */
-	private $customizer_mock;
+	private $instance;
 
 	/**
-	 * Teste instance.
+	 * Test instance.
 	 *
-	 * @var \Google\Web_Stories\Admin\Customizer
+	 * @var \WP_Customize_Manager
 	 */
-	private $instance;
+	private $wp_customize_mock;
 
 	public static function wpSetUpBeforeClass() {
 		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
@@ -67,10 +60,9 @@ public function set_up() {
 
 		global $wp_customize;
 
-		$this->instance      = $this->injector->make( \Google\Web_Stories\Admin\Customizer::class );
-		$this->wp_customize  = new \WP_Customize_Manager();
-		$wp_customize        = $this->wp_customize;
-		$this->instance_mock = $this->createMock( WP_Customize_Manager::class );
+		$wp_customize            = new \WP_Customize_Manager();
+		$this->wp_customize_mock = $this->createMock( WP_Customize_Manager::class );
+		$this->instance          = $this->injector->make( \Google\Web_Stories\Admin\Customizer::class );
 	}
 
 	/**
@@ -153,7 +145,7 @@ public function test_register() {
 	public function test_customizer_web_stories_section_added() {
 		$this->add_web_stories_theme_support();
 
-		$this->instance_mock->expects( $this->once() )->method( 'add_section' )->with(
+		$this->wp_customize_mock->expects( $this->once() )->method( 'add_section' )->with(
 			TheCustomizer::SECTION_SLUG,
 			[
 				'title'          => 'Web Stories',
@@ -161,7 +153,7 @@ public function test_customizer_web_stories_section_added() {
 			]
 		);
 
-		$this->instance->register_customizer_settings( $this->instance_mock );
+		$this->instance->register_customizer_settings( $this->wp_customize_mock );
 	}
 
 	/**
@@ -169,8 +161,8 @@ public function test_customizer_web_stories_section_added() {
 	 */
 	public function test_customizer_settings_added() {
 		$this->add_web_stories_theme_support();
-		$this->instance_mock->expects( $this->exactly( 14 ) )->method( 'add_setting' );
-		$this->instance->register_customizer_settings( $this->instance_mock );
+		$this->wp_customize_mock->expects( $this->exactly( 14 ) )->method( 'add_setting' );
+		$this->instance->register_customizer_settings( $this->wp_customize_mock );
 	}
 
 	/**
@@ -178,7 +170,7 @@ public function test_customizer_settings_added() {
 	 */
 	public function test_customizer_show_stories_settings_added() {
 		$this->add_web_stories_theme_support();
-		$this->instance_mock->expects( $this->exactly( 14 ) )->
+		$this->wp_customize_mock->expects( $this->exactly( 14 ) )->
 		method( 'add_setting' )->
 		withConsecutive(
 			[
@@ -283,7 +275,7 @@ public function test_customizer_show_stories_settings_added() {
 			]
 		);
 
-		$this->instance->register_customizer_settings( $this->instance_mock );
+		$this->instance->register_customizer_settings( $this->wp_customize_mock );
 	}
 
 	/**
diff --git a/tests/phpunit/integration/tests/Admin/Editor.php b/tests/phpunit/integration/tests/Admin/Editor.php
index 7dcd16de709e..13e85786b49a 100644
--- a/tests/phpunit/integration/tests/Admin/Editor.php
+++ b/tests/phpunit/integration/tests/Admin/Editor.php
@@ -137,8 +137,6 @@ public function set_up() {
 	}
 
 	public function tear_down() {
-		$this->set_permalink_structure( '' );
-
 		delete_post_meta( self::$story_id, '_edit_lock' );
 
 		$this->remove_caps_from_roles();
diff --git a/tests/phpunit/integration/tests/Analytics.php b/tests/phpunit/integration/tests/Analytics.php
index cf43e3088b93..3e6b0d39ed67 100644
--- a/tests/phpunit/integration/tests/Analytics.php
+++ b/tests/phpunit/integration/tests/Analytics.php
@@ -23,14 +23,24 @@
  * @coversDefaultClass \Google\Web_Stories\Analytics
  */
 class Analytics extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\Analytics
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Analytics::class );
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$analytics = $this->injector->make( \Google\Web_Stories\Analytics::class );
-		$analytics->register();
+		$this->instance->register();
 
-		$this->assertSame( 10, has_filter( 'web_stories_print_analytics', [ $analytics, 'print_analytics_tag' ] ) );
+		$this->assertSame( 10, has_filter( 'web_stories_print_analytics', [ $this->instance, 'print_analytics_tag' ] ) );
 	}
 
 	/**
@@ -38,8 +48,8 @@ public function test_register() {
 	 */
 	public function test_get_tracking_id_casts_to_string() {
 		update_option( Settings::SETTING_NAME_TRACKING_ID, 123456789, false );
-		$analytics = $this->injector->make( \Google\Web_Stories\Analytics::class );
-		$this->assertSame( '123456789', $analytics->get_tracking_id() );
+
+		$this->assertSame( '123456789', $this->instance->get_tracking_id() );
 	}
 
 	/**
@@ -47,8 +57,7 @@ public function test_get_tracking_id_casts_to_string() {
 	 */
 	public function test_get_default_configuration() {
 		$tracking_id = '123456789';
-		$analytics   = $this->injector->make( \Google\Web_Stories\Analytics::class );
-		$actual      = $analytics->get_default_configuration( $tracking_id );
+		$actual      = $this->instance->get_default_configuration( $tracking_id );
 		$this->assertArrayHasKey( 'vars', $actual );
 		$this->assertArrayHasKey( 'gtag_id', $actual['vars'] );
 		$this->assertSame( (string) $tracking_id, $actual['vars']['gtag_id'] );
@@ -77,13 +86,13 @@ public function test_print_analytics_tag() {
 		$experiments->method( 'is_experiment_enabled' )
 					->willReturn( true );
 
-		$analytics     = new \Google\Web_Stories\Analytics( $this->injector->make( Settings::class ), $experiments );
-		$actual_before = get_echo( [ $analytics, 'print_analytics_tag' ] );
+		$this->instance = new \Google\Web_Stories\Analytics( $this->injector->make( Settings::class ), $experiments );
+		$actual_before  = get_echo( [ $this->instance, 'print_analytics_tag' ] );
 
 		update_option( Settings::SETTING_NAME_TRACKING_ID, 123456789, false );
 		update_option( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS, false );
 
-		$actual_after = get_echo( [ $analytics, 'print_analytics_tag' ] );
+		$actual_after = get_echo( [ $this->instance, 'print_analytics_tag' ] );
 
 		$this->assertEmpty( $actual_before );
 		$this->assertStringContainsString( '<amp-story-auto-analytics', $actual_after );
@@ -93,13 +102,12 @@ public function test_print_analytics_tag() {
 	 * @covers ::print_analytics_tag
 	 */
 	public function test_print_analytics_tag_legacy() {
-		$analytics     = $this->injector->make( \Google\Web_Stories\Analytics::class );
-		$actual_before = get_echo( [ $analytics, 'print_analytics_tag' ] );
+		$actual_before = get_echo( [ $this->instance, 'print_analytics_tag' ] );
 
 		update_option( Settings::SETTING_NAME_TRACKING_ID, 123456789, false );
 		update_option( Settings::SETTING_NAME_USING_LEGACY_ANALYTICS, true );
 
-		$actual_after = get_echo( [ $analytics, 'print_analytics_tag' ] );
+		$actual_after = get_echo( [ $this->instance, 'print_analytics_tag' ] );
 
 		$this->assertEmpty( $actual_before );
 		$this->assertStringContainsString( '<amp-analytics', $actual_after );
diff --git a/tests/phpunit/integration/tests/Experiments.php b/tests/phpunit/integration/tests/Experiments.php
index 7b15a82ea5c6..88d61cfbf8c5 100644
--- a/tests/phpunit/integration/tests/Experiments.php
+++ b/tests/phpunit/integration/tests/Experiments.php
@@ -114,9 +114,9 @@ public function test_initialize_settings() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field() {
-		$this->instance = $this->createPartialMock(
+		$this->instance = $this->createTestProxy(
 			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments', 'is_experiment_enabled' ]
+			[ $this->injector->make( \Google\Web_Stories\Settings::class ) ]
 		);
 		$this->instance->method( 'get_experiments' )
 					->willReturn(
@@ -148,10 +148,11 @@ public function test_display_experiment_field() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field_enabled() {
-		$this->instance = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments', 'is_experiment_enabled' ]
-		);
+		$this->instance = $this->getMockBuilder( \Google\Web_Stories\Experiments::class )
+			->setConstructorArgs( [ $this->injector->make( \Google\Web_Stories\Settings::class ) ] )
+			->setMethods( [ 'get_experiments', 'is_experiment_enabled' ] )
+			->getMock();
+
 		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
@@ -181,10 +182,11 @@ public function test_display_experiment_field_enabled() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field_enabled_by_default() {
-		$this->instance = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
-		);
+		$this->instance = $this->getMockBuilder( \Google\Web_Stories\Experiments::class )
+							   ->setConstructorArgs( [ $this->injector->make( \Google\Web_Stories\Settings::class ) ] )
+							   ->setMethods( [ 'get_experiments' ] )
+							   ->getMock();
+
 		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
@@ -266,10 +268,11 @@ public function test_is_experiment_enabled() {
 	 * @covers ::get_experiment
 	 */
 	public function test_is_experiment_enabled_default_experiment() {
-		$this->instance = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
-		);
+		$this->instance = $this->getMockBuilder( \Google\Web_Stories\Experiments::class )
+							->setConstructorArgs( [ $this->injector->make( \Google\Web_Stories\Settings::class ) ] )
+							->setMethods( [ 'get_experiments' ] )
+							->getMock();
+
 		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
@@ -306,10 +309,11 @@ public function test_is_experiment_enabled_unknown_experiment() {
 	public function test_get_enabled_experiments() {
 		update_option( \Google\Web_Stories\Settings::SETTING_NAME_EXPERIMENTS, [ 'baz' => true ], false );
 
-		$this->instance = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments', 'is_experiment_enabled' ]
-		);
+		$this->instance = $this->getMockBuilder( \Google\Web_Stories\Experiments::class )
+							->setConstructorArgs( [ $this->injector->make( \Google\Web_Stories\Settings::class ) ] )
+							->setMethods( [ 'get_experiments', 'is_experiment_enabled' ] )
+							->getMock();
+
 		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
diff --git a/tests/phpunit/integration/tests/KSES.php b/tests/phpunit/integration/tests/KSES.php
index c0ddef72f60f..592d107cc50a 100644
--- a/tests/phpunit/integration/tests/KSES.php
+++ b/tests/phpunit/integration/tests/KSES.php
@@ -20,7 +20,17 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\KSES
  */
-class KSES extends TestCase {
+class KSES extends DependencyInjectedTestCase {
+	/**
+	 * @var \Google\Web_Stories\KSES
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\KSES::class );
+	}
 
 	/**
 	 * Testing the safecss_filter_attr() function.
@@ -32,8 +42,7 @@ class KSES extends TestCase {
 	 * @param string $expected Expected string of CSS rules.
 	 */
 	public function test_safecss_filter_attr( $css, $expected ) {
-		$kses = new \Google\Web_Stories\KSES();
-		$this->assertSame( $expected, $kses->safecss_filter_attr( $css ) );
+		$this->assertSame( $expected, $this->instance->safecss_filter_attr( $css ) );
 	}
 
 	/**
@@ -47,10 +56,11 @@ public function test_safecss_filter_attr( $css, $expected ) {
 	 * @param string $expected Expected string of CSS rules.
 	 */
 	public function test_safecss_filter_attr_extended( $css, $expected ) {
-		$kses = new \Google\Web_Stories\KSES();
-		add_filter( 'safe_style_css', [ $kses, 'filter_safe_style_css' ] );
-		$this->assertSame( $expected, $kses->safecss_filter_attr( $css ) );
-		remove_filter( 'safe_style_css', [ $kses, 'filter_safe_style_css' ] );
+		add_filter( 'safe_style_css', [ $this->instance, 'filter_safe_style_css' ] );
+		$actual = $this->instance->safecss_filter_attr( $css );
+		remove_filter( 'safe_style_css', [ $this->instance, 'filter_safe_style_css' ] );
+
+		$this->assertSame( $expected, $actual );
 	}
 
 	/**
@@ -59,7 +69,6 @@ public function test_safecss_filter_attr_extended( $css, $expected ) {
 	 * @covers ::array_merge_recursive_distinct
 	 */
 	public function test_array_merge_recursive_distinct() {
-		$kses         = new \Google\Web_Stories\KSES();
 		$input_array1 = [
 			'one' => [
 				'one-one' => [],
@@ -73,7 +82,7 @@ public function test_array_merge_recursive_distinct() {
 		];
 
 		$output = $this->call_private_method(
-			$kses,
+			$this->instance,
 			'array_merge_recursive_distinct',
 			[
 				$input_array1,
@@ -338,11 +347,10 @@ public function data_test_safecss_filter_attr_extended(): array {
 	 * @param string $expected Expected output.
 	 */
 	public function test_filter_kses_allowed_html( $html, $expected ) {
-		$kses = new \Google\Web_Stories\KSES();
-		add_filter( 'wp_kses_allowed_html', [ $kses, 'filter_kses_allowed_html' ] );
+				add_filter( 'wp_kses_allowed_html', [ $this->instance, 'filter_kses_allowed_html' ] );
 
 		$this->assertSame( $expected, wp_unslash( wp_filter_post_kses( $html ) ) );
-		remove_filter( 'wp_kses_allowed_html', [ $kses, 'filter_kses_allowed_html' ] );
+		remove_filter( 'wp_kses_allowed_html', [ $this->instance, 'filter_kses_allowed_html' ] );
 	}
 
 	/**
@@ -352,7 +360,6 @@ public function test_filter_kses_allowed_html( $html, $expected ) {
 	 * @covers ::array_merge_recursive_distinct
 	 */
 	public function test_filter_kses_allowed_html_uses_deep_merge() {
-		$kses         = new \Google\Web_Stories\KSES();
 		$allowed_tags = [
 			'img'     => [
 				'width' => true,
@@ -362,7 +369,7 @@ public function test_filter_kses_allowed_html_uses_deep_merge() {
 			],
 		];
 
-		$result = $kses->filter_kses_allowed_html( $allowed_tags );
+		$result = $this->instance->filter_kses_allowed_html( $allowed_tags );
 
 		$this->assertArrayHasKey( 'img', $result );
 		$this->assertArrayHasKey( 'width', $result['img'] );
diff --git a/tests/phpunit/integration/tests/Media/Video/Poster.php b/tests/phpunit/integration/tests/Media/Video/Poster.php
index 534ea23be9d5..7c29ad78c6a0 100644
--- a/tests/phpunit/integration/tests/Media/Video/Poster.php
+++ b/tests/phpunit/integration/tests/Media/Video/Poster.php
@@ -32,10 +32,16 @@ class Poster extends DependencyInjectedTestCase {
 	 */
 	private $instance;
 
+	/**
+	 * @var \Google\Web_Stories\Media\Media_Source_Taxonomy
+	 */
+	private $media_source;
+
 	public function set_up() {
 		parent::set_up();
 
-		$this->instance = $this->injector->make( \Google\Web_Stories\Media\Video\Poster::class );
+		$this->instance     = $this->injector->make( \Google\Web_Stories\Media\Video\Poster::class );
+		$this->media_source = $this->injector->make( \Google\Web_Stories\Media\Media_Source_Taxonomy::class );
 	}
 
 	/**
@@ -175,7 +181,7 @@ public function test_get_thumbnail_data_generated() {
 			]
 		);
 
-		wp_set_object_terms( $poster_attachment_id, 'poster-generation', Services::get( 'media.media_source' )->get_taxonomy_slug() );
+		wp_set_object_terms( $poster_attachment_id, 'poster-generation', $this->media_source->get_taxonomy_slug() );
 
 		$result = $this->instance->get_thumbnail_data( $poster_attachment_id );
 		$this->assertTrue( $result['generated'] );
@@ -204,7 +210,7 @@ public function test_delete_video_poster() {
 		);
 
 		set_post_thumbnail( $video_attachment_id, $poster_attachment_id );
-		wp_set_object_terms( $poster_attachment_id, 'poster-generation', Services::get( 'media.media_source' )->get_taxonomy_slug() );
+		wp_set_object_terms( $poster_attachment_id, 'poster-generation', $this->media_source->get_taxonomy_slug() );
 		add_post_meta( $video_attachment_id, \Google\Web_Stories\Media\Video\Poster::POSTER_ID_POST_META_KEY, $poster_attachment_id );
 
 		$this->instance->delete_video_poster( $video_attachment_id );
@@ -285,11 +291,11 @@ public function test_is_poster() {
 		$result1 = $this->call_private_method( $this->instance, 'is_poster', [ $poster_attachment_id ] );
 		$this->assertFalse( $result1 );
 
-		wp_set_object_terms( $poster_attachment_id, 'editor', Services::get( 'media.media_source' )->get_taxonomy_slug() );
+		wp_set_object_terms( $poster_attachment_id, 'editor', $this->media_source->get_taxonomy_slug() );
 		$result2 = $this->call_private_method( $this->instance, 'is_poster', [ $poster_attachment_id ] );
 		$this->assertFalse( $result2 );
 
-		wp_set_object_terms( $poster_attachment_id, 'poster-generation', Services::get( 'media.media_source' )->get_taxonomy_slug() );
+		wp_set_object_terms( $poster_attachment_id, 'poster-generation', $this->media_source->get_taxonomy_slug() );
 		$result3 = $this->call_private_method( $this->instance, 'is_poster', [ $poster_attachment_id ] );
 		$this->assertTrue( $result3 );
 	}
diff --git a/tests/phpunit/integration/tests/Page_Template_Post_Type.php b/tests/phpunit/integration/tests/Page_Template_Post_Type.php
index 491396d2e185..db91e6e143cd 100644
--- a/tests/phpunit/integration/tests/Page_Template_Post_Type.php
+++ b/tests/phpunit/integration/tests/Page_Template_Post_Type.php
@@ -23,15 +23,22 @@
 class Page_Template_Post_Type extends DependencyInjectedTestCase {
 	use Capabilities_Setup;
 
+	/**
+	 * @var \Google\Web_Stories\Story_Post_Type
+	 */
+	private $instance;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Story_Post_Type::class );
+	}
+
 	/**
 	 * @covers ::register
 	 */
 	public function test_register() {
-		$instance = $this->injector->make( \Google\Web_Stories\Story_Post_Type::class );
-		$instance->register();
-
-		$ptpt = new \Google\Web_Stories\Page_Template_Post_Type();
-		$ptpt->register();
+		$this->instance->register();
 
 		$post_type_object = get_post_type_object( \Google\Web_Stories\Page_Template_Post_Type::POST_TYPE_SLUG );
 		$this->assertSame( 'edit_web-stories', $post_type_object->cap->edit_posts );
diff --git a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
index f5ac341e2d3f..45510ae96b9f 100644
--- a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
@@ -276,7 +276,9 @@ public function test_local_url() {
 		$this->controller->register();
 
 		wp_set_current_user( self::$editor );
+
 		$this->set_permalink_structure( '' );
+
 		$response = $this->dispatch_request( get_permalink( self::$story_id ) );
 		$data     = $response->get_data();
 
diff --git a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
index 0580e1074d80..0672f621e502 100644
--- a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
@@ -73,14 +73,11 @@ public static function wpSetUpBeforeClass( $factory ) {
 			]
 		);
 
-		$post_type = \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG;
-
 		$factory->post->create_many(
 			3,
 			[
 				'post_status' => 'publish',
 				'post_author' => self::$user_id,
-				'post_type'   => $post_type,
 			]
 		);
 
@@ -90,7 +87,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'post_status' => 'future',
 				'post_date'   => ( new DateTime( '+1day' ) )->format( 'Y-m-d H:i:s' ),
 				'post_author' => self::$user_id,
-				'post_type'   => $post_type,
 			]
 		);
 
@@ -99,7 +95,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 			[
 				'post_status' => 'publish',
 				'post_author' => self::$user2_id,
-				'post_type'   => $post_type,
 			]
 		);
 
@@ -108,7 +103,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 			[
 				'post_status' => 'publish',
 				'post_author' => self::$user3_id,
-				'post_type'   => $post_type,
 			]
 		);
 
@@ -117,7 +111,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 			[
 				'post_status' => 'draft',
 				'post_author' => self::$user_id,
-				'post_type'   => $post_type,
 			]
 		);
 	}
@@ -125,25 +118,28 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->controller = new \Google\Web_Stories\REST_API\Page_Template_Controller( \Google\Web_Stories\Story_Post_Type::POST_TYPE_SLUG );
+		$this->controller = new \Google\Web_Stories\REST_API\Page_Template_Controller( 'post' );
 
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
-	public function tear_down() {
-		$this->set_permalink_structure( '' );
+	/**
+	 * @covers ::get_collection_params
+	 */
+	public function test_get_collection_params() {
+		$actual = $this->controller->get_collection_params();
 
-		parent::tear_down();
+		$this->assertArrayHasKey( '_web_stories_envelope', $actual );
 	}
 
 	/**
-	 * @covers ::register_routes
+	 * @covers ::get_item_schema
 	 */
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
+	public function test_get_item_schema() {
+		$actual = $this->controller->get_item_schema();
 
-		$this->assertArrayHasKey( '/web-stories/v1/web-story', $routes );
-		$this->assertCount( 2, $routes['/web-stories/v1/web-story'] );
+		$this->assertArrayNotHasKey( 'permalink_template', $actual['properties'] );
+		$this->assertArrayNotHasKey( 'generated_slug', $actual['properties'] );
 	}
 
 	/**
@@ -154,12 +150,15 @@ public function test_get_items_format() {
 
 		wp_set_current_user( self::$user_id );
 
-		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/web-stories/v1/web-story' );
+		$request = new WP_REST_Request( \WP_REST_Server::READABLE, '/wp/v2/posts' );
 		$request->set_param( 'status', [ 'draft' ] );
 		$request->set_param( 'context', 'edit' );
+		$request->set_param( 'page', '1' );
 		$request->set_param( '_web_stories_envelope', true );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
+
+		$response = $this->controller->get_items( $request );
+
+		$data = $response->get_data();
 
 		// Body of request.
 		$this->assertArrayHasKey( 'headers', $data );
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
index b8d9040b779b..91689bd32b1a 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
@@ -140,8 +140,6 @@ public function set_up() {
 	}
 
 	public function tear_down() {
-		$this->set_permalink_structure( '' );
-
 		$this->kses_remove_filters();
 
 		parent::tear_down();
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
index 7f621811e557..9c9613fe4fbb 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
@@ -88,12 +88,6 @@ public function set_up() {
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
-	public function tear_down() {
-		$this->set_permalink_structure( '' );
-
-		parent::tear_down();
-	}
-
 	/**
 	 * @covers ::get_items
 	 */
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
index 2f3a87d32388..f8c773cc261d 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
@@ -68,12 +68,6 @@ public function set_up() {
 		$this->set_permalink_structure( '/%postname%/' );
 	}
 
-	public function tear_down() {
-		$this->set_permalink_structure( '' );
-
-		parent::tear_down();
-	}
-
 	/**
 	 * @covers ::register
 	 */
diff --git a/tests/phpunit/integration/tests/User/Preferences.php b/tests/phpunit/integration/tests/User/Preferences.php
index 498cca3007e9..43195a548e1e 100644
--- a/tests/phpunit/integration/tests/User/Preferences.php
+++ b/tests/phpunit/integration/tests/User/Preferences.php
@@ -18,6 +18,7 @@
 namespace Google\Web_Stories\Tests\Integration\User;
 
 use Google\Web_Stories\REST_API\Stories_Users_Controller;
+use Google\Web_Stories\Tests\Integration\DependencyInjectedTestCase;
 use Google\Web_Stories\Tests\Integration\TestCase;
 use Spy_REST_Server;
 use WP_REST_Request;
@@ -26,7 +27,7 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\User\Preferences
  */
-class Preferences extends TestCase {
+class Preferences extends DependencyInjectedTestCase {
 	/**
 	 * Admin user for test.
 	 *
@@ -63,7 +64,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->instance = new \Google\Web_Stories\User\Preferences();
+		$this->instance = $this->injector->make( \Google\Web_Stories\User\Preferences::class );
 	}
 
 	public function tear_down() {

From 8d84f5850015c82b2bd0de3923690f6aa962b4e4 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 4 Oct 2021 17:17:11 +0200
Subject: [PATCH 35/41] Lint fixes

---
 includes/KSES.php                               | 2 +-
 tests/phpunit/integration/tests/Experiments.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/KSES.php b/includes/KSES.php
index da4ce11ef1fb..ef2e79205a02 100644
--- a/includes/KSES.php
+++ b/includes/KSES.php
@@ -110,7 +110,7 @@ public function filter_insert_post_data( $data, $postarr, $unsanitized_postarr )
 			(
 				'revision' === $data['post_type'] &&
 				! empty( $data['post_parent'] ) &&
-				$this->story_post_type::POST_TYPE_SLUG === get_post_type( $data['post_parent'] )
+				get_post_type( $data['post_parent'] ) === $this->story_post_type::POST_TYPE_SLUG
 			)
 		) {
 			return $data;
diff --git a/tests/phpunit/integration/tests/Experiments.php b/tests/phpunit/integration/tests/Experiments.php
index 88d61cfbf8c5..e17cd64f20b7 100644
--- a/tests/phpunit/integration/tests/Experiments.php
+++ b/tests/phpunit/integration/tests/Experiments.php
@@ -183,9 +183,9 @@ public function test_display_experiment_field_enabled() {
 	 */
 	public function test_display_experiment_field_enabled_by_default() {
 		$this->instance = $this->getMockBuilder( \Google\Web_Stories\Experiments::class )
-							   ->setConstructorArgs( [ $this->injector->make( \Google\Web_Stories\Settings::class ) ] )
-							   ->setMethods( [ 'get_experiments' ] )
-							   ->getMock();
+							->setConstructorArgs( [ $this->injector->make( \Google\Web_Stories\Settings::class ) ] )
+							->setMethods( [ 'get_experiments' ] )
+							->getMock();
 
 		$this->instance->method( 'get_experiments' )
 					->willReturn(

From 0bd0263a8d85588a4c138f69098fbcc558c63157 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 4 Oct 2021 22:39:18 +0200
Subject: [PATCH 36/41] Fix kses

---
 includes/KSES.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/KSES.php b/includes/KSES.php
index ef2e79205a02..b8fbed6f27b2 100644
--- a/includes/KSES.php
+++ b/includes/KSES.php
@@ -65,14 +65,6 @@ public function __construct( Story_Post_Type $story_post_type ) {
 	 * @return void
 	 */
 	public function register() {
-		if ( ! $this->get_post_type_cap( $this->story_post_type::POST_TYPE_SLUG, 'edit_posts' ) ) {
-			return;
-		}
-
-		if ( current_user_can( 'unfiltered_html' ) ) {
-			return;
-		}
-
 		add_filter( 'wp_insert_post_data', [ $this, 'filter_insert_post_data' ], 10, 3 );
 	}
 
@@ -105,6 +97,10 @@ public static function get_registration_action_priority(): int {
 	 * @return array|mixed Filtered post data.
 	 */
 	public function filter_insert_post_data( $data, $postarr, $unsanitized_postarr ) {
+		if ( current_user_can( 'unfiltered_html' ) ) {
+			return $data;
+		}
+
 		if (
 			( $this->story_post_type::POST_TYPE_SLUG !== $data['post_type'] ) && !
 			(
@@ -116,6 +112,10 @@ public function filter_insert_post_data( $data, $postarr, $unsanitized_postarr )
 			return $data;
 		}
 
+		if ( ! $this->get_post_type_cap( $this->story_post_type::POST_TYPE_SLUG, 'edit_posts' ) ) {
+			return $data;
+		}
+
 		// Simple sanity check to ensure story data is valid JSON.
 		if ( isset( $unsanitized_postarr['post_content_filtered'] ) ) {
 			$story_data                    = json_decode( (string) wp_unslash( $unsanitized_postarr['post_content_filtered'] ), true );

From 3ff2c566bd44771e2d4d63b1a488739871e96699 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 5 Oct 2021 12:11:18 +0200
Subject: [PATCH 37/41] Update rest tests

---
 .../tests/REST_API/Page_Template_Controller.php            | 2 --
 .../tests/REST_API/Stories_Autosaves_Controller.php        | 7 +++----
 .../integration/tests/REST_API/Stories_Controller.php      | 2 --
 .../tests/REST_API/Stories_Media_Controller.php            | 2 --
 .../tests/REST_API/Stories_Users_Controller.php            | 2 --
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
index 0672f621e502..6f7c4d2b8b64 100644
--- a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
@@ -119,8 +119,6 @@ public function set_up() {
 		parent::set_up();
 
 		$this->controller = new \Google\Web_Stories\REST_API\Page_Template_Controller( 'post' );
-
-		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	/**
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
index 7f760a3fa98c..280bd8094473 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
@@ -17,7 +17,6 @@
 
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
-use Google\Web_Stories\REST_API\Stories_Autosaves_Controller as Controller;
 use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use WP_REST_Request;
@@ -27,7 +26,7 @@
  *
  * @package Google\Web_Stories\Tests\REST_API
  *
- * @coversDefaultClass Controller
+ * @coversDefaultClass \Google\Web_Stories\REST_API\Stories_Autosaves_Controller
  */
 class Stories_Autosaves_Controller extends Test_REST_TestCase {
 
@@ -41,7 +40,7 @@ class Stories_Autosaves_Controller extends Test_REST_TestCase {
 	/**
 	 * Test instance.
 	 *
-	 * @var Controller
+	 * @var \Google\Web_Stories\REST_API\Stories_Autosaves_Controller
 	 */
 	private $controller;
 
@@ -56,7 +55,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->controller = new Controller();
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Autosaves_Controller();
 	}
 
 	public function test_create_item_as_author_should_not_strip_markup() {
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
index 986b76e08b51..11ef46cf526d 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
@@ -144,8 +144,6 @@ public function set_up() {
 		parent::set_up();
 
 		$this->controller = new \Google\Web_Stories\REST_API\Stories_Controller( Story_Post_Type::POST_TYPE_SLUG );
-
-		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	public function tear_down() {
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
index 9c9613fe4fbb..c4c26abad116 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Media_Controller.php
@@ -84,8 +84,6 @@ public function set_up() {
 		parent::set_up();
 
 		$this->controller = new \Google\Web_Stories\REST_API\Stories_Media_Controller();
-
-		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	/**
diff --git a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
index f8c773cc261d..f96ccefe27d8 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Users_Controller.php
@@ -64,8 +64,6 @@ public function set_up() {
 		parent::set_up();
 
 		$this->controller = new \Google\Web_Stories\REST_API\Stories_Users_Controller();
-
-		$this->set_permalink_structure( '/%postname%/' );
 	}
 
 	/**

From 66dbc9930ce0bbf148f0b1887d23ba620958e689 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 5 Oct 2021 12:19:36 +0200
Subject: [PATCH 38/41] Update list of shared instances

---
 includes/Plugin.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/includes/Plugin.php b/includes/Plugin.php
index 25a1fd6ef123..79ee85913aa4 100644
--- a/includes/Plugin.php
+++ b/includes/Plugin.php
@@ -163,15 +163,19 @@ protected function get_service_classes(): array {
 	 */
 	protected function get_shared_instances(): array {
 		return [
-			Assets::class,
-			Experiments::class,
-			Admin\Meta_Boxes::class,
-			Locale::class,
 			Admin\Activation_Flag::class,
-			Integrations\Site_Kit::class,
+			Admin\Customizer::class,
+			Admin\Google_Fonts::class,
+			Admin\Meta_Boxes::class,
 			Analytics::class,
+			Assets::class,
 			Decoder::class,
-			Admin\Google_Fonts::class,
+			Experiments::class,
+			Injector::class,
+			Integrations\Site_Kit::class,
+			Locale::class,
+			Settings::class,
+			User\Preferences::class,
 		];
 	}
 

From d4ebbe7dfc3dbb1699b68d05e22b4265205edd5b Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 5 Oct 2021 13:00:08 +0200
Subject: [PATCH 39/41] Multi-line function call

---
 includes/Admin/Cross_Origin_Isolation.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/Admin/Cross_Origin_Isolation.php b/includes/Admin/Cross_Origin_Isolation.php
index 87a8fe39110b..e48986f8ddd2 100644
--- a/includes/Admin/Cross_Origin_Isolation.php
+++ b/includes/Admin/Cross_Origin_Isolation.php
@@ -101,7 +101,9 @@ public static function is_needed(): bool {
 			return false;
 		}
 
-		return rest_sanitize_boolean( Services::get( 'user_preferences' )->get_preference( $user_id, Preferences::MEDIA_OPTIMIZATION_META_KEY ) );
+		return rest_sanitize_boolean(
+			Services::get( 'user_preferences' )->get_preference( $user_id, Preferences::MEDIA_OPTIMIZATION_META_KEY )
+		);
 	}
 
 	/**

From 345ed483f09936991865e6405229a318d73fa836 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 5 Oct 2021 13:05:13 +0200
Subject: [PATCH 40/41] Extract variable

---
 includes/Admin/Cross_Origin_Isolation.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/Admin/Cross_Origin_Isolation.php b/includes/Admin/Cross_Origin_Isolation.php
index e48986f8ddd2..13cf6b11e4a0 100644
--- a/includes/Admin/Cross_Origin_Isolation.php
+++ b/includes/Admin/Cross_Origin_Isolation.php
@@ -101,8 +101,10 @@ public static function is_needed(): bool {
 			return false;
 		}
 
+		$user_preferences = Services::get( 'user_preferences' );
+
 		return rest_sanitize_boolean(
-			Services::get( 'user_preferences' )->get_preference( $user_id, Preferences::MEDIA_OPTIMIZATION_META_KEY )
+			$user_preferences->get_preference( $user_id, $user_preferences::MEDIA_OPTIMIZATION_META_KEY )
 		);
 	}
 

From da2455750735cbc301896ae33a56abab887ec398 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 5 Oct 2021 13:07:36 +0200
Subject: [PATCH 41/41] Remove alias

---
 includes/Admin/Activation_Flag.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Admin/Activation_Flag.php b/includes/Admin/Activation_Flag.php
index cd9d393e6d1d..ddfc51b178f2 100644
--- a/includes/Admin/Activation_Flag.php
+++ b/includes/Admin/Activation_Flag.php
@@ -27,12 +27,12 @@
 namespace Google\Web_Stories\Admin;
 
 use Google\Web_Stories\Infrastructure\Registerable;
-use Google\Web_Stories\Infrastructure\Service as ServiceInterface;
+use Google\Web_Stories\Infrastructure\Service;
 
 /**
  * Class Activation_Flag.
  */
-class Activation_Flag implements ServiceInterface, Registerable {
+class Activation_Flag implements Service, Registerable {
 	const OPTION_SHOW_ACTIVATION_NOTICE = 'web_stories_show_activation_notice';
 
 	/**