diff --git a/tests/CommandsTest.php b/tests/CommandsTest.php
index f372b084..c066c2e2 100644
--- a/tests/CommandsTest.php
+++ b/tests/CommandsTest.php
@@ -105,10 +105,15 @@ class CommandsTest extends TestCase
     public function run_commands_works()
     {
         $uuid = tenant()->create('run.localhost')['uuid'];
-        
+
         Artisan::call('tenants:migrate', ['--tenants' => $uuid]);
+<<<<<<< HEAD
         
         $this->artisan("tenants:run foo --tenants=$uuid --argument='a=foo' --option='b=bar' --option='c=xyz'")
+=======
+
+        $this->artisan("tenants:run foo --tenants=$uuid a b")
+>>>>>>> 1322d02c786f86c50878b63af3a37ec6079238d3
             ->expectsOutput("User's name is Test command")
             ->expectsOutput('foo')
             ->expectsOutput('xyz');
diff --git a/tests/Etc/ConsoleKernel.php b/tests/Etc/ConsoleKernel.php
index 9376bf26..a0d82a84 100644
--- a/tests/Etc/ConsoleKernel.php
+++ b/tests/Etc/ConsoleKernel.php
@@ -2,7 +2,6 @@
 
 namespace Stancl\Tenancy\Tests\Etc;
 
-use Stancl\Tenancy\Tests\Etc\ExampleCommand;
 use Orchestra\Testbench\Console\Kernel;
 
 class ConsoleKernel extends Kernel