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
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 69b1685054b6..244e545b9243 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.
@@ -58,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.
 	 *
@@ -410,7 +427,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) $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 ef4089580a1b..db3a40cc2863 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) get_option( Settings::SETTING_NAME_ADSENSE_PUBLISHER_ID );
+		return (string) $this->settings->get_setting( $this->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) get_option( Settings::SETTING_NAME_ADSENSE_SLOT_ID );
+		return (string) $this->settings->get_setting( $this->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) get_option( 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 95ec3e2abdcf..56ae14bfdd91 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) get_option( Settings::SETTING_NAME_AD_MANAGER_SLOT_ID );
+		return (string) $this->settings->get_setting( $this->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) get_option( Settings::SETTING_NAME_AD_NETWORK, 'none' ) );
+		return ( 'admanager' === (string) $this->settings->get_setting( $this->settings::SETTING_NAME_AD_NETWORK, 'none' ) );
 	}
 
 	/**
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';
 
 	/**
diff --git a/includes/Admin/Cross_Origin_Isolation.php b/includes/Admin/Cross_Origin_Isolation.php
index 36d4bf63b781..13cf6b11e4a0 100644
--- a/includes/Admin/Cross_Origin_Isolation.php
+++ b/includes/Admin/Cross_Origin_Isolation.php
@@ -29,7 +29,9 @@
 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;
 use Google\Web_Stories\User\Preferences;
 
@@ -38,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;
 
 	/**
@@ -81,6 +83,44 @@ 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;
+		}
+
+		$user_preferences = Services::get( 'user_preferences' );
+
+		return rest_sanitize_boolean(
+			$user_preferences->get_preference( $user_id, $user_preferences::MEDIA_OPTIMIZATION_META_KEY )
+		);
+	}
+
+	/**
+	 * 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.
+	 */
+	public static function get_requirements(): array {
+		return [ 'user_preferences' ];
+	}
+
 	/**
 	 * Start output buffer and add headers.
 	 *
@@ -293,27 +333,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..c17b4e59a049 100644
--- a/includes/Admin/Customizer.php
+++ b/includes/Admin/Customizer.php
@@ -26,6 +26,8 @@
 
 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;
@@ -71,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.
 	 *
@@ -536,7 +558,7 @@ public function validate_number_of_columns( $validity, $value ) {
 	 * @return string
 	 */
 	public function render_stories(): string {
-		$options = get_option( 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 2a62c22cc1c1..f647d429bbed 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) get_option( Settings::SETTING_NAME_TRACKING_ID );
+		return (string) $this->settings->get_setting( $this->settings::SETTING_NAME_TRACKING_ID );
 	}
 
 	/**
@@ -229,7 +239,7 @@ public function print_analytics_tag() {
 		}
 
 		if (
-			(bool) get_option( 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 692b966e1026..f2d317bde6ef 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
 	 *
@@ -165,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 ); ?>
@@ -453,7 +473,7 @@ public function is_experiment_enabled( string $name ): bool {
 			return (bool) $experiment['default'];
 		}
 
-		$experiments = get_option( Settings::SETTING_NAME_EXPERIMENTS );
+		$experiments = $this->settings->get_setting( $this->settings::SETTING_NAME_EXPERIMENTS, [] );
 		return ! empty( $experiments[ $name ] );
 	}
 
@@ -464,7 +484,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/includes/Infrastructure/HasRequirements.php b/includes/Infrastructure/HasRequirements.php
new file mode 100644
index 000000000000..5e04a8e44e21
--- /dev/null
+++ b/includes/Infrastructure/HasRequirements.php
@@ -0,0 +1,45 @@
+<?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.
+	 *
+	 * @since 1.11.0
+	 *
+	 * @return string[] List of required services.
+	 */
+	public static function get_requirements(): array;
+}
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 acba7f7fd1c0..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.
@@ -128,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;
 		}
 
@@ -147,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;
@@ -169,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;
@@ -184,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;
@@ -200,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;
@@ -247,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;
 		}
 
@@ -268,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(
@@ -279,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 ]
@@ -307,7 +309,7 @@ private function get_dependencies_for(
 		InjectionChain $injection_chain,
 		ReflectionClass $reflection,
 		$arguments = []
-	) {
+	): array {
 		$constructor = $reflection->getConstructor();
 		$class       = $reflection->getName();
 
@@ -315,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,
@@ -383,7 +385,7 @@ private function resolve_argument(
 				);
 			}
 
-			$type = $type instanceof \ReflectionNamedType
+			$type = $type instanceof ReflectionNamedType
 				? $type->getName()
 				: (string) $type;
 		} else {
@@ -392,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(
@@ -426,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.
@@ -444,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 ];
 		}
 
@@ -469,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 ];
 	}
 
@@ -500,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 );
 	}
 
 	/**
@@ -513,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/ServiceBasedPlugin.php b/includes/Infrastructure/ServiceBasedPlugin.php
index 529965df8cd6..4d50ac62c5ef 100644
--- a/includes/Infrastructure/ServiceBasedPlugin.php
+++ b/includes/Infrastructure/ServiceBasedPlugin.php
@@ -22,9 +22,9 @@
 use WP_Site;
 use function add_action;
 use function apply_filters;
+use function did_action;
 use const WPCOM_IS_VIP_ENV;
 
-
 /**
  * This abstract base plugin provides all the boilerplate code for working with
  * the dependency injector and the service container.
@@ -72,7 +72,7 @@ abstract class ServiceBasedPlugin implements Plugin {
 	protected $injector;
 
 	/**
-	 * ServiceC ontainer.
+	 * ServiceContainer.
 	 *
 	 * @var ServiceContainer
 	 */
@@ -273,31 +273,128 @@ public function register_services() {
 
 			$services = $this->validate_services( $filtered_services, $services );
 		}
-		foreach ( $services as $id => $class ) {
-			$id    = $this->maybe_resolve( $id );
-			$class = $this->maybe_resolve( $class );
-			// 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 );
 
+		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( $id, $class, $services )
+			) {
+				next( $services );
+				continue;
+			}
+
+			$this->schedule_potential_service_registration( $id, $class );
+
+			next( $services );
+		}
+	}
+
+	/**
+	 * 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 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( 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(
-					$class::get_registration_action(),
-					function () use ( $id, $class ) {
-						$this->register_service( $id, $class );
+					$action,
+					function () use ( $id, $class, $services ) {
+						if ( ! $this->requirements_are_met( $id, $class, $services ) ) {
+							return;
+						}
+
+						$this->schedule_potential_service_registration( $id, $class );
 					},
-					$class::get_registration_action_priority()
+					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 ( ! array_key_exists( $requirement, $services ) ) {
+				throw InvalidService::from_service_id( $requirement );
+			}
+
+			if ( $this->get_container()->has( $requirement ) ) {
 				continue;
 			}
 
-			$this->register_service( $id, $class );
+			$missing[ $requirement ] = $services[ $requirement ];
 		}
+
+		return $missing;
 	}
 
 	/**
@@ -366,7 +463,37 @@ 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.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 ) ) {
+			$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
 	 *
@@ -375,7 +502,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() ) {
@@ -457,7 +589,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();
diff --git a/includes/Infrastructure/ServiceContainer.php b/includes/Infrastructure/ServiceContainer.php
index c2c9c12724ca..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
diff --git a/includes/Integrations/AMP.php b/includes/Integrations/AMP.php
index 499021ca07ff..6e7195b07221 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;
@@ -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,7 +120,7 @@ public function filter_amp_options( $options ) {
 	 *
 	 * @since 1.2.0
 	 *
-	 * @param string[]|mixed $post_types Post types.
+	 * @param string[]|mixed $post_types Supportable post types.
 	 *
 	 * @return array|mixed Supportable post types.
 	 */
@@ -139,7 +159,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) $this->settings->get_setting( $this->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/KSES.php b/includes/KSES.php
index d8363b5f81bc..4e8e31307f3f 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;
 
 /**
@@ -38,6 +39,24 @@
 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.
 	 *
@@ -46,14 +65,6 @@ class KSES extends Service_Base {
 	 * @return void
 	 */
 	public function register() {
-		if ( ! $this->get_post_type_cap( 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 );
 	}
 
@@ -86,17 +97,25 @@ 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 (
-			( 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'] )
+				get_post_type( $data['post_parent'] ) === $this->story_post_type::POST_TYPE_SLUG
 			)
 		) {
 			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 );
diff --git a/includes/Media/Media_Source_Taxonomy.php b/includes/Media/Media_Source_Taxonomy.php
index ec988f70086e..6865473873c5 100644
--- a/includes/Media/Media_Source_Taxonomy.php
+++ b/includes/Media/Media_Source_Taxonomy.php
@@ -31,7 +31,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/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 b37583dea121..2eeb5856bb44 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;
 
 /**
@@ -35,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.
@@ -45,13 +65,13 @@ 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) $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/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/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,
 		];
 	}
 
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 bc849cf9c877..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;
@@ -44,6 +45,7 @@
  */
 class Embed_Controller extends REST_Controller {
 	use Document_Parser, Post_Type;
+
 	/**
 	 * Constructor.
 	 */
@@ -236,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 . '/';
 				}
 			}
@@ -362,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/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/REST_API/Status_Check_Controller.php b/includes/REST_API/Status_Check_Controller.php
index 1dc9a3a998d5..93ae83c284dd 100644
--- a/includes/REST_API/Status_Check_Controller.php
+++ b/includes/REST_API/Status_Check_Controller.php
@@ -26,8 +26,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;
@@ -43,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/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 7478115366cc..e609688a3697 100644
--- a/includes/Settings.php
+++ b/includes/Settings.php
@@ -130,17 +130,6 @@ class Settings extends Service_Base {
 	 */
 	const SETTING_NAME_ARCHIVE_PAGE_ID = 'web_stories_archive_page_id';
 
-	/**
-	 * 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.
 	 *
@@ -300,4 +289,43 @@ public function register() {
 			]
 		);
 	}
+
+	/**
+	 * 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;
+	}
+
+	/**
+	 * 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 );
+	}
+
+	/**
+	 * 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 ac5073fc62d1..cc12d3a2e10b 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.
 	 *
@@ -90,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' ] );
@@ -215,7 +235,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( $this->settings->get_setting( $this->settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, 0 ) );
 
 		register_post_meta(
 			self::POST_TYPE_SLUG,
@@ -358,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( $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 ) {
@@ -399,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' );
@@ -427,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 f8f7121516a7..6635e0760a03 100644
--- a/includes/Tracking.php
+++ b/includes/Tracking.php
@@ -28,6 +28,7 @@
 
 namespace Google\Web_Stories;
 
+use Google\Web_Stories\Infrastructure\HasRequirements;
 use Google\Web_Stories\Integrations\Site_Kit;
 use Google\Web_Stories\User\Preferences;
 
@@ -77,6 +78,20 @@ class Tracking extends Service_Base {
 	 */
 	private $assets;
 
+	/**
+	 * Settings instance.
+	 *
+	 * @var Settings Settings instance.
+	 */
+	private $settings;
+
+	/**
+	 * Preferences instance.
+	 *
+	 * @var Preferences Preferences instance.
+	 */
+	private $preferences;
+
 	/**
 	 * Tracking constructor.
 	 *
@@ -85,11 +100,21 @@ class Tracking extends Service_Base {
 	 * @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;
 	}
 
 	/**
@@ -161,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( get_option( 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(),
@@ -171,7 +196,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) $this->settings->get_setting( $this->settings::SETTING_NAME_AD_NETWORK, 'none' ),
 			'analytics'          => $analytics,
 			'activePlugins'      => $active_plugins,
 		];
@@ -183,6 +208,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) $this->preferences->get_preference( get_current_user_id(), Preferences::OPTIN_META_KEY );
 	}
 }
diff --git a/includes/Traits/Post_Type.php b/includes/Traits/Post_Type.php
index 9da1704dfb9c..ab2861edd9a4 100644
--- a/includes/Traits/Post_Type.php
+++ b/includes/Traits/Post_Type.php
@@ -66,7 +66,7 @@ protected function get_post_type_rest_base( string $slug ): string {
 	 *
 	 * @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 ) {
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/package.json b/package.json
index efc0b8a54b96..abb1cb736742 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,7 @@
     "test:karma:dashboard": "karma start karma-dashboard.config.cjs --single-run",
     "test:karma:dashboard:retry-failed": "karma start karma-dashboard.config.cjs --single-run --retry-failed",
     "test:karma:dashboard:watch": "karma start karma-dashboard.config.cjs --debug",
-    "test:php": "npm-run-all --parallel test:php:*",
+    "test:php": "npm-run-all test:php:*",
     "test:php:unit": "vendor/bin/phpunit",
     "test:php:integration": "npm-run-all test:php:integration:*",
     "test:php:integration:single": "vendor/bin/phpunit -c phpunit-integration.xml.dist",
diff --git a/tests/phpunit/integration/includes/DependencyInjectedTestCase.php b/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
index 43af0d6b1b2d..c57895f8051c 100644
--- a/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
+++ b/tests/phpunit/integration/includes/DependencyInjectedTestCase.php
@@ -44,6 +44,16 @@ abstract class DependencyInjectedTestCase extends TestCase {
 	public function set_up() {
 		parent::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.
+		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.
 		$this->plugin = new Plugin();
diff --git a/tests/phpunit/integration/includes/Fixture/DummyServiceWithDelay.php b/tests/phpunit/integration/includes/Fixture/DummyServiceWithDelay.php
new file mode 100644
index 000000000000..e75c534ea5cf
--- /dev/null
+++ b/tests/phpunit/integration/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\Integration\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/integration/includes/Fixture/DummyServiceWithRequirements.php b/tests/phpunit/integration/includes/Fixture/DummyServiceWithRequirements.php
new file mode 100644
index 000000000000..bfb25ac54e4f
--- /dev/null
+++ b/tests/phpunit/integration/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\Integration\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/integration/includes/Fixture/DummyTaxonomy.php b/tests/phpunit/integration/includes/Fixture/DummyTaxonomy.php
index eae16d67641b..23f47225bcc9 100644
--- a/tests/phpunit/integration/includes/Fixture/DummyTaxonomy.php
+++ b/tests/phpunit/integration/includes/Fixture/DummyTaxonomy.php
@@ -6,13 +6,14 @@
 use Google\Web_Stories\Taxonomy\Taxonomy_Base;
 
 /**
- *
+ * Dummy taxonomy.
  */
 class DummyTaxonomy extends Taxonomy_Base {
 	/**
 	 * @var string
 	 */
 	protected $taxonomy_slug = 'web-story-test-tax';
+
 	/**
 	 * @var string
 	 */
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/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'] = '';
diff --git a/tests/phpunit/integration/tests/AMP/Canonical_Sanitizer.php b/tests/phpunit/integration/tests/AMP/Canonical_Sanitizer.php
index 8b67cac29f0c..de7175d04c8b 100644
--- a/tests/phpunit/integration/tests/AMP/Canonical_Sanitizer.php
+++ b/tests/phpunit/integration/tests/AMP/Canonical_Sanitizer.php
@@ -34,9 +34,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
-	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$user_id );
-	}
 	/**
 	 * @covers ::sanitize
 	 */
diff --git a/tests/phpunit/integration/tests/AMP/Output_Buffer.php b/tests/phpunit/integration/tests/AMP/Output_Buffer.php
index 0c4ff3df4e11..0b936de89ef4 100644
--- a/tests/phpunit/integration/tests/AMP/Output_Buffer.php
+++ b/tests/phpunit/integration/tests/AMP/Output_Buffer.php
@@ -20,16 +20,16 @@
 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;
+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();
 
@@ -47,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 a4a0400beab6..b3d30321717e 100644
--- a/tests/phpunit/integration/tests/AMP/Sanitization.php
+++ b/tests/phpunit/integration/tests/AMP/Sanitization.php
@@ -18,7 +18,7 @@
 namespace Google\Web_Stories\Tests\Integration\AMP;
 
 use DOMElement;
-use Google\Web_Stories\Experiments;
+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;
@@ -29,7 +29,18 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\AMP\Sanitization
  */
-class Sanitization extends TestCase {
+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 = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 = new \Google\Web_Stories\AMP\Sanitization();
-		$sources      = $this->call_private_method( $sanitization, 'get_extension_sources' );
+		$sources = $this->call_private_method( $this->instance, 'get_extension_sources' );
 
 		$actual = [];
 
@@ -388,13 +390,12 @@ 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();
 
-		$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' ) );
 	}
 
 	/**
@@ -402,13 +403,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 = new \Google\Web_Stories\AMP\Sanitization();
-
 		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' ) );
 	}
 
 	/**
@@ -416,15 +417,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 = new \Google\Web_Stories\AMP\Sanitization();
-
 		// 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' ) );
 	}
 
 	/**
@@ -441,8 +440,7 @@ static function( $sanitizers ) {
 			}
 		);
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
-		$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 ] );
@@ -457,10 +455,8 @@ static function( $sanitizers ) {
 	 * @covers ::get_sanitizers
 	 */
 	public function test_get_sanitizers_with_dev_mode() {
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 ) {
@@ -469,15 +465,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(
@@ -490,10 +486,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(
@@ -532,10 +528,8 @@ public function test_sanitize_amp_video_with_missing_poster() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 );
@@ -565,10 +559,8 @@ public function test_sanitize_amp_video_with_http_source() {
 		<?php
 		$original_html = ob_get_clean();
 
-		$sanitization = new \Google\Web_Stories\AMP\Sanitization();
-
 		$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 6aadf52682ff..274bca444f20 100644
--- a/tests/phpunit/integration/tests/AdSense.php
+++ b/tests/phpunit/integration/tests/AdSense.php
@@ -20,7 +20,11 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\AdSense
  */
-class AdSense extends TestCase {
+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 = new \Google\Web_Stories\AdSense();
-		$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 = new \Google\Web_Stories\AdSense();
-		$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 = new \Google\Web_Stories\AdSense();
-		$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 = new \Google\Web_Stories\AdSense();
-		$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 = new \Google\Web_Stories\AdSense();
-
-		$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 56909fac5d79..b8f0c6d57eb4 100644
--- a/tests/phpunit/integration/tests/Ad_Manager.php
+++ b/tests/phpunit/integration/tests/Ad_Manager.php
@@ -20,13 +20,19 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Ad_Manager
  */
-class Ad_Manager extends TestCase {
+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 = new \Google\Web_Stories\Ad_Manager();
-		$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 = new \Google\Web_Stories\Ad_Manager();
-		$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 = new \Google\Web_Stories\Ad_Manager();
-		$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 = new \Google\Web_Stories\Ad_Manager();
-
-		$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/Cross_Origin_Isolation.php b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
index 3f98fbecae8d..ce54d4a552f0 100644
--- a/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
+++ b/tests/phpunit/integration/tests/Admin/Cross_Origin_Isolation.php
@@ -17,116 +17,120 @@
 
 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.
 	 *
 	 * @var int
 	 */
-	protected static $admin_id;
+	private $admin_id;
 
 	/**
 	 * Contributor user for test.
 	 *
 	 * @var int
 	 */
-	protected static $contributor_id;
+	private $contributor_id;
 
-	public static function wpSetUpBeforeClass( $factory ) {
-		self::$admin_id = $factory->user->create(
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\Admin\Cross_Origin_Isolation
+	 */
+	private $instance;
+
+	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' ]
 		);
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\Admin\Cross_Origin_Isolation::class );
 	}
 
-	public function set_up() {
-		parent::set_up();
+	public function tear_down() {
+		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 );
 
-		$user_preferences = new \Google\Web_Stories\User\Preferences();
-		$user_preferences->register();
+		parent::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 );
 
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$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->instance->register();
 
-		$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_action( 'load-post.php', [ $this->instance, 'admin_header' ] ) );
+		$this->assertSame( 10, has_action( 'load-post-new.php', [ $this->instance, 'admin_header' ] ) );
 
-		delete_user_meta( self::$admin_id, \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+		$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' ] ) );
 	}
 
 	/**
 	 * @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 );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertTrue( $result );
+		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() );
 	}
 
 	/**
 	 * @covers ::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 );
+		wp_set_current_user( $this->admin_id );
+
+		$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() );
 	}
 
 	/**
 	 * @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 );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertFalse( $result );
+		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() );
 	}
 
 	/**
 	 * @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 );
-		$instance = new \Google\Web_Stories\Admin\Cross_Origin_Isolation();
-		$result   = $this->call_private_method( $instance, 'is_needed' );
-		$this->assertFalse( $result );
+		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() );
 	}
 
 	/**
@@ -134,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->assertStringContainsString( 'crossorigin', $result );
 	}
 	/**
@@ -146,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->assertStringNotContainsString( 'crossorigin', $result );
 	}
 
@@ -160,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->assertStringNotContainsString( 'crossorigin', $result );
 	}
 
@@ -173,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 );
 	}
 
@@ -185,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 );
 	}
 
@@ -202,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 );
 	}
 
@@ -212,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 );
 	}
 
@@ -223,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->assertStringContainsString( '<script async="" crossorigin="anonymous" src="https://cdn.ampproject.org/v0.js"></script>', $result );
 		$this->assertStringContainsString( '<script async="" crossorigin="anonymous" src="https://cdn.ampproject.org/v0/amp-story-1.0.js" custom-element="amp-story"></script>', $result );
@@ -254,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->assertStringContainsString( '<img crossorigin="anonymous" src="http://www.example.com/test1.jpg" />', $result );
 	}
 
@@ -267,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->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/Customizer.php b/tests/phpunit/integration/tests/Admin/Customizer.php
index 37ea55768b28..3d7cea8b58ea 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,29 +30,22 @@
  * @runInSeparateProcess
  * @preserveGlobalState disabled
  */
-class Customizer extends TestCase {
+class Customizer extends DependencyInjectedTestCase {
 	use Theme_Support;
 
 	/**
-	 * Instance of WP_Customize_Manager which is reset for each test.
+	 * Test instance.
 	 *
-	 * @var WP_Customize_Manager
+	 * @var \Google\Web_Stories\Admin\Customizer
 	 */
-	public $wp_customize;
+	private $instance;
 
 	/**
-	 * Customizer mock object.
+	 * Test instance.
 	 *
-	 * @var \PHPUnit\Framework\MockObject\MockObject|\WP_Customize_Manager
+	 * @var \WP_Customize_Manager
 	 */
-	private $customizer_mock;
-
-	/**
-	 * Testee instance.
-	 *
-	 * @var \Google\Web_Stories\Admin\Customizer
-	 */
-	private $customizer;
+	private $wp_customize_mock;
 
 	public static function wpSetUpBeforeClass() {
 		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
@@ -66,10 +60,9 @@ 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 );
+		$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 );
 	}
 
 	/**
@@ -133,13 +126,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 +145,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->wp_customize_mock->expects( $this->once() )->method( 'add_section' )->with(
 			TheCustomizer::SECTION_SLUG,
 			[
 				'title'          => 'Web Stories',
@@ -160,7 +153,7 @@ public function test_customizer_web_stories_section_added() {
 			]
 		);
 
-		$this->customizer->register_customizer_settings( $this->customizer_mock );
+		$this->instance->register_customizer_settings( $this->wp_customize_mock );
 	}
 
 	/**
@@ -168,8 +161,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->wp_customize_mock->expects( $this->exactly( 14 ) )->method( 'add_setting' );
+		$this->instance->register_customizer_settings( $this->wp_customize_mock );
 	}
 
 	/**
@@ -177,7 +170,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->wp_customize_mock->expects( $this->exactly( 14 ) )->
 		method( 'add_setting' )->
 		withConsecutive(
 			[
@@ -199,7 +192,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 +200,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 +275,23 @@ public function test_customizer_show_stories_settings_added() {
 			]
 		);
 
-		$this->customizer->register_customizer_settings( $this->customizer_mock );
+		$this->instance->register_customizer_settings( $this->wp_customize_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 +302,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 +440,7 @@ public function test_render_stories() {
 			'show_stories' => true,
 		];
 
-		$output = $this->customizer->render_stories();
+		$output = $this->instance->render_stories();
 
 		$this->assertEmpty( $output );
 
@@ -459,12 +452,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/Admin/Dashboard.php b/tests/phpunit/integration/tests/Admin/Dashboard.php
index 95d4ea254804..e31f7510ae45 100644
--- a/tests/phpunit/integration/tests/Admin/Dashboard.php
+++ b/tests/phpunit/integration/tests/Admin/Dashboard.php
@@ -55,7 +55,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 	}
 
 	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$user_id );
 		unregister_post_type( self::$cpt_no_archive );
 		unregister_post_type( self::$cpt_has_archive );
 	}
diff --git a/tests/phpunit/integration/tests/Admin/Editor.php b/tests/phpunit/integration/tests/Admin/Editor.php
index 5836a26b9299..13e85786b49a 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,12 +116,27 @@ 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() {
-		$this->set_permalink_structure( '' );
-
 		delete_post_meta( self::$story_id, '_edit_lock' );
 
 		$this->remove_caps_from_roles();
@@ -98,35 +148,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 +164,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 +176,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 +187,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 +203,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 +220,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 +234,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/Meta_Boxes.php b/tests/phpunit/integration/tests/Admin/Meta_Boxes.php
index 98b114df3ace..9628d32765ae 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',
@@ -66,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 );
@@ -88,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 = [];
 
@@ -129,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();
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..565aa87993bd 100644
--- a/tests/phpunit/integration/tests/Admin/TinyMCE.php
+++ b/tests/phpunit/integration/tests/Admin/TinyMCE.php
@@ -17,36 +17,42 @@
 
 namespace Google\Web_Stories\Tests\Integration\Admin;
 
-use Google\Web_Stories\Assets;
-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' ) );
 	}
@@ -55,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 );
 	}
@@ -66,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 );
 	}
@@ -77,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 );
 	}
@@ -89,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 );
 	}
@@ -101,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/Analytics.php b/tests/phpunit/integration/tests/Analytics.php
index 57cb821512fd..3e6b0d39ed67 100644
--- a/tests/phpunit/integration/tests/Analytics.php
+++ b/tests/phpunit/integration/tests/Analytics.php
@@ -22,16 +22,25 @@
 /**
  * @coversDefaultClass \Google\Web_Stories\Analytics
  */
-class Analytics extends TestCase {
+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 = new \Google\Web_Stories\Analytics( new \Google\Web_Stories\Experiments() );
-		$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' ] ) );
 	}
 
 	/**
@@ -39,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 = new \Google\Web_Stories\Analytics( new \Google\Web_Stories\Experiments() );
-		$this->assertSame( '123456789', $analytics->get_tracking_id() );
+
+		$this->assertSame( '123456789', $this->instance->get_tracking_id() );
 	}
 
 	/**
@@ -48,8 +57,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() );
-		$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'] );
@@ -78,13 +86,13 @@ public function test_print_analytics_tag() {
 		$experiments->method( 'is_experiment_enabled' )
 					->willReturn( true );
 
-		$analytics     = new \Google\Web_Stories\Analytics( $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 );
@@ -94,13 +102,12 @@ 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() );
-		$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/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/Demo_Content.php b/tests/phpunit/integration/tests/Demo_Content.php
index 519cff809042..1d73dbbd3485 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/Experiments.php b/tests/phpunit/integration/tests/Experiments.php
index 67f97f2bd4a4..e17cd64f20b7 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 );
 	}
@@ -80,22 +101,24 @@ public function test_add_menu_page() {
 	 * @covers ::initialize_settings
 	 */
 	public function test_initialize_settings() {
-		$experiments = new \Google\Web_Stories\Experiments();
-		$experiments->initialize_settings();
+		global $wp_settings_fields, $wp_settings_sections;
+
+		$this->instance->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 ] );
 	}
 
 	/**
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field() {
-		$experiments = $this->createPartialMock(
+		$this->instance = $this->createTestProxy(
 			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
+			[ $this->injector->make( \Google\Web_Stories\Settings::class ) ]
 		);
-		$experiments->method( 'get_experiments' )
+		$this->instance->method( 'get_experiments' )
 					->willReturn(
 						[
 							[
@@ -105,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',
@@ -123,11 +148,12 @@ public function test_display_experiment_field() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field_enabled() {
-		$experiments = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
-		);
-		$experiments->method( 'get_experiments' )
+		$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(
 						[
 							[
@@ -137,11 +163,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',
@@ -156,11 +182,12 @@ public function test_display_experiment_field_enabled() {
 	 * @covers ::display_experiment_field
 	 */
 	public function test_display_experiment_field_enabled_by_default() {
-		$experiments = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
-		);
-		$experiments->method( '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(
 						[
 							[
@@ -172,7 +199,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',
@@ -190,8 +217,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 );
 	}
 
@@ -199,9 +225,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' );
@@ -219,12 +244,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 );
 		}
@@ -235,8 +259,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' ) );
 	}
 
 	/**
@@ -244,17 +268,19 @@ public function test_is_experiment_enabled() {
 	 * @covers ::get_experiment
 	 */
 	public function test_is_experiment_enabled_default_experiment() {
-		$experiments = $this->createPartialMock(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
-		);
-		$experiments->method( '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(
 						[
 							[
 								'name'        => 'foo',
 								'label'       => 'Foo Label',
 								'description' => 'Foo Desc',
+								'default'     => false,
 							],
 							[
 								'name'        => 'bar',
@@ -265,9 +291,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' ) );
 	}
 
 	/**
@@ -276,11 +309,12 @@ 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(
-			\Google\Web_Stories\Experiments::class,
-			[ 'get_experiments' ]
-		);
-		$experiments->method( 'get_experiments' )
+		$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(
 						[
 							[
@@ -302,12 +336,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/Infrastructure/ServiceBasedPluginTest.php b/tests/phpunit/integration/tests/Infrastructure/ServiceBasedPluginTest.php
index bed2cccd02f6..5a0fd20162d7 100644
--- a/tests/phpunit/integration/tests/Infrastructure/ServiceBasedPluginTest.php
+++ b/tests/phpunit/integration/tests/Infrastructure/ServiceBasedPluginTest.php
@@ -6,6 +6,8 @@
 use Google\Web_Stories\Infrastructure\ServiceBasedPlugin;
 use Google\Web_Stories\Infrastructure\ServiceContainer;
 use Google\Web_Stories\Infrastructure\ServiceContainer\SimpleServiceContainer;
+use Google\Web_Stories\Tests\Integration\Fixture\DummyServiceWithDelay;
+use Google\Web_Stories\Tests\Integration\Fixture\DummyServiceWithRequirements;
 use Google\Web_Stories\Tests\Integration\Fixture\DummyService;
 use Google\Web_Stories\Tests\Integration\Fixture\DummyServiceBasedPlugin;
 use Google\Web_Stories\Tests\Integration\TestCase;
@@ -154,6 +156,115 @@ 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(
+							[
+								'collect_missing_requirements',
+								'register',
+								'register_services',
+								'requirements_are_met',
+								'get_container',
+								'get_service_classes',
+							]
+						)
+						->getMock();
+
+		$service_callback = static function ( $services ) {
+			return array_merge(
+				$services,
+				[ 'service_with_requirements' => DummyServiceWithRequirements::class ]
+			);
+		};
+
+		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( '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();
+
+		$service_callback = static function ( $services ) {
+			return array_merge(
+				$services,
+				[
+					'service_a'                 => DummyServiceWithDelay::class,
+					'service_with_requirements' => DummyServiceWithRequirements::class,
+				]
+			);
+		};
+
+		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( DummyServiceWithDelay::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_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() {
 		$container = new SimpleServiceContainer();
 		$plugin    = $this->getMockBuilder( ServiceBasedPlugin::class )
diff --git a/tests/phpunit/integration/tests/Integrations/AMP.php b/tests/phpunit/integration/tests/Integrations/AMP.php
index 68801dacecf5..1c6132ad05d3 100644
--- a/tests/phpunit/integration/tests/Integrations/AMP.php
+++ b/tests/phpunit/integration/tests/Integrations/AMP.php
@@ -18,26 +18,35 @@
 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;
+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' );
@@ -50,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( [] ) );
 	}
 
 	/**
@@ -72,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 );
 	}
@@ -82,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 ] ) );
 	}
 
 	/**
@@ -92,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 );
 	}
@@ -137,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/Core_Themes_Support.php b/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
index e29730ed9514..8ede9dedd4be 100644
--- a/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
+++ b/tests/phpunit/integration/tests/Integrations/Core_Themes_Support.php
@@ -18,44 +18,46 @@
 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.
 	 */
 	public function set_up() {
+		parent::set_up();
+
 		$this->stylesheet = get_stylesheet();
 
 		// 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' );
@@ -63,9 +65,6 @@ public function tear_down() {
 
 		update_option( 'stylesheet', $this->stylesheet );
 
-		unset( $this->stub );
-		unset( $this->stylesheet );
-
 		parent::tear_down();
 	}
 
@@ -75,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' ] ) );
 	}
 
 	/**
@@ -89,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' ] ) );
 	}
 
 
@@ -111,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 );
 	}
@@ -122,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' ) );
 	}
@@ -134,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' ) );
 	}
@@ -145,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();
 
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/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' )
diff --git a/tests/phpunit/integration/tests/KSES.php b/tests/phpunit/integration/tests/KSES.php
index de9dc2c1a486..b981ff1ea921 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.
 	 *
@@ -31,8 +41,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 ) );
 	}
 
 	/**
@@ -46,10 +55,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 );
 	}
 
 	/**
@@ -58,7 +68,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' => [],
@@ -72,7 +81,7 @@ public function test_array_merge_recursive_distinct() {
 		];
 
 		$output = $this->call_private_method(
-			$kses,
+			$this->instance,
 			'array_merge_recursive_distinct',
 			[
 				$input_array1,
@@ -370,11 +379,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' ] );
 	}
 
 	/**
@@ -384,7 +392,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,
@@ -394,7 +401,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/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/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..7c29ad78c6a0 100644
--- a/tests/phpunit/integration/tests/Media/Video/Poster.php
+++ b/tests/phpunit/integration/tests/Media/Video/Poster.php
@@ -18,33 +18,48 @@
 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;
+
+	/**
+	 * @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->media_source = $this->injector->make( \Google\Web_Stories\Media\Media_Source_Taxonomy::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 +122,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 +130,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 +157,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 +181,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', $this->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 +209,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', $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 );
 
-		$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 +238,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 +287,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', $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', $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', $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/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/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..db91e6e143cd 100644
--- a/tests/phpunit/integration/tests/Page_Template_Post_Type.php
+++ b/tests/phpunit/integration/tests/Page_Template_Post_Type.php
@@ -20,17 +20,25 @@
 /**
  * @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;
+
+	/**
+	 * @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() {
-		$story = new \Google\Web_Stories\Story_Post_Type();
-		$story->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 e66be1268b81..45510ae96b9f 100644
--- a/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Embed_Controller.php
@@ -17,8 +17,12 @@
 
 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;
+use WP_REST_Response;
+use WP_REST_Server;
 
 /**
  * Class Embed_Controller
@@ -29,7 +33,7 @@
  */
 class Embed_Controller extends Test_REST_TestCase {
 	/**
-	 * @var \WP_REST_Server
+	 * @var WP_REST_Server
 	 */
 	protected $server;
 
@@ -49,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(
 			[
@@ -73,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,
@@ -89,6 +100,8 @@ public function set_up() {
 
 		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();
 	}
 
 	public function tear_down() {
@@ -105,7 +118,7 @@ public function tear_down() {
 	 * @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 ) ) {
@@ -133,7 +146,12 @@ public function mock_http_request( $preempt, $r, $url ) {
 		];
 	}
 
+	/**
+	 * @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 );
@@ -146,8 +164,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 );
 		}
@@ -155,18 +173,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 );
@@ -176,6 +201,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( '' );
@@ -185,6 +212,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 );
@@ -193,6 +222,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 );
@@ -201,6 +232,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();
@@ -219,6 +252,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();
@@ -228,7 +263,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 );
@@ -238,8 +273,12 @@ public function test_removes_trailing_slashes() {
 	}
 
 	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();
 
@@ -254,13 +293,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( new Settings() );
 		$story_post_type->register();
 
 		flush_rewrite_rules( false );
@@ -284,13 +325,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( new Settings() );
 		$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 360104b8907f..872023b40b4f 100644
--- a/tests/phpunit/integration/tests/REST_API/Hotlinking_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Hotlinking_Controller.php
@@ -50,6 +50,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(
 			[
@@ -69,6 +76,8 @@ public function set_up() {
 
 		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
 		$this->request_count = 0;
+
+		$this->controller = new \Google\Web_Stories\REST_API\Hotlinking_Controller();
 	}
 
 	public function tear_down() {
@@ -136,9 +145,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 );
@@ -149,8 +160,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 );
 	}
 
@@ -158,8 +168,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 );
 	}
 
@@ -167,8 +176,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 );
 	}
 
@@ -176,8 +184,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 );
 	}
 
@@ -185,8 +192,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 );
 	}
 
@@ -194,8 +200,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 );
 	}
 
@@ -203,8 +208,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 );
@@ -221,6 +225,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 );
@@ -240,6 +246,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 );
@@ -256,6 +264,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', '' );
@@ -272,6 +282,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 );
@@ -294,6 +306,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 );
@@ -330,6 +344,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 );
@@ -342,6 +358,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 );
@@ -356,6 +374,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 ea0420b3dfdf..3702c31a95fd 100644
--- a/tests/phpunit/integration/tests/REST_API/Link_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Link_Controller.php
@@ -38,6 +38,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(
 			[
@@ -55,9 +62,11 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
-
+		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();
+
 	}
 
 	public function tear_down() {
@@ -132,7 +141,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 );
@@ -145,14 +159,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 );
@@ -163,7 +187,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 );
@@ -174,6 +203,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 );
@@ -183,6 +214,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 );
@@ -201,6 +234,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', '' );
@@ -211,6 +246,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 );
@@ -232,6 +269,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 );
@@ -253,6 +292,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 );
@@ -274,6 +315,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 );
@@ -295,6 +338,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 0d79e0bd236f..6f7c4d2b8b64 100644
--- a/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Page_Template_Controller.php
@@ -38,6 +38,13 @@ class Page_Template_Controller extends Test_REST_TestCase {
 
 	protected static $author_id;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Page_Template_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$user_id = $factory->user->create(
 			[
@@ -66,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,
 			]
 		);
 
@@ -83,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,
 			]
 		);
 
@@ -92,7 +95,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 			[
 				'post_status' => 'publish',
 				'post_author' => self::$user2_id,
-				'post_type'   => $post_type,
 			]
 		);
 
@@ -101,7 +103,6 @@ public static function wpSetUpBeforeClass( $factory ) {
 			[
 				'post_status' => 'publish',
 				'post_author' => self::$user3_id,
-				'post_type'   => $post_type,
 			]
 		);
 
@@ -110,32 +111,52 @@ public static function wpSetUpBeforeClass( $factory ) {
 			[
 				'post_status' => 'draft',
 				'post_author' => self::$user_id,
-				'post_type'   => $post_type,
 			]
 		);
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Page_Template_Controller( 'post' );
+	}
+
+	/**
+	 * @covers ::get_collection_params
+	 */
+	public function test_get_collection_params() {
+		$actual = $this->controller->get_collection_params();
+
+		$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'] );
 	}
 
 	/**
 	 * @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 = 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/Publisher_Logos_Controller.php b/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php
index 1afc6bfc4a89..a2afc31e7ab2 100644
--- a/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Publisher_Logos_Controller.php
@@ -40,6 +40,13 @@ class Publisher_Logos_Controller extends Test_REST_TestCase {
 	 */
 	protected static $attachment_id_2;
 
+	/**
+	 * Test instance.
+	 *
+	 * @var \Google\Web_Stories\REST_API\Publisher_Logos_Controller
+	 */
+	private $controller;
+
 	/**
 	 * Count of the number of requests attempted.
 	 *
@@ -80,9 +87,10 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
-	public static function wpTearDownAfterClass() {
-		self::delete_user( self::$admin );
-		self::delete_user( self::$editor );
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Publisher_Logos_Controller( new Settings() );
 	}
 
 	public function tear_down() {
@@ -96,12 +104,13 @@ public function tear_down() {
 	 * @covers ::register_routes
 	 */
 	public function test_register_routes() {
+		$this->controller->register_routes();
+
 		$routes = rest_get_server()->get_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] );
@@ -116,8 +125,7 @@ public function test_register_routes() {
 	 * @covers ::get_item_schema
 	 */
 	public function test_get_item_schema() {
-		$controller = new \Google\Web_Stories\REST_API\Publisher_Logos_Controller();
-		$data       = $controller->get_item_schema();
+		$data = $this->controller->get_item_schema();
 
 		$properties = $data['properties'];
 		$this->assertArrayHasKey( 'id', $properties );
@@ -130,6 +138,8 @@ public function test_get_item_schema() {
 	 * @covers ::permissions_check
 	 */
 	public function test_get_items_no_permission() {
+		$this->controller->register();
+
 		$request  = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/publisher-logos' );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_forbidden', $response, 401 );
@@ -139,6 +149,8 @@ public function test_get_items_no_permission() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items_no_items() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		$request  = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/publisher-logos' );
@@ -152,6 +164,8 @@ public function test_get_items_no_items() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items_editor() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		$request  = new WP_REST_Request( WP_REST_Server::READABLE, '/web-stories/v1/publisher-logos' );
@@ -165,6 +179,8 @@ public function test_get_items_editor() {
 	 * @covers ::get_items
 	 */
 	public function test_get_items() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_2, 0, -1, PHP_INT_MAX, self::$attachment_id_1 ] );
@@ -188,6 +204,8 @@ public function test_get_items() {
 	 * @covers ::permissions_check
 	 */
 	public function test_create_item_no_permission() {
+		$this->controller->register();
+
 		$request = new WP_REST_Request( WP_REST_Server::CREATABLE, '/web-stories/v1/publisher-logos' );
 		$request->set_body_params(
 			[
@@ -203,6 +221,8 @@ public function test_create_item_no_permission() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_editor() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		$request = new WP_REST_Request( WP_REST_Server::CREATABLE, '/web-stories/v1/publisher-logos' );
@@ -229,6 +249,8 @@ public function test_create_item_editor() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		$request = new WP_REST_Request( WP_REST_Server::CREATABLE, '/web-stories/v1/publisher-logos' );
@@ -261,6 +283,8 @@ public function test_create_item() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_existing_ones() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1 ] );
@@ -296,6 +320,8 @@ public function test_create_item_existing_ones() {
 	 * @covers ::create_item
 	 */
 	public function test_create_item_updates_incorrect_active_publisher_logo() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1 ] );
@@ -330,6 +356,8 @@ public function test_create_item_updates_incorrect_active_publisher_logo() {
 	 * @covers ::permissions_check
 	 */
 	public function test_delete_item_no_permission() {
+		$this->controller->register();
+
 		$request  = new WP_REST_Request( WP_REST_Server::DELETABLE, '/web-stories/v1/publisher-logos/' . self::$attachment_id_1 );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_forbidden', $response, 401 );
@@ -340,6 +368,8 @@ public function test_delete_item_no_permission() {
 	 * @covers ::delete_item
 	 */
 	public function test_delete_item_editor() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1, self::$attachment_id_2 ] );
@@ -367,6 +397,8 @@ public function test_delete_item_editor() {
 	 * @covers ::delete_item
 	 */
 	public function test_delete_item() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1, self::$attachment_id_2 ] );
@@ -400,6 +432,8 @@ public function test_delete_item() {
 	 * @covers ::delete_item
 	 */
 	public function test_delete_item_incorrect_active_publisher_logo() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1, self::$attachment_id_2 ] );
@@ -433,6 +467,8 @@ public function test_delete_item_incorrect_active_publisher_logo() {
 	 * @covers ::delete_item
 	 */
 	public function test_delete_item_non_existent_logo() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1 ] );
@@ -448,6 +484,8 @@ public function test_delete_item_non_existent_logo() {
 	 * @covers ::permissions_check
 	 */
 	public function test_update_item_no_permission() {
+		$this->controller->register();
+
 		$request  = new WP_REST_Request( WP_REST_Server::CREATABLE, '/web-stories/v1/publisher-logos/' . self::$attachment_id_1 );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_forbidden', $response, 401 );
@@ -458,6 +496,8 @@ public function test_update_item_no_permission() {
 	 * @covers ::update_item
 	 */
 	public function test_update_item_editor() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$editor );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1, self::$attachment_id_2 ] );
@@ -482,6 +522,8 @@ public function test_update_item_editor() {
 	 * @covers ::update_item
 	 */
 	public function test_update_item() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1, self::$attachment_id_2 ] );
@@ -515,6 +557,8 @@ public function test_update_item() {
 	 * @covers ::update_item
 	 */
 	public function test_update_item_non_existent_logo() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$admin );
 
 		update_option( Settings::SETTING_NAME_PUBLISHER_LOGOS, [ self::$attachment_id_1 ] );
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 738ec0aba21c..a785f5c2cb3f 100644
--- a/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Status_Check_Controller.php
@@ -37,11 +37,11 @@ class Status_Check_Controller extends Test_REST_TestCase {
 	protected static $subscriber;
 
 	/**
-	 * Count of the number of requests attempted.
+	 * Test instance.
 	 *
-	 * @var int
+	 * @var \Google\Web_Stories\REST_API\Status_Check_Controller
 	 */
-	protected $request_count = 0;
+	private $controller;
 
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$subscriber = $factory->user->create(
@@ -60,34 +60,41 @@ public static function wpSetUpBeforeClass( $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$this->request_count = 0;
+		$this->controller = new \Google\Web_Stories\REST_API\Status_Check_Controller();
 	}
 
 	/**
-	 * @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 );
-
-		$route = $routes['/web-stories/v1/status-check'];
-		$this->assertCount( 1, $route );
 	}
 
 	/**
 	 * @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>' );
@@ -101,6 +108,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 77%
rename from tests/phpunit/integration/tests/REST_API/Autosaves_Controller.php
rename to tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
index d977b1701151..280bd8094473 100644
--- a/tests/phpunit/integration/tests/REST_API/Autosaves_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Autosaves_Controller.php
@@ -26,13 +26,24 @@
  *
  * @package Google\Web_Stories\Tests\REST_API
  *
- * @coversDefaultClass \Google\Web_Stories\REST_API\Autosaves_Controller
+ * @coversDefaultClass \Google\Web_Stories\REST_API\Stories_Autosaves_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 \Google\Web_Stories\REST_API\Stories_Autosaves_Controller
+	 */
+	private $controller;
+
 	public static function wpSetUpBeforeClass( $factory ) {
 		self::$author_id = $factory->user->create(
 			[
@@ -41,7 +52,15 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Autosaves_Controller();
+	}
+
 	public function test_create_item_as_author_should_not_strip_markup() {
+		$this->controller->register();
+
 		wp_set_current_user( self::$author_id );
 
 		$this->kses_int();
@@ -66,6 +85,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/integration/tests/REST_API/Stories_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
index 660df636e980..11ef46cf526d 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Controller.php
@@ -18,6 +18,7 @@
 namespace Google\Web_Stories\Tests\Integration\REST_API;
 
 use DateTime;
+use Google\Web_Stories\Story_Post_Type;
 use Google\Web_Stories\Tests\Integration\Test_REST_TestCase;
 use Google\Web_Stories\Tests\Integration\Fixture\DummyTaxonomy;
 use WP_REST_Request;
@@ -40,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(
 			[
@@ -132,8 +140,13 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
-	public function tear_down() {
+	public function set_up() {
+		parent::set_up();
 
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Controller( Story_Post_Type::POST_TYPE_SLUG );
+	}
+
+	public function tear_down() {
 		$this->kses_remove_filters();
 
 		parent::tear_down();
@@ -154,6 +167,8 @@ public function test_register_routes() {
 	 * @covers ::add_response_headers
 	 */
 	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' ] );
@@ -189,7 +204,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();
@@ -203,6 +220,8 @@ public function test_get_items_no_perm() {
 	 * @covers ::add_response_headers
 	 */
 	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' );
@@ -271,6 +290,8 @@ public function test_get_items_author() {
 	 * @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(
 			[
@@ -298,6 +319,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,
@@ -320,6 +343,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 );
 		$story   = self::factory()->post->create(
 			[
@@ -349,6 +374,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 );
 
 		$story    = self::factory()->post->create(
@@ -374,6 +401,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 );
 
 		$story    = self::factory()->post->create(
@@ -399,6 +428,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();
@@ -428,6 +459,8 @@ public function test_get_add_taxonomy_links() {
 	 * @covers ::add_response_headers
 	 */
 	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' ] );
@@ -458,20 +491,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();
 
-		$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' );
@@ -519,6 +552,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 = [
@@ -545,6 +580,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();
@@ -559,6 +596,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();
@@ -584,6 +623,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' => [] ] );
@@ -632,6 +672,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();
 
@@ -650,6 +692,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' => [] ] );
@@ -687,6 +730,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 91%
rename from tests/phpunit/integration/tests/REST_API/Lock_Controller.php
rename to tests/phpunit/integration/tests/REST_API/Stories_Lock_Controller.php
index 1b7709651270..0a6509dfd2b5 100644
--- a/tests/phpunit/integration/tests/REST_API/Lock_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Lock_Controller.php
@@ -25,15 +25,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(
 			[
@@ -53,10 +60,18 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Lock_Controller();
+	}
+
 	/**
-	 * @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 );
@@ -69,6 +84,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(
 			[
@@ -90,6 +107,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' );
@@ -103,6 +122,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(
@@ -122,6 +143,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,
@@ -139,6 +162,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(
 			[
@@ -159,6 +184,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(
 			[
@@ -186,6 +213,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(
 			[
@@ -208,6 +237,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(
 			[
@@ -234,6 +265,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(
 			[
@@ -262,6 +295,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(
 			[
@@ -283,6 +318,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 7cd1b65dc2fc..c4c26abad116 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
 	 */
@@ -73,10 +80,18 @@ public static function wpSetUpBeforeClass( $factory ) {
 		);
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Media_Controller();
+	}
+
 	/**
 	 * @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' );
@@ -95,6 +110,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 );
@@ -112,6 +129,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' );
@@ -129,6 +148,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',
@@ -165,6 +186,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',
@@ -192,6 +215,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',
@@ -235,6 +260,8 @@ public function test_create_item_migrate_data() {
 	 * @covers ::add_taxonomy_links
 	 */
 	public function test_get_add_taxonomy_links() {
+		$this->controller->register();
+
 		$object = new DummyTaxonomy();
 		$this->set_private_property( $object, 'taxonomy_post_type', 'attachment' );
 		$object->register_taxonomy();
@@ -269,6 +296,8 @@ public function test_get_add_taxonomy_links() {
 	 * @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' );
@@ -290,12 +319,16 @@ 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();
 
 		$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/integration/tests/REST_API/Stories_Taxonomies_Controller.php b/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
index 61e4f26bad69..7198cde0a60b 100644
--- a/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
+++ b/tests/phpunit/integration/tests/REST_API/Stories_Taxonomies_Controller.php
@@ -6,6 +6,7 @@
 use Google\Web_Stories\Tests\Integration\Fixture\DummyTaxonomy;
 use WP_REST_Request;
 use WP_REST_Server;
+
 /**
  * Class Stories_Taxonomies_Controller
  *
@@ -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,18 @@ public static function wpTearDownAfterClass() {
 		self::$taxonomy_object->unregister_taxonomy();
 	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Taxonomies_Controller();
+	}
+
 	/**
 	 * @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 6a2932978de9..f96ccefe27d8 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;
 
 /**
@@ -32,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(
 			[
@@ -50,13 +58,20 @@ public static function wpSetUpBeforeClass( $factory ) {
 				'post_type'   => $post_type,
 			]
 		);
+	}
 
+	public function set_up() {
+		parent::set_up();
+
+		$this->controller = new \Google\Web_Stories\REST_API\Stories_Users_Controller();
 	}
 
 	/**
-	 * @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 );
@@ -68,11 +83,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( new Settings() );
 		$post_type->register();
+
 		$result1 = $this->call_private_method(
-			$controller,
+			$this->controller,
 			'user_posts_count_public',
 			[
 				self::$user_id,
@@ -89,7 +106,7 @@ public function test_count_user_posts() {
 			]
 		);
 		$result2 = $this->call_private_method(
-			$controller,
+			$this->controller,
 			'user_posts_count_public',
 			[
 				self::$user_id,
@@ -102,7 +119,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,
@@ -118,8 +135,10 @@ 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  = 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/Renderer/Archives.php b/tests/phpunit/integration/tests/Renderer/Archives.php
index c70dd97762ca..54b54596bb84 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 d09643cdc284..ca0d5531eaf8 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 ff1a03bd21d1..132e375c1954 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 cb22c816bf1d..962d48451663 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 b575f2f91247..5662b6ff9e29 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 5d51422b8ca4..85f6c5147dcf 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/Settings.php b/tests/phpunit/integration/tests/Settings.php
index 527501faabc8..d1c673c204b8 100644
--- a/tests/phpunit/integration/tests/Settings.php
+++ b/tests/phpunit/integration/tests/Settings.php
@@ -36,6 +36,7 @@ public function test_register() {
 		$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 );
 		$this->assertArrayHasKey( $settings::SETTING_NAME_ACTIVE_PUBLISHER_LOGO, $options );
 		$this->assertArrayHasKey( $settings::SETTING_NAME_PUBLISHER_LOGOS, $options );
 		$this->assertArrayHasKey( $settings::SETTING_NAME_VIDEO_CACHE, $options );
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/Story_Post_Type.php b/tests/phpunit/integration/tests/Story_Post_Type.php
index 67fe4011ac0e..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,13 +88,12 @@ 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();
 	}
 
 	public function tear_down() {
-
 		$this->remove_caps_from_roles();
 		delete_option( \Google\Web_Stories\Settings::SETTING_NAME_ARCHIVE );
 
@@ -178,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 );
 	}
 
@@ -189,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 );
 
@@ -203,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 );
 
@@ -218,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 );
@@ -234,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 );
@@ -258,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 );
@@ -341,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 );
 	}
@@ -354,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 );
@@ -381,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 26bf5f945bfa..0029433ad61a 100644
--- a/tests/phpunit/integration/tests/Tracking.php
+++ b/tests/phpunit/integration/tests/Tracking.php
@@ -17,8 +17,7 @@
 
 namespace Google\Web_Stories\Tests\Integration;
 
-use Spy_REST_Server;
-use WP_REST_Request;
+use Google\Web_Stories\Integrations\Site_Kit;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\Tracking
@@ -26,6 +25,36 @@
 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(
 			[
@@ -34,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,
@@ -47,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' );
@@ -66,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,
@@ -75,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 );
@@ -123,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,
@@ -132,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 );
diff --git a/tests/phpunit/integration/tests/User/Preferences.php b/tests/phpunit/integration/tests/User/Preferences.php
index 85992e276a54..43195a548e1e 100644
--- a/tests/phpunit/integration/tests/User/Preferences.php
+++ b/tests/phpunit/integration/tests/User/Preferences.php
@@ -17,13 +17,17 @@
 
 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;
+use WP_REST_Server;
 
 /**
  * @coversDefaultClass \Google\Web_Stories\User\Preferences
  */
-class Preferences extends TestCase {
+class Preferences extends DependencyInjectedTestCase {
 	/**
 	 * Admin user for test.
 	 *
@@ -38,6 +42,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(
 			[
@@ -53,15 +62,21 @@ public static function wpSetUpBeforeClass( $factory ) {
 	}
 
 	public function set_up() {
-		$up = new \Google\Web_Stories\User\Preferences();
-		$up->register();
 		parent::set_up();
+
+		$this->instance = $this->injector->make( \Google\Web_Stories\User\Preferences::class );
 	}
 
 	public function tear_down() {
+		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 );
 		unregister_meta_key( 'user', \Google\Web_Stories\User\Preferences::MEDIA_OPTIMIZATION_META_KEY );
+
 		parent::tear_down();
 	}
 
@@ -70,12 +85,14 @@ public function tear_down() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_add_optin_field_to_rest_api() {
+		$this->instance->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();
 
@@ -93,12 +110,14 @@ 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();
+
 		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();
 
@@ -116,12 +135,14 @@ 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();
+
 		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' => [
@@ -151,12 +172,14 @@ 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();
+
 		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' => [
@@ -178,7 +201,6 @@ public function test_permission_check_for_authors() {
 		$data = $response->get_error_data();
 		$this->assertArrayHasKey( 'status', $data );
 		$this->assertEquals( 403, $data['status'] );
-
 	}
 
 	/**
@@ -186,12 +208,14 @@ public function test_permission_check_for_authors() {
 	 * @covers ::can_edit_current_user
 	 */
 	public function test_enables_author_user_to_invalid_type() {
+		$this->instance->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' => [
@@ -203,7 +227,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();
 		}
 
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 );