diff --git a/composer.json b/composer.json
index 2503e1752..e977918c0 100644
--- a/composer.json
+++ b/composer.json
@@ -58,6 +58,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "dominikb/composer-license-checker": "^2.4",
         "infection/infection": "^0.26.15",
+        "jangregor/phpstan-prophecy": "^1.0",
         "mikey179/vfsstream": "^1.6",
         "overtrue/phplint": "^9.0",
         "phpro/grumphp": "^1.13.0",
diff --git a/composer.lock b/composer.lock
index 752837902..5f3823bea 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3930d33ef0070b2042c496fd527a7533",
+    "content-hash": "2f5a74f3e023e295a7246f5ff4cb58fd",
     "packages": [
         {
             "name": "acquia/drupal-environment-detector",
@@ -8888,6 +8888,71 @@
             ],
             "time": "2023-02-05T21:47:26+00:00"
         },
+        {
+            "name": "jangregor/phpstan-prophecy",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Jan0707/phpstan-prophecy.git",
+                "reference": "2bc7ca9460395690c6bf7332bdfb2f25d5cae8e0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Jan0707/phpstan-prophecy/zipball/2bc7ca9460395690c6bf7332bdfb2f25d5cae8e0",
+                "reference": "2bc7ca9460395690c6bf7332bdfb2f25d5cae8e0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
+                "phpstan/phpstan": "^1.0.0"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.7.0,>=2.0.0",
+                "phpunit/phpunit": "<6.0.0,>=10.0.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.1.1",
+                "ergebnis/license": "^1.0.0",
+                "ergebnis/php-cs-fixer-config": "~2.2.0",
+                "phpspec/prophecy": "^1.7.0",
+                "phpunit/phpunit": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JanGregor\\Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Gregor Emge-Triebel",
+                    "email": "jan@jangregor.me"
+                }
+            ],
+            "description": "Provides a phpstan/phpstan extension for phpspec/prophecy",
+            "support": {
+                "issues": "https://github.com/Jan0707/phpstan-prophecy/issues",
+                "source": "https://github.com/Jan0707/phpstan-prophecy/tree/1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/localheinz",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-11-08T16:37:47+00:00"
+        },
         {
             "name": "jean85/pretty-package-versions",
             "version": "2.0.5",
diff --git a/src/ClientServiceInterface.php b/src/ClientServiceInterface.php
deleted file mode 100644
index 34a450af4..000000000
--- a/src/ClientServiceInterface.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Acquia\Cli;
-
-interface ClientServiceInterface {
-
-}
diff --git a/src/CloudApi/ClientService.php b/src/CloudApi/ClientService.php
index 92213ab9f..96afa2ad8 100644
--- a/src/CloudApi/ClientService.php
+++ b/src/CloudApi/ClientService.php
@@ -6,7 +6,6 @@
 
 use Acquia\Cli\ApiCredentialsInterface;
 use Acquia\Cli\Application;
-use Acquia\Cli\ClientServiceInterface;
 use Acquia\Cli\ConnectorFactoryInterface;
 use AcquiaCloudApi\Connector\Client;
 use AcquiaCloudApi\Connector\ConnectorInterface;
@@ -18,7 +17,7 @@
  * client queries. Consumers could otherwise just call
  * Client::factory($connector) directly.
  */
-class ClientService implements ClientServiceInterface {
+class ClientService {
 
   protected ConnectorInterface $connector;
   protected ConnectorFactoryInterface|ConnectorFactory $connectorFactory;
diff --git a/src/Command/Api/ApiCommandHelper.php b/src/Command/Api/ApiCommandHelper.php
index b93324126..2695d2b2c 100644
--- a/src/Command/Api/ApiCommandHelper.php
+++ b/src/Command/Api/ApiCommandHelper.php
@@ -4,7 +4,6 @@
 
 namespace Acquia\Cli\Command\Api;
 
-use Acquia\Cli\Command\CommandBase;
 use Acquia\Cli\CommandFactoryInterface;
 use Acquia\Cli\Exception\AcquiaCliException;
 use Symfony\Component\Cache\Adapter\NullAdapter;
@@ -64,7 +63,7 @@ private function addOptionExampleToUsageForGetEndpoint(array $paramDefinition, s
    * @param array $schema
    * @param array $acquiaCloudSpec
    */
-  private function addApiCommandParameters(array $schema, array $acquiaCloudSpec, CommandBase $command): void {
+  private function addApiCommandParameters(array $schema, array $acquiaCloudSpec, ApiBaseCommand $command): void {
     $inputDefinition = [];
     $usage = '';
 
diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
index 2f0cc4553..172b7a56a 100644
--- a/src/Command/CommandBase.php
+++ b/src/Command/CommandBase.php
@@ -5,7 +5,7 @@
 namespace Acquia\Cli\Command;
 
 use Acquia\Cli\ApiCredentialsInterface;
-use Acquia\Cli\ClientServiceInterface;
+use Acquia\Cli\CloudApi\ClientService;
 use Acquia\Cli\Command\Ssh\SshKeyCommandBase;
 use Acquia\Cli\DataStore\AcquiaCliDatastore;
 use Acquia\Cli\DataStore\CloudDataStore;
@@ -97,7 +97,7 @@ public function __construct(
     protected ApiCredentialsInterface $cloudCredentials,
     protected TelemetryHelper $telemetryHelper,
     protected string $projectDir,
-    protected ClientServiceInterface $cloudApiClientService,
+    protected ClientService $cloudApiClientService,
     protected LogstreamManager $logstreamManager,
     public SshHelper $sshHelper,
     protected string $sshDir,
@@ -1030,9 +1030,9 @@ private function convertUserAliasToUuid(InputInterface $input, string $userUuidA
   }
 
   /**
-   * @param String $userAlias
+   * @param string $userUuidArgument
    *   User alias like uuid or email.
-   * @param String $orgUuidArgument
+   * @param string $orgUuidArgument
    *   Organization uuid.
    * @return string
    *   User uuid from alias
diff --git a/src/ConnectorFactoryInterface.php b/src/ConnectorFactoryInterface.php
index ba0264fcf..88f5e2d90 100644
--- a/src/ConnectorFactoryInterface.php
+++ b/src/ConnectorFactoryInterface.php
@@ -4,6 +4,11 @@
 
 namespace Acquia\Cli;
 
+use Acquia\Cli\CloudApi\AccessTokenConnector;
+use AcquiaCloudApi\Connector\Connector;
+
 interface ConnectorFactoryInterface {
 
+  public function createConnector(): Connector|AccessTokenConnector;
+
 }
diff --git a/tests/phpunit/src/Commands/WizardTestBase.php b/tests/phpunit/src/Commands/WizardTestBase.php
index d3bde8532..e4799133d 100644
--- a/tests/phpunit/src/Commands/WizardTestBase.php
+++ b/tests/phpunit/src/Commands/WizardTestBase.php
@@ -68,7 +68,6 @@ protected function runTestCreate(): void {
     $sshHelper = $this->mockPollCloudViaSsh($environmentsResponse);
     $this->command->sshHelper = $sshHelper->reveal();
 
-    /** @var Filesystem|ObjectProphecy $fileSystem */
     $fileSystem = $this->prophet->prophesize(Filesystem::class);
     $this->mockGenerateSshKey($localMachineHelper, $request['public_key']);
     $localMachineHelper->getLocalFilepath($this->passphraseFilepath)->willReturn($this->passphraseFilepath);