diff --git a/tests/Commands/Component/AddComponentCommandTest.php b/tests/Commands/Component/AddComponentCommandTest.php
index 07ff427b..909d32c0 100644
--- a/tests/Commands/Component/AddComponentCommandTest.php
+++ b/tests/Commands/Component/AddComponentCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Component;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Component\AddComponentCommand;
 use CachetHQ\Cachet\Handlers\Commands\Component\AddComponentCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add component command test class.
diff --git a/tests/Commands/Component/RemoveComponentCommandTest.php b/tests/Commands/Component/RemoveComponentCommandTest.php
index 431989fc..c5e82946 100644
--- a/tests/Commands/Component/RemoveComponentCommandTest.php
+++ b/tests/Commands/Component/RemoveComponentCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Component;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Component\RemoveComponentCommand;
 use CachetHQ\Cachet\Handlers\Commands\Component\RemoveComponentCommandHandler;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the remove component command test class.
diff --git a/tests/Commands/Component/UpdateComponentCommandTest.php b/tests/Commands/Component/UpdateComponentCommandTest.php
index 45b77dd7..655e3ba1 100644
--- a/tests/Commands/Component/UpdateComponentCommandTest.php
+++ b/tests/Commands/Component/UpdateComponentCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Component;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Component\UpdateComponentCommand;
 use CachetHQ\Cachet\Handlers\Commands\Component\UpdateComponentCommandHandler;
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the update component command test class.
diff --git a/tests/Commands/ComponentGroup/AddComponentGroupCommandTest.php b/tests/Commands/ComponentGroup/AddComponentGroupCommandTest.php
index 230580f8..5394744e 100644
--- a/tests/Commands/ComponentGroup/AddComponentGroupCommandTest.php
+++ b/tests/Commands/ComponentGroup/AddComponentGroupCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\ComponentGroup;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\ComponentGroup\AddComponentGroupCommand;
 use CachetHQ\Cachet\Handlers\Commands\ComponentGroup\AddComponentGroupCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add component group command test class.
diff --git a/tests/Commands/ComponentGroup/RemoveComponentGroupCommandTest.php b/tests/Commands/ComponentGroup/RemoveComponentGroupCommandTest.php
index 768951b6..c16a0979 100644
--- a/tests/Commands/ComponentGroup/RemoveComponentGroupCommandTest.php
+++ b/tests/Commands/ComponentGroup/RemoveComponentGroupCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\ComponentGroup;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\ComponentGroup\RemoveComponentGroupCommand;
 use CachetHQ\Cachet\Handlers\Commands\ComponentGroup\RemoveComponentGroupCommandHandler;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the remove component group command test class.
diff --git a/tests/Commands/ComponentGroup/UpdateComponentGroupCommandTest.php b/tests/Commands/ComponentGroup/UpdateComponentGroupCommandTest.php
index 041715ab..1e6a34da 100644
--- a/tests/Commands/ComponentGroup/UpdateComponentGroupCommandTest.php
+++ b/tests/Commands/ComponentGroup/UpdateComponentGroupCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\ComponentGroup;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\ComponentGroup\UpdateComponentGroupCommand;
 use CachetHQ\Cachet\Handlers\Commands\ComponentGroup\UpdateComponentGroupCommandHandler;
 use CachetHQ\Cachet\Models\ComponentGroup;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the update component group command test class.
diff --git a/tests/Commands/Incident/RemoveIncidentCommandTest.php b/tests/Commands/Incident/RemoveIncidentCommandTest.php
index aaf53dc8..b2792079 100644
--- a/tests/Commands/Incident/RemoveIncidentCommandTest.php
+++ b/tests/Commands/Incident/RemoveIncidentCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Incident;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Incident\RemoveIncidentCommand;
 use CachetHQ\Cachet\Handlers\Commands\Incident\RemoveIncidentCommandHandler;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the remove incident command test class.
diff --git a/tests/Commands/Incident/ReportIncidentCommandTest.php b/tests/Commands/Incident/ReportIncidentCommandTest.php
index fb98b402..9ea80569 100644
--- a/tests/Commands/Incident/ReportIncidentCommandTest.php
+++ b/tests/Commands/Incident/ReportIncidentCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Incident;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Incident\ReportIncidentCommand;
 use CachetHQ\Cachet\Handlers\Commands\Incident\ReportIncidentCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add incident command test class.
diff --git a/tests/Commands/Incident/ReportMaintenanceCommandTest.php b/tests/Commands/Incident/ReportMaintenanceCommandTest.php
index 96736833..d7990697 100644
--- a/tests/Commands/Incident/ReportMaintenanceCommandTest.php
+++ b/tests/Commands/Incident/ReportMaintenanceCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Incident;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Incident\ReportMaintenanceCommand;
 use CachetHQ\Cachet\Handlers\Commands\Incident\ReportMaintenanceCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add incident command test class.
diff --git a/tests/Commands/Incident/UpdateIncidentCommandTest.php b/tests/Commands/Incident/UpdateIncidentCommandTest.php
index 98ce8271..3416165c 100644
--- a/tests/Commands/Incident/UpdateIncidentCommandTest.php
+++ b/tests/Commands/Incident/UpdateIncidentCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Incident;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Incident\UpdateIncidentCommand;
 use CachetHQ\Cachet\Handlers\Commands\Incident\UpdateIncidentCommandHandler;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the update incident command test class.
diff --git a/tests/Commands/Metric/AddMetricCommandTest.php b/tests/Commands/Metric/AddMetricCommandTest.php
index 12144fd4..74e12e7b 100644
--- a/tests/Commands/Metric/AddMetricCommandTest.php
+++ b/tests/Commands/Metric/AddMetricCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Metric;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Metric\AddMetricCommand;
 use CachetHQ\Cachet\Handlers\Commands\Metric\AddMetricCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add metric command test class.
diff --git a/tests/Commands/Metric/AddMetricPointCommandTest.php b/tests/Commands/Metric/AddMetricPointCommandTest.php
index b24127f4..dfb43888 100644
--- a/tests/Commands/Metric/AddMetricPointCommandTest.php
+++ b/tests/Commands/Metric/AddMetricPointCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Metric;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Metric\AddMetricPointCommand;
 use CachetHQ\Cachet\Handlers\Commands\Metric\AddMetricPointCommandHandler;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add metric point command test class.
diff --git a/tests/Commands/Metric/RemoveMetricCommandTest.php b/tests/Commands/Metric/RemoveMetricCommandTest.php
index d42f514a..fcfa8dcd 100644
--- a/tests/Commands/Metric/RemoveMetricCommandTest.php
+++ b/tests/Commands/Metric/RemoveMetricCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Metric;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Metric\RemoveMetricCommand;
 use CachetHQ\Cachet\Handlers\Commands\Metric\RemoveMetricCommandHandler;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the remove metric command test class.
diff --git a/tests/Commands/Metric/RemoveMetricPointCommandTest.php b/tests/Commands/Metric/RemoveMetricPointCommandTest.php
index 398077d4..b1e5d236 100644
--- a/tests/Commands/Metric/RemoveMetricPointCommandTest.php
+++ b/tests/Commands/Metric/RemoveMetricPointCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Metric;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Metric\RemoveMetricPointCommand;
 use CachetHQ\Cachet\Handlers\Commands\Metric\RemoveMetricPointCommandHandler;
 use CachetHQ\Cachet\Models\MetricPoint;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the remove metric point command test class.
diff --git a/tests/Commands/Metric/UpdateMetricCommandTest.php b/tests/Commands/Metric/UpdateMetricCommandTest.php
index 3d655098..2e601725 100644
--- a/tests/Commands/Metric/UpdateMetricCommandTest.php
+++ b/tests/Commands/Metric/UpdateMetricCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Metric;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Metric\UpdateMetricCommand;
 use CachetHQ\Cachet\Handlers\Commands\Metric\UpdateMetricCommandHandler;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the update metric command test class.
diff --git a/tests/Commands/Metric/UpdateMetricPointCommandTest.php b/tests/Commands/Metric/UpdateMetricPointCommandTest.php
index 9c06b0fd..a0c8131e 100644
--- a/tests/Commands/Metric/UpdateMetricPointCommandTest.php
+++ b/tests/Commands/Metric/UpdateMetricPointCommandTest.php
@@ -11,12 +11,12 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Metric;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Metric\UpdateMetricPointCommand;
 use CachetHQ\Cachet\Handlers\Commands\Metric\UpdateMetricPointCommandHandler;
 use CachetHQ\Cachet\Models\Metric;
 use CachetHQ\Cachet\Models\MetricPoint;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the update metric point command test class.
diff --git a/tests/Commands/Subscriber/SubscribeSubscriberCommandTest.php b/tests/Commands/Subscriber/SubscribeSubscriberCommandTest.php
index 6619bda6..b8289915 100644
--- a/tests/Commands/Subscriber/SubscribeSubscriberCommandTest.php
+++ b/tests/Commands/Subscriber/SubscribeSubscriberCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Subscriber;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Subscriber\SubscribeSubscriberCommand;
 use CachetHQ\Cachet\Handlers\Commands\Subscriber\SubscribeSubscriberCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the subscribe subscriber command test class.
diff --git a/tests/Commands/Subscriber/UnsubscribeSubscriberCommandTest.php b/tests/Commands/Subscriber/UnsubscribeSubscriberCommandTest.php
index 3de326c3..3ebc1c01 100644
--- a/tests/Commands/Subscriber/UnsubscribeSubscriberCommandTest.php
+++ b/tests/Commands/Subscriber/UnsubscribeSubscriberCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Subscriber;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Handlers\Commands\Subscriber\UnsubscribeSubscriberCommandHandler;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the unsubscribe subscriber command test class.
diff --git a/tests/Commands/Subscriber/VerifySubscriberCommandTest.php b/tests/Commands/Subscriber/VerifySubscriberCommandTest.php
index bc973b5d..b837d266 100644
--- a/tests/Commands/Subscriber/VerifySubscriberCommandTest.php
+++ b/tests/Commands/Subscriber/VerifySubscriberCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\Subscriber;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\Subscriber\VerifySubscriberCommand;
 use CachetHQ\Cachet\Handlers\Commands\Subscriber\VerifySubscriberCommandHandler;
 use CachetHQ\Cachet\Models\Subscriber;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the verify subscriber command test class.
diff --git a/tests/Commands/User/AddTeamMemberCommandTest.php b/tests/Commands/User/AddTeamMemberCommandTest.php
index 6cfe94a6..2187a9f2 100644
--- a/tests/Commands/User/AddTeamMemberCommandTest.php
+++ b/tests/Commands/User/AddTeamMemberCommandTest.php
@@ -11,10 +11,10 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\User;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\User\AddTeamMemberCommand;
 use CachetHQ\Cachet\Handlers\Commands\User\AddTeamMemberCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the add team member command test class.
diff --git a/tests/Commands/User/GenerateApiTokenCommandTest.php b/tests/Commands/User/GenerateApiTokenCommandTest.php
index 7b8e1676..90ea50fb 100644
--- a/tests/Commands/User/GenerateApiTokenCommandTest.php
+++ b/tests/Commands/User/GenerateApiTokenCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\User;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\User\GenerateApiTokenCommand;
 use CachetHQ\Cachet\Handlers\Commands\User\GenerateApiTokenCommandHandler;
 use CachetHQ\Cachet\Models\User;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the generate api token command test class.
diff --git a/tests/Commands/User/RemoveUserCommandTest.php b/tests/Commands/User/RemoveUserCommandTest.php
index ca34092d..2d8c0a68 100644
--- a/tests/Commands/User/RemoveUserCommandTest.php
+++ b/tests/Commands/User/RemoveUserCommandTest.php
@@ -11,11 +11,11 @@
 
 namespace CachetHQ\Tests\Cachet\Commands\User;
 
+use AltThree\TestBench\CommandTrait;
 use CachetHQ\Cachet\Commands\User\RemoveUserCommand;
 use CachetHQ\Cachet\Handlers\Commands\User\RemoveUserCommandHandler;
 use CachetHQ\Cachet\Models\User;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
-use AltThree\TestBench\CommandTrait;
 
 /**
  * This is the remove user command test class.