diff --git a/.circleci/config.yml b/.circleci/config.yml
index e166ff46e..abc10eb97 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,7 +74,8 @@ aliases:
       name: Run unit tests
       command: |
         php artisan route:cache
-        phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --log-junit ./results/junit/unit/results.xml --coverage-clover ./results/coverage.xml
+        TESTSUITE=$(echo -e "Api-and-Feature\nUnit" | circleci tests split)
+        phpdbg -dmemory_limit=4G -qrr vendor/bin/phpunit -c phpunit.xml --log-junit ./results/junit/unit/results${CIRCLE_NODE_INDEX}.xml --coverage-clover ./results/coverage${CIRCLE_NODE_INDEX}.xml --testsuite $TESTSUITE
   - &psalm
     run:
       name: Run psalm
@@ -86,7 +87,7 @@ aliases:
   - &browser-tests
     run:
       name: Run browser tests
-      command: php artisan dusk --log-junit results/junit/dusk/results.xml
+      command: php artisan dusk --log-junit results/junit/dusk/results3.xml
   - &browser-cypress
     run:
       name: Run browser tests (cypress)
@@ -97,13 +98,13 @@ aliases:
     run:
       name: Fix coverage
       command: |
-        vendor/bin/phpcov merge --clover=results/coverage2.xml results/coverage/
+        vendor/bin/phpcov merge --clover=results/coverage3.xml results/coverage/
         rm -rf results/coverage
   - &fix-coverage2
     run:
       name: Fix coverage
       command: |
-        vendor/bin/phpcov merge --clover=results/coverage3.xml results/coverage/
+        vendor/bin/phpcov merge --clover=results/coverage4.xml results/coverage/
         rm -rf results/coverage
   - &selenium
     run:
@@ -208,6 +209,7 @@ jobs:
         environment:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_ROOT_PASSWORD: ''
+    parallelism: 2
 
     steps:
       - checkout:
@@ -344,7 +346,7 @@ jobs:
           name: Run sonar scanner
           command: |
             export SONAR_RESULT=./results/results.xml
-            export SONAR_COVERAGE=./results/coverage.xml,./results/coverage2.xml,./results/coverage3.xml
+            export SONAR_COVERAGE=$(ls -m ./results/coverage*.xml | sed 's/ //g' | sed ':a;N;$!ba;s/\n//g')
             scripts/tests/runsonar.sh
 
       - save_cache:
diff --git a/.circleci/config.yml.sig b/.circleci/config.yml.sig
index a71f19930..01fc04d6a 100644
Binary files a/.circleci/config.yml.sig and b/.circleci/config.yml.sig differ
diff --git a/phpunit.xml b/phpunit.xml
index 3541da50a..1568bea1c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -9,20 +9,14 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
-        <testsuite name="Unit Tests">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-
-        <testsuite name="Api Tests">
+        <testsuite name="Api-and-Feature">
             <directory suffix="Test.php">./tests/Api</directory>
-        </testsuite>
-
-        <testsuite name="Commands Tests">
             <directory suffix="Test.php">./tests/Commands</directory>
+            <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
 
-        <testsuite name="Feature Tests">
-            <directory suffix="Test.php">./tests/Feature</directory>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/tests/Api/Auth/AuthControllerTest.php b/tests/Browser/Auth/AuthControllerTest.php
similarity index 98%
rename from tests/Api/Auth/AuthControllerTest.php
rename to tests/Browser/Auth/AuthControllerTest.php
index 9943c3abf..f92bd668c 100644
--- a/tests/Api/Auth/AuthControllerTest.php
+++ b/tests/Browser/Auth/AuthControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Api\Auth;
+namespace Tests\Browser\Auth;
 
 use Tests\ApiTestCase;
 use App\Models\User\User;
diff --git a/tests/Unit/Commands/CalculateStatisticsTest.php b/tests/Commands/CalculateStatisticsTest.php
similarity index 93%
rename from tests/Unit/Commands/CalculateStatisticsTest.php
rename to tests/Commands/CalculateStatisticsTest.php
index b6b463766..984c67a4c 100644
--- a/tests/Unit/Commands/CalculateStatisticsTest.php
+++ b/tests/Commands/CalculateStatisticsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Commands;
+namespace Tests\Commands;
 
 use Tests\TestCase;
 use Illuminate\Database\QueryException;
diff --git a/tests/Unit/Commands/ImportVCardsTest.php b/tests/Commands/ImportVCardsTest.php
similarity index 99%
rename from tests/Unit/Commands/ImportVCardsTest.php
rename to tests/Commands/ImportVCardsTest.php
index 04090487d..269709c8a 100644
--- a/tests/Unit/Commands/ImportVCardsTest.php
+++ b/tests/Commands/ImportVCardsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Commands;
+namespace Tests\Commands;
 
 use Mockery as m;
 use Tests\TestCase;
diff --git a/tests/Unit/Commands/SendRemindersTest.php b/tests/Commands/SendRemindersTest.php
similarity index 98%
rename from tests/Unit/Commands/SendRemindersTest.php
rename to tests/Commands/SendRemindersTest.php
index f3fc6b097..9a82f5bf0 100644
--- a/tests/Unit/Commands/SendRemindersTest.php
+++ b/tests/Commands/SendRemindersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Jobs;
+namespace Tests\Jobs;
 
 use Carbon\Carbon;
 use Tests\TestCase;
diff --git a/tests/Unit/Commands/SendStayInTouchTest.php b/tests/Commands/SendStayInTouchTest.php
similarity index 98%
rename from tests/Unit/Commands/SendStayInTouchTest.php
rename to tests/Commands/SendStayInTouchTest.php
index 22ef63cb0..34660562a 100644
--- a/tests/Unit/Commands/SendStayInTouchTest.php
+++ b/tests/Commands/SendStayInTouchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Jobs;
+namespace Tests\Jobs;
 
 use Carbon\Carbon;
 use Tests\TestCase;
diff --git a/tests/Unit/Controllers/ActivityTypeCategoriesControllerTest.php b/tests/Feature/ActivityTypeCategoriesTest.php
similarity index 96%
rename from tests/Unit/Controllers/ActivityTypeCategoriesControllerTest.php
rename to tests/Feature/ActivityTypeCategoriesTest.php
index 9c1ef6180..b465d37ad 100644
--- a/tests/Unit/Controllers/ActivityTypeCategoriesControllerTest.php
+++ b/tests/Feature/ActivityTypeCategoriesTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Unit\Controllers;
+namespace Tests\Feature;
 
 use Tests\FeatureTestCase;
 use App\Models\Account\ActivityTypeCategory;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ActivityTypeCategoriesControllerTest extends FeatureTestCase
+class ActivityTypeCategoriesTest extends FeatureTestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Unit/Controllers/ActivityTypesControllerTest.php b/tests/Feature/ActivityTypesTest.php
similarity index 94%
rename from tests/Unit/Controllers/ActivityTypesControllerTest.php
rename to tests/Feature/ActivityTypesTest.php
index 66d41703c..67c84a1bc 100644
--- a/tests/Unit/Controllers/ActivityTypesControllerTest.php
+++ b/tests/Feature/ActivityTypesTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Unit\Controllers;
+namespace Tests\Feature;
 
 use Tests\FeatureTestCase;
 use App\Models\Account\ActivityType;
 use App\Models\Account\ActivityTypeCategory;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class ActivityTypesControllerTest extends FeatureTestCase
+class ActivityTypesTest extends FeatureTestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Unit/Controllers/Contact/CallsControllerTest.php b/tests/Feature/CallsTest.php
similarity index 95%
rename from tests/Unit/Controllers/Contact/CallsControllerTest.php
rename to tests/Feature/CallsTest.php
index 8a8b5870a..b7a8287d6 100644
--- a/tests/Unit/Controllers/Contact/CallsControllerTest.php
+++ b/tests/Feature/CallsTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Unit\Controllers\Contact;
+namespace Tests\Feature;
 
 use Tests\FeatureTestCase;
 use App\Models\Contact\Call;
 use App\Models\Contact\Contact;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class CallsControllerTest extends FeatureTestCase
+class CallsTest extends FeatureTestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Unit/Controllers/DocumentsControllerTest.php b/tests/Feature/DocumentsTest.php
similarity index 93%
rename from tests/Unit/Controllers/DocumentsControllerTest.php
rename to tests/Feature/DocumentsTest.php
index 5df4c77b5..f89b9034d 100644
--- a/tests/Unit/Controllers/DocumentsControllerTest.php
+++ b/tests/Feature/DocumentsTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Unit\Controllers;
+namespace Tests\Feature;
 
 use Tests\FeatureTestCase;
 use App\Models\Contact\Contact;
 use App\Models\Contact\Document;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class DocumentsControllerTest extends FeatureTestCase
+class DocumentsTest extends FeatureTestCase
 {
     use DatabaseTransactions;
 
diff --git a/tests/Feature/SettingsTest.php b/tests/Feature/SettingsTest.php
index 3756bc39e..7b51816b1 100644
--- a/tests/Feature/SettingsTest.php
+++ b/tests/Feature/SettingsTest.php
@@ -76,4 +76,37 @@ class SettingsTest extends FeatureTestCase
 
         $response->assertSee('Login');
     }
+
+    public function test_it_updates_the_default_profile_view()
+    {
+        $user = $this->signin();
+
+        $response = $this->json('POST', '/settings/updateDefaultProfileView', [
+            'name' => 'life-events',
+        ]);
+
+        $response->assertStatus(200);
+
+        $this->assertDatabaseHas('users', [
+            'profile_active_tab' => 'life-events',
+            'id' => $user->id,
+        ]);
+
+        $response = $this->json('POST', '/settings/updateDefaultProfileView', [
+            'name' => 'notes',
+        ]);
+
+        $response->assertStatus(200);
+
+        $this->assertDatabaseHas('users', [
+            'profile_active_tab' => 'notes',
+            'id' => $user->id,
+        ]);
+
+        $response = $this->json('POST', '/settings/updateDefaultProfileView', [
+            'name' => 'nawak',
+        ]);
+
+        $response->assertStatus(200);
+    }
 }
diff --git a/tests/Unit/Controllers/SettingsControllerTest.php b/tests/Unit/Controllers/SettingsControllerTest.php
deleted file mode 100644
index 2ac07bf3a..000000000
--- a/tests/Unit/Controllers/SettingsControllerTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Tests\Unit\Controllers;
-
-use Tests\FeatureTestCase;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-
-class SettingsControllerTest extends FeatureTestCase
-{
-    use DatabaseTransactions;
-
-    public function test_it_updates_the_default_profile_view()
-    {
-        $user = $this->signin();
-
-        $response = $this->json('POST', '/settings/updateDefaultProfileView', [
-            'name' => 'life-events',
-        ]);
-
-        $response->assertStatus(200);
-
-        $this->assertDatabaseHas('users', [
-            'profile_active_tab' => 'life-events',
-            'id' => $user->id,
-        ]);
-
-        $response = $this->json('POST', '/settings/updateDefaultProfileView', [
-            'name' => 'notes',
-        ]);
-
-        $response->assertStatus(200);
-
-        $this->assertDatabaseHas('users', [
-            'profile_active_tab' => 'notes',
-            'id' => $user->id,
-        ]);
-
-        $response = $this->json('POST', '/settings/updateDefaultProfileView', [
-            'name' => 'nawak',
-        ]);
-
-        $response->assertStatus(200);
-    }
-}