diff --git a/library/aik099/PHPUnit/BrowserConfiguration/BrowserConfiguration.php b/library/aik099/PHPUnit/BrowserConfiguration/BrowserConfiguration.php
index ba20eda..3838eda 100644
--- a/library/aik099/PHPUnit/BrowserConfiguration/BrowserConfiguration.php
+++ b/library/aik099/PHPUnit/BrowserConfiguration/BrowserConfiguration.php
@@ -12,11 +12,11 @@
 
 
 use aik099\PHPUnit\BrowserTestCase;
+use aik099\PHPUnit\Framework\TestResult;
 use aik099\PHPUnit\MinkDriver\DriverFactoryRegistry;
 use aik099\PHPUnit\MinkDriver\IMinkDriverFactory;
 use aik099\PHPUnit\Session\ISessionStrategyFactory;
 use Behat\Mink\Driver\DriverInterface;
-use aik099\PHPUnit\Framework\TestResult;
 
 /**
  * Browser configuration for browser.
diff --git a/library/aik099/PHPUnit/Session/SessionStrategyFactory.php b/library/aik099/PHPUnit/Session/SessionStrategyFactory.php
index b94ff55..f748a1d 100644
--- a/library/aik099/PHPUnit/Session/SessionStrategyFactory.php
+++ b/library/aik099/PHPUnit/Session/SessionStrategyFactory.php
@@ -11,8 +11,8 @@
 namespace aik099\PHPUnit\Session;
 
 
-use aik099\PHPUnit\IApplicationAware;
 use aik099\PHPUnit\Application;
+use aik099\PHPUnit\IApplicationAware;
 
 /**
  * Produces sessions.
diff --git a/library/aik099/PHPUnit/Session/SharedSessionStrategy.php b/library/aik099/PHPUnit/Session/SharedSessionStrategy.php
index 99f6a84..3b4200c 100644
--- a/library/aik099/PHPUnit/Session/SharedSessionStrategy.php
+++ b/library/aik099/PHPUnit/Session/SharedSessionStrategy.php
@@ -13,9 +13,9 @@
 
 use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration;
 use aik099\PHPUnit\BrowserTestCase;
-use Behat\Mink\Session;
 use aik099\PHPUnit\Framework\IncompleteTestError;
 use aik099\PHPUnit\Framework\SkippedTestError;
+use Behat\Mink\Session;
 
 /**
  * Keeps a Session object shared between test runs to save time.
diff --git a/library/aik099/PHPUnit/TestSuite/AbstractTestSuite.php b/library/aik099/PHPUnit/TestSuite/AbstractTestSuite.php
index b4c0d63..eb5ba02 100644
--- a/library/aik099/PHPUnit/TestSuite/AbstractTestSuite.php
+++ b/library/aik099/PHPUnit/TestSuite/AbstractTestSuite.php
@@ -14,9 +14,9 @@
 use aik099\PHPUnit\AbstractPHPUnitCompatibilityTestSuite;
 use aik099\PHPUnit\BrowserConfiguration\IBrowserConfigurationFactory;
 use aik099\PHPUnit\BrowserTestCase;
+use aik099\PHPUnit\Framework\DataProviderTestSuite;
 use aik099\PHPUnit\RemoteCoverage\RemoteCoverageHelper;
 use aik099\PHPUnit\Session\SessionStrategyManager;
-use aik099\PHPUnit\Framework\DataProviderTestSuite;
 use PHPUnit\Util\Test as TestUtil;
 
 /**
diff --git a/library/aik099/PHPUnit/TestSuite/TestSuiteFactory.php b/library/aik099/PHPUnit/TestSuite/TestSuiteFactory.php
index a199875..8baf702 100644
--- a/library/aik099/PHPUnit/TestSuite/TestSuiteFactory.php
+++ b/library/aik099/PHPUnit/TestSuite/TestSuiteFactory.php
@@ -11,11 +11,11 @@
 namespace aik099\PHPUnit\TestSuite;
 
 
+use aik099\PHPUnit\Application;
 use aik099\PHPUnit\BrowserConfiguration\IBrowserConfigurationFactory;
 use aik099\PHPUnit\IApplicationAware;
 use aik099\PHPUnit\RemoteCoverage\RemoteCoverageHelper;
 use aik099\PHPUnit\Session\SessionStrategyManager;
-use aik099\PHPUnit\Application;
 
 /**
  * Creates test suites based on test case class configuration.
diff --git a/tests/aik099/PHPUnit/ApplicationTest.php b/tests/aik099/PHPUnit/ApplicationTest.php
index f88797b..98e2d6c 100644
--- a/tests/aik099/PHPUnit/ApplicationTest.php
+++ b/tests/aik099/PHPUnit/ApplicationTest.php
@@ -13,7 +13,6 @@
 
 use aik099\PHPUnit\AbstractPHPUnitCompatibilityTestCase;
 use aik099\PHPUnit\Application;
-use Mockery as m;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class ApplicationTest extends AbstractPHPUnitCompatibilityTestCase
diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php b/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php
index ff430b4..c617579 100644
--- a/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php
+++ b/tests/aik099/PHPUnit/BrowserConfiguration/ApiBrowserConfigurationTestCase.php
@@ -13,9 +13,9 @@
 
 use aik099\PHPUnit\APIClient\IAPIClient;
 use aik099\PHPUnit\BrowserConfiguration\ApiBrowserConfiguration;
-use aik099\PHPUnit\Session\ISessionStrategyFactory;
-use aik099\PHPUnit\Framework\TestResult;
 use aik099\PHPUnit\BrowserTestCase;
+use aik099\PHPUnit\Framework\TestResult;
+use aik099\PHPUnit\Session\ISessionStrategyFactory;
 use Mockery as m;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php
index 922e003..0787467 100644
--- a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php
+++ b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserConfigurationTest.php
@@ -15,11 +15,10 @@
 use aik099\PHPUnit\BrowserConfiguration\ApiBrowserConfiguration;
 use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration;
 use aik099\PHPUnit\BrowserTestCase;
+use aik099\PHPUnit\Framework\TestResult;
 use aik099\PHPUnit\MinkDriver\DriverFactoryRegistry;
 use aik099\PHPUnit\Session\ISessionStrategyFactory;
 use Mockery as m;
-use Mockery\Generator\MockConfigurationBuilder;
-use aik099\PHPUnit\Framework\TestResult;
 use tests\aik099\PHPUnit\Fixture\WithBrowserConfig;
 use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php
index ad9f675..6d5f1ee 100644
--- a/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php
+++ b/tests/aik099/PHPUnit/BrowserConfiguration/BrowserStackBrowserConfigurationTest.php
@@ -11,8 +11,6 @@
 namespace tests\aik099\PHPUnit\BrowserConfiguration;
 
 
-use Mockery as m;
-
 class BrowserStackBrowserConfigurationTest extends ApiBrowserConfigurationTestCase
 {
 
diff --git a/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php b/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php
index 2014411..590a5e0 100644
--- a/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php
+++ b/tests/aik099/PHPUnit/BrowserConfiguration/SauceLabsBrowserConfigurationTest.php
@@ -11,8 +11,6 @@
 namespace tests\aik099\PHPUnit\BrowserConfiguration;
 
 
-use Mockery as m;
-
 class SauceLabsBrowserConfigurationTest extends ApiBrowserConfigurationTestCase
 {
 
diff --git a/tests/aik099/PHPUnit/BrowserTestCaseTest.php b/tests/aik099/PHPUnit/BrowserTestCaseTest.php
index 2a71bf6..bf33de1 100644
--- a/tests/aik099/PHPUnit/BrowserTestCaseTest.php
+++ b/tests/aik099/PHPUnit/BrowserTestCaseTest.php
@@ -15,16 +15,16 @@
 use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration;
 use aik099\PHPUnit\BrowserConfiguration\IBrowserConfigurationFactory;
 use aik099\PHPUnit\BrowserTestCase;
+use aik099\PHPUnit\Framework\TestResult;
 use aik099\PHPUnit\MinkDriver\DriverFactoryRegistry;
 use aik099\PHPUnit\RemoteCoverage\RemoteCoverageHelper;
 use aik099\PHPUnit\RemoteCoverage\RemoteCoverageTool;
 use aik099\PHPUnit\Session\ISessionStrategy;
 use aik099\PHPUnit\Session\SessionStrategyManager;
-use Mockery as m;
-use Mockery\MockInterface;
-use aik099\PHPUnit\Framework\TestResult;
 use aik099\SebastianBergmann\CodeCoverage\CodeCoverage;
 use aik099\SebastianBergmann\CodeCoverage\Filter;
+use Mockery as m;
+use Mockery\MockInterface;
 use SebastianBergmann\CodeCoverage\ProcessedCodeCoverageData;
 use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
 use tests\aik099\PHPUnit\Fixture\WithBrowserConfig;
diff --git a/tests/aik099/PHPUnit/Fixture/ApiIntegrationFixture.php b/tests/aik099/PHPUnit/Fixture/ApiIntegrationFixture.php
index ae92e2d..31a77b8 100644
--- a/tests/aik099/PHPUnit/Fixture/ApiIntegrationFixture.php
+++ b/tests/aik099/PHPUnit/Fixture/ApiIntegrationFixture.php
@@ -15,7 +15,6 @@
 use aik099\PHPUnit\BrowserConfiguration\BrowserStackBrowserConfiguration;
 use aik099\PHPUnit\BrowserConfiguration\SauceLabsBrowserConfiguration;
 use aik099\PHPUnit\BrowserTestCase;
-use Mockery as m;
 
 class ApiIntegrationFixture extends BrowserTestCase
 {
diff --git a/tests/aik099/PHPUnit/Fixture/SetupFixture.php b/tests/aik099/PHPUnit/Fixture/SetupFixture.php
index f9a2b0e..3cacb94 100644
--- a/tests/aik099/PHPUnit/Fixture/SetupFixture.php
+++ b/tests/aik099/PHPUnit/Fixture/SetupFixture.php
@@ -13,7 +13,6 @@
 
 use aik099\PHPUnit\BrowserConfiguration\ApiBrowserConfiguration;
 use aik099\PHPUnit\BrowserConfiguration\IBrowserConfigurationFactory;
-use aik099\PHPUnit\BrowserConfiguration\SauceLabsBrowserConfiguration;
 use aik099\PHPUnit\BrowserTestCase;
 use aik099\PHPUnit\MinkDriver\DriverFactoryRegistry;
 use Behat\Mink\Session;
diff --git a/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php b/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php
index ca96faf..5509d2a 100644
--- a/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php
+++ b/tests/aik099/PHPUnit/Integration/SuiteBuildingTest.php
@@ -13,13 +13,13 @@
 
 use aik099\PHPUnit\AbstractPHPUnitCompatibilityTestCase;
 use aik099\PHPUnit\BrowserTestCase;
+use aik099\PHPUnit\Framework\TestResult;
 use aik099\PHPUnit\TestSuite\BrowserTestSuite;
 use aik099\PHPUnit\TestSuite\RegularTestSuite;
-use aik099\PHPUnit\Framework\TestResult;
+use Mockery as m;
 use PHPUnit\Runner\Version;
 use tests\aik099\PHPUnit\Fixture\WithBrowserConfig;
 use tests\aik099\PHPUnit\Fixture\WithoutBrowserConfig;
-use Mockery as m;
 
 class SuiteBuildingTest extends AbstractPHPUnitCompatibilityTestCase
 {
diff --git a/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php b/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php
index c2d4930..ed9d03f 100644
--- a/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php
+++ b/tests/aik099/PHPUnit/MinkDriver/DriverFactoryTest.php
@@ -16,7 +16,6 @@
 use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration;
 use aik099\PHPUnit\DIContainer;
 use aik099\PHPUnit\MinkDriver\IMinkDriverFactory;
-use Mockery as m;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
 class DriverFactoryTest extends AbstractPHPUnitCompatibilityTestCase
diff --git a/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php b/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php
index 6140e2f..9e6cdcd 100644
--- a/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php
+++ b/tests/aik099/PHPUnit/RemoteCoverage/RemoteCoverageHelperTest.php
@@ -16,7 +16,6 @@
 use aik099\PHPUnit\RemoteCoverage\RemoteUrl;
 use Mockery as m;
 use Mockery\MockInterface;
-use SebastianBergmann\CodeCoverage\RawCodeCoverageData;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertIsType;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
diff --git a/tests/aik099/PHPUnit/Session/SessionStrategyFactoryTest.php b/tests/aik099/PHPUnit/Session/SessionStrategyFactoryTest.php
index 7106fb1..610d9bf 100644
--- a/tests/aik099/PHPUnit/Session/SessionStrategyFactoryTest.php
+++ b/tests/aik099/PHPUnit/Session/SessionStrategyFactoryTest.php
@@ -13,7 +13,6 @@
 
 use aik099\PHPUnit\Session\ISessionStrategyFactory;
 use aik099\PHPUnit\Session\SessionStrategyFactory;
-use Mockery as m;
 use tests\aik099\PHPUnit\TestCase\ApplicationAwareTestCase;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectException;
 
diff --git a/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php b/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php
index 0de2ff0..8486bf6 100644
--- a/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php
+++ b/tests/aik099/PHPUnit/Session/SharedSessionStrategyTest.php
@@ -12,13 +12,13 @@
 
 
 use aik099\PHPUnit\BrowserConfiguration\BrowserConfiguration;
+use aik099\PHPUnit\Framework\IncompleteTestError;
+use aik099\PHPUnit\Framework\SkippedTestError;
 use aik099\PHPUnit\Session\IsolatedSessionStrategy;
 use aik099\PHPUnit\Session\SharedSessionStrategy;
 use Behat\Mink\Session;
 use Mockery as m;
 use Mockery\MockInterface;
-use aik099\PHPUnit\Framework\IncompleteTestError;
-use aik099\PHPUnit\Framework\SkippedTestError;
 
 class SharedSessionStrategyTest extends SessionStrategyTestCase
 {
diff --git a/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php b/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php
index 8429b8c..fff75a6 100644
--- a/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php
+++ b/tests/aik099/PHPUnit/TestCase/ApplicationAwareTestCase.php
@@ -13,8 +13,8 @@
 
 use aik099\PHPUnit\AbstractPHPUnitCompatibilityTestCase;
 use aik099\PHPUnit\Application;
-use Mockery\MockInterface;
 use Mockery as m;
+use Mockery\MockInterface;
 
 class ApplicationAwareTestCase extends AbstractPHPUnitCompatibilityTestCase
 {