diff --git a/tests/Feature/Api/Users/UsersUpdateTest.php b/tests/Feature/Api/Users/UsersUpdateTest.php
deleted file mode 100644
index d6e0f9e46b..0000000000
--- a/tests/Feature/Api/Users/UsersUpdateTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace Tests\Feature\Api\Users;
-
-use App\Models\Company;
-use App\Models\Department;
-use App\Models\Group;
-use App\Models\Location;
-use App\Models\User;
-use Illuminate\Support\Facades\Hash;
-use Tests\TestCase;
-
-class UsersUpdateTest extends TestCase
-{
-    public function testCanUpdateUserViaPatch()
-    {
-        $admin = User::factory()->superuser()->create();
-        $manager = User::factory()->create();
-        $company = Company::factory()->create();
-        $department = Department::factory()->create();
-        $location = Location::factory()->create();
-        [$groupA, $groupB] = Group::factory()->count(2)->create();
-
-        $user = User::factory()->create([
-            'activated' => false,
-            'remote' => false,
-            'vip' => false,
-        ]);
-
-        $this->actingAsForApi($admin)
-            ->patchJson(route('api.users.update', $user), [
-                'first_name' => 'Mabel',
-                'last_name' => 'Mora',
-                'username' => 'mabel',
-                'password' => 'super-secret',
-                'email' => 'mabel@onlymurderspod.com',
-                'permissions' => '{"a.new.permission":"1"}',
-                'activated' => true,
-                'phone' => '619-555-5555',
-                'jobtitle' => 'Host',
-                'manager_id' => $manager->id,
-                'employee_num' => '1111',
-                'notes' => 'Pretty good artist',
-                'company_id' => $company->id,
-                'department_id' => $department->id,
-                'location_id' => $location->id,
-                'remote' => true,
-                'groups' => $groupA->id,
-                'vip' => true,
-                'start_date' => '2021-08-01',
-                'end_date' => '2025-12-31',
-            ])
-            ->assertOk();
-
-        $user->refresh();
-        $this->assertEquals('Mabel', $user->first_name, 'First name was not updated');
-        $this->assertEquals('Mora', $user->last_name, 'Last name was not updated');
-        $this->assertEquals('mabel', $user->username, 'Username was not updated');
-        $this->assertTrue(Hash::check('super-secret', $user->password), 'Password was not updated');
-        $this->assertEquals('mabel@onlymurderspod.com', $user->email, 'Email was not updated');
-        $this->assertArrayHasKey('a.new.permission', $user->decodePermissions(), 'Permissions were not updated');
-        $this->assertTrue((bool)$user->activated, 'User not marked as activated');
-        $this->assertEquals('619-555-5555', $user->phone, 'Phone was not updated');
-        $this->assertEquals('Host', $user->jobtitle, 'Job title was not updated');
-        $this->assertTrue($user->manager->is($manager), 'Manager was not updated');
-        $this->assertEquals('1111', $user->employee_num, 'Employee number was not updated');
-        $this->assertEquals('Pretty good artist', $user->notes, 'Notes was not updated');
-        $this->assertTrue($user->company->is($company), 'Company was not updated');
-        $this->assertTrue($user->department->is($department), 'Department was not updated');
-        $this->assertTrue($user->location->is($location), 'Location was not updated');
-        $this->assertEquals(1, $user->remote, 'Remote was not updated');
-        $this->assertTrue($user->groups->contains($groupA), 'Groups were not updated');
-        $this->assertEquals(1, $user->vip, 'VIP was not updated');
-        $this->assertEquals('2021-08-01', $user->start_date, 'Start date was not updated');
-        $this->assertEquals('2025-12-31', $user->end_date, 'End date was not updated');
-
-        // `groups` can be an id or array or ids
-        $this->patch(route('api.users.update', $user), ['groups' => [$groupA->id, $groupB->id]]);
-
-        $user->refresh();
-        $this->assertTrue($user->groups->contains($groupA), 'Not part of expected group');
-        $this->assertTrue($user->groups->contains($groupB), 'Not part of expected group');
-    }
-}
diff --git a/tests/Feature/Api/Assets/AssetIndexTest.php b/tests/Feature/Assets/Api/AssetIndexTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetIndexTest.php
rename to tests/Feature/Assets/Api/AssetIndexTest.php
index 0a21e13f26..c4a362d28b 100644
--- a/tests/Feature/Api/Assets/AssetIndexTest.php
+++ b/tests/Feature/Assets/Api/AssetIndexTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Tests\TestCase;
-use Carbon\Carbon;
+
 class AssetIndexTest extends TestCase
 {
     public function testAssetApiIndexReturnsExpectedAssets()
diff --git a/tests/Feature/Api/Assets/AssetsForSelectListTest.php b/tests/Feature/Assets/Api/AssetsForSelectListTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/AssetsForSelectListTest.php
rename to tests/Feature/Assets/Api/AssetsForSelectListTest.php
index 3c5e1e4e7c..de797651e4 100644
--- a/tests/Feature/Api/Assets/AssetsForSelectListTest.php
+++ b/tests/Feature/Assets/Api/AssetsForSelectListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\Company;
diff --git a/tests/Feature/Api/Assets/RequestableAssetsTest.php b/tests/Feature/Assets/Api/RequestableAssetTest.php
similarity index 97%
rename from tests/Feature/Api/Assets/RequestableAssetsTest.php
rename to tests/Feature/Assets/Api/RequestableAssetTest.php
index d90e45f223..d24913ad66 100644
--- a/tests/Feature/Api/Assets/RequestableAssetsTest.php
+++ b/tests/Feature/Assets/Api/RequestableAssetTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\User;
 use Tests\TestCase;
 
-class RequestableAssetsTest extends TestCase
+class RequestableAssetTest extends TestCase
 {
     public function testViewingRequestableAssetsRequiresCorrectPermission()
     {
diff --git a/tests/Feature/Api/Assets/AssetStoreTest.php b/tests/Feature/Assets/Api/StoreAssetTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetStoreTest.php
rename to tests/Feature/Assets/Api/StoreAssetTest.php
index 006a5738f7..2629f735bf 100644
--- a/tests/Feature/Api/Assets/AssetStoreTest.php
+++ b/tests/Feature/Assets/Api/StoreAssetTest.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
-use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Company;
@@ -13,10 +12,9 @@ use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Testing\Fluent\AssertableJson;
-use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
-class AssetStoreTest extends TestCase
+class StoreAssetTest extends TestCase
 {
     public function testRequiresPermissionToCreateAsset()
     {
diff --git a/tests/Feature/Api/Assets/AssetUpdateTest.php b/tests/Feature/Assets/Api/UpdateAssetTest.php
similarity index 96%
rename from tests/Feature/Api/Assets/AssetUpdateTest.php
rename to tests/Feature/Assets/Api/UpdateAssetTest.php
index ed830c379c..70ad3aa5b3 100644
--- a/tests/Feature/Api/Assets/AssetUpdateTest.php
+++ b/tests/Feature/Assets/Api/UpdateAssetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\CustomField;
@@ -8,7 +8,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Tests\TestCase;
 
-class AssetUpdateTest extends TestCase
+class UpdateAssetTest extends TestCase
 {
     public function testEncryptedCustomFieldCanBeUpdated()
     {
diff --git a/tests/Feature/Assets/AssetsBulkEditTest.php b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
similarity index 99%
rename from tests/Feature/Assets/AssetsBulkEditTest.php
rename to tests/Feature/Assets/Ui/BulkEditAssetsTest.php
index 70918b3595..02d39a7b45 100644
--- a/tests/Feature/Assets/AssetsBulkEditTest.php
+++ b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Assets;
+namespace Tests\Feature\Assets\Ui;
 
 use App\Models\Asset;
 use App\Models\AssetModel;
@@ -12,7 +12,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Tests\TestCase;
 
-class AssetsBulkEditTest extends TestCase
+class BulkEditAssetsTest extends TestCase
 {
     public function testUserWithPermissionsCanAccessPage()
     {
diff --git a/tests/Feature/Api/Assets/AssetCheckinTest.php b/tests/Feature/Checkins/Api/AssetCheckinTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetCheckinTest.php
rename to tests/Feature/Checkins/Api/AssetCheckinTest.php
index add90a067d..0e041fc73a 100644
--- a/tests/Feature/Api/Assets/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Api/AssetCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Checkins\Api;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Asset;
diff --git a/tests/Feature/Checkins/AccessoryCheckinTest.php b/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
similarity index 98%
rename from tests/Feature/Checkins/AccessoryCheckinTest.php
rename to tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
index 56030991e2..1213741bcc 100644
--- a/tests/Feature/Checkins/AccessoryCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkins;
+namespace Tests\Feature\Checkins\Ui;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Accessory;
diff --git a/tests/Feature/Checkins/AssetCheckinTest.php b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
similarity index 99%
rename from tests/Feature/Checkins/AssetCheckinTest.php
rename to tests/Feature/Checkins/Ui/AssetCheckinTest.php
index 1ccbbfaa01..cebd5010f1 100644
--- a/tests/Feature/Checkins/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkins;
+namespace Tests\Feature\Checkins\Ui;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Asset;
diff --git a/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
similarity index 98%
rename from tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php
rename to tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
index bdaf0e780f..83ec916cb4 100644
--- a/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php
+++ b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\CheckoutAcceptances;
+namespace Tests\Feature\CheckoutAcceptances\Ui;
 
 use App\Models\Accessory;
 use App\Models\CheckoutAcceptance;
diff --git a/tests/Feature/Api/Accessories/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
similarity index 98%
rename from tests/Feature/Api/Accessories/AccessoryCheckoutTest.php
rename to tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
index 854a96ada2..e6128aa78c 100644
--- a/tests/Feature/Api/Accessories/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Accessories;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;
diff --git a/tests/Feature/Api/Assets/AssetCheckoutTest.php b/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetCheckoutTest.php
rename to tests/Feature/Checkouts/Api/AssetCheckoutTest.php
index 82d572ef5d..f85af9035a 100644
--- a/tests/Feature/Api/Assets/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;
diff --git a/tests/Feature/Api/Consumables/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
similarity index 98%
rename from tests/Feature/Api/Consumables/ConsumableCheckoutTest.php
rename to tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
index 1528e65aa3..3bd0212fda 100644
--- a/tests/Feature/Api/Consumables/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Consumables;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;
diff --git a/tests/Feature/Checkouts/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
similarity index 98%
rename from tests/Feature/Checkouts/AccessoryCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
index 11224e4d1f..8f97a48315 100644
--- a/tests/Feature/Checkouts/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;
diff --git a/tests/Feature/Checkouts/AssetCheckoutTest.php b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
similarity index 99%
rename from tests/Feature/Checkouts/AssetCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
index 6dcff789f0..eed0908c1d 100644
--- a/tests/Feature/Checkouts/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;
diff --git a/tests/Feature/Checkouts/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
similarity index 98%
rename from tests/Feature/Checkouts/ConsumableCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
index e38ae96c83..b595640493 100644
--- a/tests/Feature/Checkouts/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;
diff --git a/tests/Feature/Checkouts/LicenseCheckoutTest.php b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
similarity index 97%
rename from tests/Feature/Checkouts/LicenseCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
index 2f4f51d4ac..8e5cd83061 100644
--- a/tests/Feature/Checkouts/LicenseCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Models\Asset;
 use App\Models\License;
diff --git a/tests/Feature/Api/Components/ComponentIndexTest.php b/tests/Feature/Components/Api/ComponentIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Components/ComponentIndexTest.php
rename to tests/Feature/Components/Api/ComponentIndexTest.php
index 517724a499..4260372c0b 100644
--- a/tests/Feature/Api/Components/ComponentIndexTest.php
+++ b/tests/Feature/Components/Api/ComponentIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Components;
+namespace Tests\Feature\Components\Api;
 
 use App\Models\Company;
 use App\Models\Component;
diff --git a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php b/tests/Feature/Consumables/Api/ConsumableIndexTest.php
similarity index 96%
rename from tests/Feature/Api/Consumables/ConsumablesIndexTest.php
rename to tests/Feature/Consumables/Api/ConsumableIndexTest.php
index 00fa43da27..b16dfdfa53 100644
--- a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php
+++ b/tests/Feature/Consumables/Api/ConsumableIndexTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Consumables;
+namespace Tests\Feature\Consumables\Api;
 
 use App\Models\Company;
 use App\Models\Consumable;
 use App\Models\User;
 use Tests\TestCase;
 
-class ConsumablesIndexTest extends TestCase
+class ConsumableIndexTest extends TestCase
 {
     public function testConsumableIndexAdheresToCompanyScoping()
     {
diff --git a/tests/Feature/Api/Departments/DepartmentIndexTest.php b/tests/Feature/Departments/Api/DepartmentIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Departments/DepartmentIndexTest.php
rename to tests/Feature/Departments/Api/DepartmentIndexTest.php
index 11ab5df9bc..462c0dc8e8 100644
--- a/tests/Feature/Api/Departments/DepartmentIndexTest.php
+++ b/tests/Feature/Departments/Api/DepartmentIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Departments;
+namespace Tests\Feature\Departments\Api;
 
 use App\Models\Company;
 use App\Models\Department;
diff --git a/tests/Feature/Api/Groups/GroupStoreTest.php b/tests/Feature/Groups/Api/StoreGroupTest.php
similarity index 97%
rename from tests/Feature/Api/Groups/GroupStoreTest.php
rename to tests/Feature/Groups/Api/StoreGroupTest.php
index afa7a747d8..ebcbff71c5 100644
--- a/tests/Feature/Api/Groups/GroupStoreTest.php
+++ b/tests/Feature/Groups/Api/StoreGroupTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Groups;
+namespace Tests\Feature\Groups\Api;
 
 use App\Helpers\Helper;
 use App\Models\Group;
 use App\Models\User;
 use Tests\TestCase;
 
-class GroupStoreTest extends TestCase
+class StoreGroupTest extends TestCase
 {
     public function testStoringGroupRequiresSuperAdminPermission()
     {
diff --git a/tests/Feature/Api/Licenses/LicensesIndexTest.php b/tests/Feature/Licenses/Api/LicenseIndexTest.php
similarity index 96%
rename from tests/Feature/Api/Licenses/LicensesIndexTest.php
rename to tests/Feature/Licenses/Api/LicenseIndexTest.php
index 603002a095..1df7864278 100644
--- a/tests/Feature/Api/Licenses/LicensesIndexTest.php
+++ b/tests/Feature/Licenses/Api/LicenseIndexTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Licenses;
+namespace Tests\Feature\Licenses\Api;
 
 use App\Models\Company;
 use App\Models\License;
 use App\Models\User;
 use Tests\TestCase;
 
-class LicensesIndexTest extends TestCase
+class LicenseIndexTest extends TestCase
 {
     public function testLicensesIndexAdheresToCompanyScoping()
     {
diff --git a/tests/Feature/Api/Locations/LocationsForSelectListTest.php b/tests/Feature/Locations/Api/LocationsForSelectListTest.php
similarity index 97%
rename from tests/Feature/Api/Locations/LocationsForSelectListTest.php
rename to tests/Feature/Locations/Api/LocationsForSelectListTest.php
index bfc7fc5374..f34b97892f 100644
--- a/tests/Feature/Api/Locations/LocationsForSelectListTest.php
+++ b/tests/Feature/Locations/Api/LocationsForSelectListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Locations;
+namespace Tests\Feature\Locations\Api;
 
 use App\Models\Location;
 use App\Models\User;
diff --git a/tests/Feature/Reports/CustomReportTest.php b/tests/Feature/Reporting/CustomReportTest.php
similarity index 99%
rename from tests/Feature/Reports/CustomReportTest.php
rename to tests/Feature/Reporting/CustomReportTest.php
index d90e4cb2a0..4d11cb23c8 100644
--- a/tests/Feature/Reports/CustomReportTest.php
+++ b/tests/Feature/Reporting/CustomReportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Reports;
+namespace Tests\Feature\Reporting;
 
 use App\Models\Asset;
 use App\Models\Company;
diff --git a/tests/Feature/Api/Users/DeleteUsersTest.php b/tests/Feature/Users/Api/DeleteUserTest.php
similarity index 97%
rename from tests/Feature/Api/Users/DeleteUsersTest.php
rename to tests/Feature/Users/Api/DeleteUserTest.php
index e926311dca..7f7cb73f7d 100644
--- a/tests/Feature/Api/Users/DeleteUsersTest.php
+++ b/tests/Feature/Users/Api/DeleteUserTest.php
@@ -1,15 +1,14 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
-use App\Models\Asset;
 use App\Models\Company;
+use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\User;
-use App\Models\LicenseSeat;
 use Tests\TestCase;
 
-class DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {
 
 
diff --git a/tests/Feature/Api/Users/UpdateUserApiTest.php b/tests/Feature/Users/Api/UpdateUserTest.php
similarity index 70%
rename from tests/Feature/Api/Users/UpdateUserApiTest.php
rename to tests/Feature/Users/Api/UpdateUserTest.php
index 37ebce4a46..020bb9a07b 100644
--- a/tests/Feature/Api/Users/UpdateUserApiTest.php
+++ b/tests/Feature/Users/Api/UpdateUserTest.php
@@ -1,14 +1,87 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
 use App\Models\Company;
+use App\Models\Department;
 use App\Models\Group;
+use App\Models\Location;
 use App\Models\User;
+use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
 
-class UpdateUserApiTest extends TestCase
+class UpdateUserTest extends TestCase
 {
+    public function testCanUpdateUserViaPatch()
+    {
+        $admin = User::factory()->superuser()->create();
+        $manager = User::factory()->create();
+        $company = Company::factory()->create();
+        $department = Department::factory()->create();
+        $location = Location::factory()->create();
+        [$groupA, $groupB] = Group::factory()->count(2)->create();
+
+        $user = User::factory()->create([
+            'activated' => false,
+            'remote' => false,
+            'vip' => false,
+        ]);
+
+        $this->actingAsForApi($admin)
+            ->patchJson(route('api.users.update', $user), [
+                'first_name' => 'Mabel',
+                'last_name' => 'Mora',
+                'username' => 'mabel',
+                'password' => 'super-secret',
+                'email' => 'mabel@onlymurderspod.com',
+                'permissions' => '{"a.new.permission":"1"}',
+                'activated' => true,
+                'phone' => '619-555-5555',
+                'jobtitle' => 'Host',
+                'manager_id' => $manager->id,
+                'employee_num' => '1111',
+                'notes' => 'Pretty good artist',
+                'company_id' => $company->id,
+                'department_id' => $department->id,
+                'location_id' => $location->id,
+                'remote' => true,
+                'groups' => $groupA->id,
+                'vip' => true,
+                'start_date' => '2021-08-01',
+                'end_date' => '2025-12-31',
+            ])
+            ->assertOk();
+
+        $user->refresh();
+        $this->assertEquals('Mabel', $user->first_name, 'First name was not updated');
+        $this->assertEquals('Mora', $user->last_name, 'Last name was not updated');
+        $this->assertEquals('mabel', $user->username, 'Username was not updated');
+        $this->assertTrue(Hash::check('super-secret', $user->password), 'Password was not updated');
+        $this->assertEquals('mabel@onlymurderspod.com', $user->email, 'Email was not updated');
+        $this->assertArrayHasKey('a.new.permission', $user->decodePermissions(), 'Permissions were not updated');
+        $this->assertTrue((bool) $user->activated, 'User not marked as activated');
+        $this->assertEquals('619-555-5555', $user->phone, 'Phone was not updated');
+        $this->assertEquals('Host', $user->jobtitle, 'Job title was not updated');
+        $this->assertTrue($user->manager->is($manager), 'Manager was not updated');
+        $this->assertEquals('1111', $user->employee_num, 'Employee number was not updated');
+        $this->assertEquals('Pretty good artist', $user->notes, 'Notes was not updated');
+        $this->assertTrue($user->company->is($company), 'Company was not updated');
+        $this->assertTrue($user->department->is($department), 'Department was not updated');
+        $this->assertTrue($user->location->is($location), 'Location was not updated');
+        $this->assertEquals(1, $user->remote, 'Remote was not updated');
+        $this->assertTrue($user->groups->contains($groupA), 'Groups were not updated');
+        $this->assertEquals(1, $user->vip, 'VIP was not updated');
+        $this->assertEquals('2021-08-01', $user->start_date, 'Start date was not updated');
+        $this->assertEquals('2025-12-31', $user->end_date, 'End date was not updated');
+
+        // `groups` can be an id or array or ids
+        $this->patch(route('api.users.update', $user), ['groups' => [$groupA->id, $groupB->id]]);
+
+        $user->refresh();
+        $this->assertTrue($user->groups->contains($groupA), 'Not part of expected group');
+        $this->assertTrue($user->groups->contains($groupB), 'Not part of expected group');
+    }
+
     public function testApiUsersCanBeActivatedWithNumber()
     {
         $admin = User::factory()->superuser()->create();
diff --git a/tests/Feature/Api/Users/UsersSearchTest.php b/tests/Feature/Users/Api/UserSearchTest.php
similarity index 98%
rename from tests/Feature/Api/Users/UsersSearchTest.php
rename to tests/Feature/Users/Api/UserSearchTest.php
index 72f23017f5..2b1d557970 100644
--- a/tests/Feature/Api/Users/UsersSearchTest.php
+++ b/tests/Feature/Users/Api/UserSearchTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
 use App\Models\Company;
 use App\Models\User;
 use Laravel\Passport\Passport;
 use Tests\TestCase;
 
-class UsersSearchTest extends TestCase
+class UserSearchTest extends TestCase
 {
     public function testCanSearchByUserFirstAndLastName()
     {
diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Users/Api/UsersForSelectListTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UsersForSelectListTest.php
rename to tests/Feature/Users/Api/UsersForSelectListTest.php
index 1ebfcf72eb..1367f408d4 100644
--- a/tests/Feature/Api/Users/UsersForSelectListTest.php
+++ b/tests/Feature/Users/Api/UsersForSelectListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
 use App\Models\Company;
 use App\Models\User;
diff --git a/tests/Feature/Users/DeleteUsersTest.php b/tests/Feature/Users/Ui/DeleteUserTest.php
similarity index 95%
rename from tests/Feature/Users/DeleteUsersTest.php
rename to tests/Feature/Users/Ui/DeleteUserTest.php
index a9ac1ab1ff..a3bb7364bd 100644
--- a/tests/Feature/Users/DeleteUsersTest.php
+++ b/tests/Feature/Users/Ui/DeleteUserTest.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace Tests\Feature\Users;
+namespace Tests\Feature\Users\Ui;
 
 use App\Models\Location;
 use App\Models\User;
-use Laravel\Passport\Passport;
 use Tests\TestCase;
 
-class DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {
 
 
diff --git a/tests/Feature/Users/UpdateUserTest.php b/tests/Feature/Users/Ui/UpdateUserTest.php
similarity index 98%
rename from tests/Feature/Users/UpdateUserTest.php
rename to tests/Feature/Users/Ui/UpdateUserTest.php
index 934fbce2b8..bef1d59a06 100644
--- a/tests/Feature/Users/UpdateUserTest.php
+++ b/tests/Feature/Users/Ui/UpdateUserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Users;
+namespace Tests\Feature\Users\Ui;
 
 use App\Models\User;
 use Tests\TestCase;