diff --git a/tests/TestCase/Api/AuthKeys/AddAuthKeyApiTest.php b/tests/TestCase/Api/AuthKeys/AddAuthKeyApiTest.php
index ca305e8..2ede468 100644
--- a/tests/TestCase/Api/AuthKeys/AddAuthKeyApiTest.php
+++ b/tests/TestCase/Api/AuthKeys/AddAuthKeyApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\AuthKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/AuthKeys/DeleteAuthKeyApiTest.php b/tests/TestCase/Api/AuthKeys/DeleteAuthKeyApiTest.php
index a621f37..59082d2 100644
--- a/tests/TestCase/Api/AuthKeys/DeleteAuthKeyApiTest.php
+++ b/tests/TestCase/Api/AuthKeys/DeleteAuthKeyApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\AuthKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
@@ -19,7 +19,7 @@ class DeleteAuthKeyApiTest extends TestCase
         'app.Individuals',
         'app.Roles',
         'app.Users',
-        'app.AuthKeys',
+        'app.AuthKeys'
     ];
 
     public function testDeleteAdminAuthKey(): void
diff --git a/tests/TestCase/Api/AuthKeys/IndexAuthKeysApiTest.php b/tests/TestCase/Api/AuthKeys/IndexAuthKeysApiTest.php
index 0712480..cf77148 100644
--- a/tests/TestCase/Api/AuthKeys/IndexAuthKeysApiTest.php
+++ b/tests/TestCase/Api/AuthKeys/IndexAuthKeysApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\AuthKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Broods/AddBroodApiTest.php b/tests/TestCase/Api/Broods/AddBroodApiTest.php
index f064f61..d8406ef 100644
--- a/tests/TestCase/Api/Broods/AddBroodApiTest.php
+++ b/tests/TestCase/Api/Broods/AddBroodApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Broods;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\OrganisationsFixture;
diff --git a/tests/TestCase/Api/Broods/DeleteBroodApiTest.php b/tests/TestCase/Api/Broods/DeleteBroodApiTest.php
index 420bf01..90d1142 100644
--- a/tests/TestCase/Api/Broods/DeleteBroodApiTest.php
+++ b/tests/TestCase/Api/Broods/DeleteBroodApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Broods;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Broods/EditBroodApiTest.php b/tests/TestCase/Api/Broods/EditBroodApiTest.php
index ad5d70b..5113a31 100644
--- a/tests/TestCase/Api/Broods/EditBroodApiTest.php
+++ b/tests/TestCase/Api/Broods/EditBroodApiTest.php
@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Broods;
 
-use Cake\TestSuite\IntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
 use App\Test\Fixture\BroodsFixture;
diff --git a/tests/TestCase/Api/Broods/IndexBroodsApiTest.php b/tests/TestCase/Api/Broods/IndexBroodsApiTest.php
index d70bc53..4ddf642 100644
--- a/tests/TestCase/Api/Broods/IndexBroodsApiTest.php
+++ b/tests/TestCase/Api/Broods/IndexBroodsApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Broods;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Broods/TestBroodConnectionApiTest.php b/tests/TestCase/Api/Broods/TestBroodConnectionApiTest.php
index abc8be8..7045ceb 100644
--- a/tests/TestCase/Api/Broods/TestBroodConnectionApiTest.php
+++ b/tests/TestCase/Api/Broods/TestBroodConnectionApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Broods;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Broods/ViewBroodApiTest.php b/tests/TestCase/Api/Broods/ViewBroodApiTest.php
index bd9e5a7..2aea656 100644
--- a/tests/TestCase/Api/Broods/ViewBroodApiTest.php
+++ b/tests/TestCase/Api/Broods/ViewBroodApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Broods;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/EncryptionKeys/AddEncryptionKeyApiTest.php b/tests/TestCase/Api/EncryptionKeys/AddEncryptionKeyApiTest.php
index 00cc377..585cde5 100644
--- a/tests/TestCase/Api/EncryptionKeys/AddEncryptionKeyApiTest.php
+++ b/tests/TestCase/Api/EncryptionKeys/AddEncryptionKeyApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\EncryptionKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/EncryptionKeys/DeleteEncryptionKeyApiTest.php b/tests/TestCase/Api/EncryptionKeys/DeleteEncryptionKeyApiTest.php
index 6ae8143..cd0605c 100644
--- a/tests/TestCase/Api/EncryptionKeys/DeleteEncryptionKeyApiTest.php
+++ b/tests/TestCase/Api/EncryptionKeys/DeleteEncryptionKeyApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\EncryptionKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/EncryptionKeys/EditEncryptionKeyApiTest.php b/tests/TestCase/Api/EncryptionKeys/EditEncryptionKeyApiTest.php
index 2636fc1..b8f7bb7 100644
--- a/tests/TestCase/Api/EncryptionKeys/EditEncryptionKeyApiTest.php
+++ b/tests/TestCase/Api/EncryptionKeys/EditEncryptionKeyApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\EncryptionKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/EncryptionKeys/IndexEncryptionKeysApiTest.php b/tests/TestCase/Api/EncryptionKeys/IndexEncryptionKeysApiTest.php
index 844336d..7b9f4be 100644
--- a/tests/TestCase/Api/EncryptionKeys/IndexEncryptionKeysApiTest.php
+++ b/tests/TestCase/Api/EncryptionKeys/IndexEncryptionKeysApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\EncryptionKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/EncryptionKeys/ViewEncryptionKeyApiTest.php b/tests/TestCase/Api/EncryptionKeys/ViewEncryptionKeyApiTest.php
index de324fb..b3590f1 100644
--- a/tests/TestCase/Api/EncryptionKeys/ViewEncryptionKeyApiTest.php
+++ b/tests/TestCase/Api/EncryptionKeys/ViewEncryptionKeyApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\EncryptionKeys;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Inbox/CreateInboxEntryApiTest.php b/tests/TestCase/Api/Inbox/CreateInboxEntryApiTest.php
index a1fd077..78857e0 100644
--- a/tests/TestCase/Api/Inbox/CreateInboxEntryApiTest.php
+++ b/tests/TestCase/Api/Inbox/CreateInboxEntryApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Inbox;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Inbox/IndexInboxApiTest.php b/tests/TestCase/Api/Inbox/IndexInboxApiTest.php
index ae9c039..b8af1c6 100644
--- a/tests/TestCase/Api/Inbox/IndexInboxApiTest.php
+++ b/tests/TestCase/Api/Inbox/IndexInboxApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Inbox;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Individuals/AddIndividualApiTest.php b/tests/TestCase/Api/Individuals/AddIndividualApiTest.php
index fcff319..0ede2ba 100644
--- a/tests/TestCase/Api/Individuals/AddIndividualApiTest.php
+++ b/tests/TestCase/Api/Individuals/AddIndividualApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Individuals;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Individuals/DeleteIndividualApiTest.php b/tests/TestCase/Api/Individuals/DeleteIndividualApiTest.php
index e5657aa..676e622 100644
--- a/tests/TestCase/Api/Individuals/DeleteIndividualApiTest.php
+++ b/tests/TestCase/Api/Individuals/DeleteIndividualApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Individuals;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Individuals/EditIndividualApiTest.php b/tests/TestCase/Api/Individuals/EditIndividualApiTest.php
index c888bba..a64ed2f 100644
--- a/tests/TestCase/Api/Individuals/EditIndividualApiTest.php
+++ b/tests/TestCase/Api/Individuals/EditIndividualApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Individuals;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Individuals/IndexIndividualsApiTest.php b/tests/TestCase/Api/Individuals/IndexIndividualsApiTest.php
index e5c92ce..5f3d47b 100644
--- a/tests/TestCase/Api/Individuals/IndexIndividualsApiTest.php
+++ b/tests/TestCase/Api/Individuals/IndexIndividualsApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Individuals;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Individuals/ViewIndividualApiTest.php b/tests/TestCase/Api/Individuals/ViewIndividualApiTest.php
index d4b94d9..9d6e266 100644
--- a/tests/TestCase/Api/Individuals/ViewIndividualApiTest.php
+++ b/tests/TestCase/Api/Individuals/ViewIndividualApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Individuals;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/LocalTools/MispInterConnectionTest.php b/tests/TestCase/Api/LocalTools/MispInterConnectionTest.php
index 586b273..97d1a7b 100644
--- a/tests/TestCase/Api/LocalTools/MispInterConnectionTest.php
+++ b/tests/TestCase/Api/LocalTools/MispInterConnectionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\LocalTools;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\OrganisationsFixture;
diff --git a/tests/TestCase/Api/Organisations/AddOrganisationApiTest.php b/tests/TestCase/Api/Organisations/AddOrganisationApiTest.php
index 5a47554..231dc9a 100644
--- a/tests/TestCase/Api/Organisations/AddOrganisationApiTest.php
+++ b/tests/TestCase/Api/Organisations/AddOrganisationApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Organisations/DeleteOrganisationApiTest.php b/tests/TestCase/Api/Organisations/DeleteOrganisationApiTest.php
index efdaa5c..c0f0989 100644
--- a/tests/TestCase/Api/Organisations/DeleteOrganisationApiTest.php
+++ b/tests/TestCase/Api/Organisations/DeleteOrganisationApiTest.php
@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
-use Cake\TestSuite\IntegrationTestTrait;
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
 use App\Test\Fixture\OrganisationsFixture;
diff --git a/tests/TestCase/Api/Organisations/EditOrganisationApiTest.php b/tests/TestCase/Api/Organisations/EditOrganisationApiTest.php
index 6d14f3c..f92c1bf 100644
--- a/tests/TestCase/Api/Organisations/EditOrganisationApiTest.php
+++ b/tests/TestCase/Api/Organisations/EditOrganisationApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Organisations/IndexOrganisationsApiTest.php b/tests/TestCase/Api/Organisations/IndexOrganisationsApiTest.php
index a22e0f4..c566587 100644
--- a/tests/TestCase/Api/Organisations/IndexOrganisationsApiTest.php
+++ b/tests/TestCase/Api/Organisations/IndexOrganisationsApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Organisations/TagOrganisationApiTest.php b/tests/TestCase/Api/Organisations/TagOrganisationApiTest.php
index f8bd194..35553c5 100644
--- a/tests/TestCase/Api/Organisations/TagOrganisationApiTest.php
+++ b/tests/TestCase/Api/Organisations/TagOrganisationApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Organisations/UntagOrganisationApiTest.php b/tests/TestCase/Api/Organisations/UntagOrganisationApiTest.php
index 59f1bea..909f88a 100644
--- a/tests/TestCase/Api/Organisations/UntagOrganisationApiTest.php
+++ b/tests/TestCase/Api/Organisations/UntagOrganisationApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Organisations/ViewOrganisationApiTest.php b/tests/TestCase/Api/Organisations/ViewOrganisationApiTest.php
index a9a728b..d14df07 100644
--- a/tests/TestCase/Api/Organisations/ViewOrganisationApiTest.php
+++ b/tests/TestCase/Api/Organisations/ViewOrganisationApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Organisations;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/SharingGroups/AddSharingGroupApiTest.php b/tests/TestCase/Api/SharingGroups/AddSharingGroupApiTest.php
index cbfebbb..44dfeb0 100644
--- a/tests/TestCase/Api/SharingGroups/AddSharingGroupApiTest.php
+++ b/tests/TestCase/Api/SharingGroups/AddSharingGroupApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\SharingGroups;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\OrganisationsFixture;
diff --git a/tests/TestCase/Api/SharingGroups/DeleteSharingGroupApiTest.php b/tests/TestCase/Api/SharingGroups/DeleteSharingGroupApiTest.php
index e2d1dc5..adec700 100644
--- a/tests/TestCase/Api/SharingGroups/DeleteSharingGroupApiTest.php
+++ b/tests/TestCase/Api/SharingGroups/DeleteSharingGroupApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\SharingGroups;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/SharingGroups/EditSharingGroupApiTest.php b/tests/TestCase/Api/SharingGroups/EditSharingGroupApiTest.php
index 07dff5b..5bb4f24 100644
--- a/tests/TestCase/Api/SharingGroups/EditSharingGroupApiTest.php
+++ b/tests/TestCase/Api/SharingGroups/EditSharingGroupApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\SharingGroups;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/SharingGroups/IndexSharingGroupsApiTest.php b/tests/TestCase/Api/SharingGroups/IndexSharingGroupsApiTest.php
index 5286af2..db028d5 100644
--- a/tests/TestCase/Api/SharingGroups/IndexSharingGroupsApiTest.php
+++ b/tests/TestCase/Api/SharingGroups/IndexSharingGroupsApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\SharingGroups;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/SharingGroups/ViewSharingGroupApiTest.php b/tests/TestCase/Api/SharingGroups/ViewSharingGroupApiTest.php
index 06ceb93..6978181 100644
--- a/tests/TestCase/Api/SharingGroups/ViewSharingGroupApiTest.php
+++ b/tests/TestCase/Api/SharingGroups/ViewSharingGroupApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\SharingGroups;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;
diff --git a/tests/TestCase/Api/Tags/IndexTagsApiTest.php b/tests/TestCase/Api/Tags/IndexTagsApiTest.php
index 4b13b67..fa63d59 100644
--- a/tests/TestCase/Api/Tags/IndexTagsApiTest.php
+++ b/tests/TestCase/Api/Tags/IndexTagsApiTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Test\TestCase\Api\Users;
+namespace App\Test\TestCase\Api\Tags;
 
 use Cake\TestSuite\TestCase;
 use App\Test\Fixture\AuthKeysFixture;