diff --git a/app/Enums/Country.php b/app/Enums/Country.php
new file mode 100644
index 0000000..9211fb2
--- /dev/null
+++ b/app/Enums/Country.php
@@ -0,0 +1,250 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+enum Country: string
+{
+    case United_Kingdom = 'GB';
+    case United_States = 'US';
+    case Afghanistan = 'AF';
+    case Aland_Islands = 'AX';
+    case Albania = 'AL';
+    case Algeria = 'DZ';
+    case AmericanSamoa = 'AS';
+    case Andorra = 'AD';
+    case Angola = 'AO';
+    case Anguilla = 'AI';
+    case Antarctica = 'AQ';
+    case Antigua_and_Barbuda = 'AG';
+    case Argentina = 'AR';
+    case Armenia = 'AM';
+    case Aruba = 'AW';
+    case Australia = 'AU';
+    case Austria = 'AT';
+    case Azerbaijan = 'AZ';
+    case Bahamas = 'BS';
+    case Bahrain = 'BH';
+    case Bangladesh = 'BD';
+    case Barbados = 'BB';
+    case Belarus = 'BY';
+    case Belgium = 'BE';
+    case Belize = 'BZ';
+    case Benin = 'BJ';
+    case Bermuda = 'BM';
+    case Bhutan = 'BT';
+    case Bolivia_Plurination = 'BO';
+    case Bosnia_and_Herzegovi = 'BA';
+    case Botswana = 'BW';
+    case Brazil = 'BR';
+    case British_Indian_Ocean = 'IO';
+    case Brunei_Darussalam = 'BN';
+    case Bulgaria = 'BG';
+    case Burkina_Faso = 'BF';
+    case Burundi = 'BI';
+    case Cambodia = 'KH';
+    case Cameroon = 'CM';
+    case Cape_Verde = 'CV';
+    case Cayman_Islands = 'KY';
+    case Central_African_Repu = 'CF';
+    case Chad = 'TD';
+    case China = 'CN';
+    case Christmas_Island = 'CX';
+    case Cocos_Keeling_Isla = 'CC';
+    case Colombia = 'CO';
+    case Comoros = 'KM';
+    case Congo = 'CG';
+    case Congo_The_Democrati = 'CD';
+    case Cook_Islands = 'CK';
+    case Costa_Rica = 'CR';
+    case Cote_dIvoire = 'CI';
+    case Croatia = 'HR';
+    case Cuba = 'CU';
+    case Cyprus = 'CY';
+    case Czech_Republic = 'CZ';
+    case Denmark = 'DK';
+    case Djibouti = 'DJ';
+    case Dominica = 'DM';
+    case Dominican_Republic = 'DO';
+    case Ecuador = 'EC';
+    case Egypt = 'EG';
+    case El_Salvador = 'SV';
+    case Equatorial_Guinea = 'GQ';
+    case Estonia = 'EE';
+    case Ethiopia = 'ET';
+    case Falkland_Islands = 'FK';
+    case Faroe_Islands = 'FO';
+    case Fiji = 'FJ';
+    case Finland = 'FI';
+    case France = 'FR';
+    case French_Guiana = 'GF';
+    case French_Polynesia = 'PF';
+    case Gabon = 'GA';
+    case Georgia = 'GE';
+    case Germany = 'DE';
+    case Ghana = 'GH';
+    case Gibraltar = 'GI';
+    case Greece = 'GR';
+    case Greenland = 'GL';
+    case Grenada = 'GD';
+    case Guadeloupe = 'GP';
+    case Guam = 'GU';
+    case Guatemala = 'GT';
+    case Guernsey = 'GG';
+    case Guinea = 'GN';
+    case Guinea_Bissau = 'GW';
+    case Guyana = 'GY';
+    case Haiti = 'HT';
+    case Holy_See = 'VA';
+    case Honduras = 'HN';
+    case Hong_Kong = 'HK';
+    case Hungary = 'HU';
+    case Iceland = 'IS';
+    case India = 'IN';
+    case Indonesia = 'ID';
+    case Iran = 'IR';
+    case Iraq = 'IQ';
+    case Ireland = 'IE';
+    case Isle_of_Man = 'IM';
+    case Israel = 'IL';
+    case Italy = 'IT';
+    case Jamaica = 'JM';
+    case Japan = 'JP';
+    case Jersey = 'JE';
+    case Jordan = 'JO';
+    case Kazakhstan = 'KZ';
+    case Kenya = 'KE';
+    case Kiribati = 'KI';
+    case Korea_Democratic_Pe = 'KP';
+    case Korea_Republic_of_S = 'KR';
+    case Kuwait = 'KW';
+    case Kyrgyzstan = 'KG';
+    case Laos = 'LA';
+    case Latvia = 'LV';
+    case Lebanon = 'LB';
+    case Lesotho = 'LS';
+    case Liberia = 'LR';
+    case Libyan_Arab_Jamahiri = 'LY';
+    case Liechtenstein = 'LI';
+    case Lithuania = 'LT';
+    case Luxembourg = 'LU';
+    case Macao = 'MO';
+    case Macedonia = 'MK';
+    case Madagascar = 'MG';
+    case Malawi = 'MW';
+    case Malaysia = 'MY';
+    case Maldives = 'MV';
+    case Mali = 'ML';
+    case Malta = 'MT';
+    case Marshall_Islands = 'MH';
+    case Martinique = 'MQ';
+    case Mauritania = 'MR';
+    case Mauritius = 'MU';
+    case Mayotte = 'YT';
+    case Mexico = 'MX';
+    case Micronesia_Federate = 'FM';
+    case Moldova = 'MD';
+    case Monaco = 'MC';
+    case Mongolia = 'MN';
+    case Montenegro = 'ME';
+    case Montserrat = 'MS';
+    case Morocco = 'MA';
+    case Mozambique = 'MZ';
+    case Myanmar = 'MM';
+    case Namibia = 'NA';
+    case Nauru = 'NR';
+    case Nepal = 'NP';
+    case Netherlands = 'NL';
+    case Netherlands_Antilles = 'AN';
+    case New_Caledonia = 'NC';
+    case New_Zealand = 'NZ';
+    case Nicaragua = 'NI';
+    case Niger = 'NE';
+    case Nigeria = 'NG';
+    case Niue = 'NU';
+    case Norfolk_Island = 'NF';
+    case Northern_Mariana_Isl = 'MP';
+    case Norway = 'NO';
+    case Oman = 'OM';
+    case Pakistan = 'PK';
+    case Palau = 'PW';
+    case Palestinian_Territor = 'PS';
+    case Panama = 'PA';
+    case Papua_New_Guinea = 'PG';
+    case Paraguay = 'PY';
+    case Peru = 'PE';
+    case Philippines = 'PH';
+    case Pitcairn = 'PN';
+    case Poland = 'PL';
+    case Portugal = 'PT';
+    case Puerto_Rico = 'PR';
+    case Qatar = 'QA';
+    case Romania = 'RO';
+    case Russia = 'RU';
+    case Rwanda = 'RW';
+    case Reunion = 'RE';
+    case Saint_Barthelemy = 'BL';
+    case Saint_Helena_Ascens = 'SH';
+    case Saint_Kitts_and_Nevi = 'KN';
+    case Saint_Lucia = 'LC';
+    case Saint_Martin = 'MF';
+    case Saint_Pierre_and_Miq = 'PM';
+    case Saint_Vincent_and_th = 'VC';
+    case Samoa = 'WS';
+    case San_Marino = 'SM';
+    case Sao_Tome_and_Princip = 'ST';
+    case Saudi_Arabia = 'SA';
+    case Senegal = 'SN';
+    case Serbia = 'RS';
+    case Seychelles = 'SC';
+    case Sierra_Leone = 'SL';
+    case Singapore = 'SG';
+    case Slovakia = 'SK';
+    case Slovenia = 'SI';
+    case Solomon_Islands = 'SB';
+    case Somalia = 'SO';
+    case South_Africa = 'ZA';
+    case South_Georgia_and_th = 'GS';
+    case Spain = 'ES';
+    case Sri_Lanka = 'LK';
+    case Sudan = 'SD';
+    case Suriname = 'SR';
+    case Svalbard_and_Jan_May = 'SJ';
+    case Swaziland = 'SZ';
+    case Sweden = 'SE';
+    case Switzerland = 'CH';
+    case Syrian_Arab_Republic = 'SY';
+    case Taiwan = 'TW';
+    case Tajikistan = 'TJ';
+    case Tanzania_United_Rep = 'TZ';
+    case Thailand = 'TH';
+    case Timor_Leste = 'TL';
+    case Togo = 'TG';
+    case Tokelau = 'TK';
+    case Tonga = 'TO';
+    case Trinidad_and_Tobago = 'TT';
+    case Turkey = 'TR';
+    case Turkmenistan = 'TM';
+    case Turks_and_Caicos_Isl = 'TC';
+    case Tuvalu = 'TV';
+    case Uganda = 'UG';
+    case Ukraine = 'UA';
+    case United_Arab_Emirates = 'AE';
+    case Uruguay = 'UY';
+    case Uzbekistan = 'UZ';
+    case Vanuatu = 'VU';
+    case Venezuela_Bolivaria = 'VE';
+    case Vietnam = 'VN';
+    case Virgin_Islands_Brit = 'VG';
+    case Virgin_Islands_US = 'VI';
+    case Wallis_and_Futuna = 'WF';
+    case Yemen = 'YE';
+    case Zambia = 'ZM';
+    case Zimbabwe = 'ZW';
+
+    public function label(): string
+    {
+        return (string) str($this->name)->replace('_', ' ');
+    }
+}
diff --git a/resources/views/components/form/checkbox.blade.php b/resources/views/components/form/checkbox.blade.php
index 53e690a..9c514dc 100644
--- a/resources/views/components/form/checkbox.blade.php
+++ b/resources/views/components/form/checkbox.blade.php
@@ -32,7 +32,9 @@
             name='{{ $name }}'
             id='{{ $id }}'
             value='{{ $value }}'
-            @if ($selected === $value) checked='checked' @endif {{ $attributes }}
+            @if ($selected === $value) checked='checked' @endif
+            class="rounded-md"
+            {{ $attributes }}
         >
         {{ $label }}
     </div>
diff --git a/resources/views/components/form/radio.blade.php b/resources/views/components/form/radio.blade.php
index 52719a5..3f78de1 100644
--- a/resources/views/components/form/radio.blade.php
+++ b/resources/views/components/form/radio.blade.php
@@ -31,7 +31,9 @@
             name='{{ $name }}'
             id='{{ $id }}'
             value='{{ $value }}'
-            @if ($slot != '') checked="checked" @endif {{ $attributes }}
+            @if ($slot != '') checked="checked" @endif
+            class="rounded-md"
+            {{ $attributes }}
         >
         {{ $label }}
     </div>
diff --git a/resources/views/livewire/admin/dashboard.blade.php b/resources/views/livewire/admin/dashboard.blade.php
index a7879cf..1184f79 100644
--- a/resources/views/livewire/admin/dashboard.blade.php
+++ b/resources/views/livewire/admin/dashboard.blade.php
@@ -5,4 +5,11 @@
         {{ __("You're logged in!") }}
     </div>
 
+    <select>
+        <option value="">Select</option>
+        @foreach(App\Enums\Country::cases() as $country)
+            <option value="{{ $country->value }}">{{ $country->label() }}</option>
+        @endforeach
+    </select>
+
 </div>
diff --git a/resources/views/livewire/admin/users/edit/admin-settings.blade.php b/resources/views/livewire/admin/users/edit/admin-settings.blade.php
index af4b78c..e5786a4 100644
--- a/resources/views/livewire/admin/users/edit/admin-settings.blade.php
+++ b/resources/views/livewire/admin/users/edit/admin-settings.blade.php
@@ -14,7 +14,7 @@
 
                             <div class="relative border rounded-tl-md rounded-tr-md p-4 flex border-gray-200">
                                 <div class="flex items-center h-5">
-                                    <input wire:model.live="isOfficeLoginOnly" id="isOfficeLoginOnly" type="checkbox" class="h-4 w-4 text-light-blue-600 cursor-pointer focus:ring-light-blue-500 border-gray-300" checked="">
+                                    <input wire:model="isOfficeLoginOnly" id="isOfficeLoginOnly" type="checkbox" class="h-4 w-4 text-light-blue-600 cursor-pointer focus:ring-light-blue-500 border-gray-300 rounded-md">
                                 </div>
                                 <label for="isOfficeLoginOnly" class="ml-3 flex flex-col cursor-pointer">
                                     <span class="block text-sm font-medium text-gray-900 dark:text-gray-300">
@@ -29,7 +29,7 @@
                             @if ($user->id !== auth()->id())
                                 <div class="relative border rounded-tl-md rounded-tr-md p-4 flex border-gray-200">
                                     <div class="flex items-center h-5">
-                                        <input wire:model.live="isActive" id="isActive" type="checkbox" class="h-4 w-4 text-light-blue-600 cursor-pointer focus:ring-light-blue-500 border-gray-300" checked="">
+                                        <input wire:model="isActive" id="isActive" type="checkbox" class="h-4 w-4 text-light-blue-600 cursor-pointer focus:ring-light-blue-500 border-gray-300" checked="">
                                     </div>
                                     <label for="isActive" class="ml-3 flex flex-col cursor-pointer">
                                         <span class="block text-sm font-medium text-gray-900 dark:text-gray-300">
diff --git a/tests/Feature/Http/Controllers/Auth/AuthenticatedSessionControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/AuthenticatedSessionControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/AuthenticatedSessionControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/AuthenticatedSessionControllerTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/EmailVerificationNotificationControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/EmailVerificationNotificationControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/EmailVerificationNotificationControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/EmailVerificationNotificationControllerTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/EmailVerificationPromptControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/EmailVerificationPromptControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/EmailVerificationPromptControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/EmailVerificationPromptControllerTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/JoinControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/JoinControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/JoinControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/JoinControllerTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/NewPasswordControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/NewPasswordControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/NewPasswordControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/NewPasswordControllerTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/PasswordConfirmationTest.php b/tests/Feature/App/Http/Controllers/Auth/PasswordConfirmationTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/PasswordConfirmationTest.php
rename to tests/Feature/App/Http/Controllers/Auth/PasswordConfirmationTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/PasswordResetTest.php b/tests/Feature/App/Http/Controllers/Auth/PasswordResetTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/PasswordResetTest.php
rename to tests/Feature/App/Http/Controllers/Auth/PasswordResetTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/RegisteredUserControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/RegisteredUserControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/RegisteredUserControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/RegisteredUserControllerTest.php
diff --git a/tests/Feature/Http/Controllers/Auth/TwoFaControllerTest.php b/tests/Feature/App/Http/Controllers/Auth/TwoFaControllerTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/Auth/TwoFaControllerTest.php
rename to tests/Feature/App/Http/Controllers/Auth/TwoFaControllerTest.php
diff --git a/tests/Feature/Http/Controllers/WelcomeTest.php b/tests/Feature/App/Http/Controllers/WelcomeTest.php
similarity index 100%
rename from tests/Feature/Http/Controllers/WelcomeTest.php
rename to tests/Feature/App/Http/Controllers/WelcomeTest.php
diff --git a/tests/Feature/Http/Middleware/ActiveUserTest.php b/tests/Feature/App/Http/Middleware/ActiveUserTest.php
similarity index 100%
rename from tests/Feature/Http/Middleware/ActiveUserTest.php
rename to tests/Feature/App/Http/Middleware/ActiveUserTest.php
diff --git a/tests/Feature/Http/Middleware/AuthenticateTest.php b/tests/Feature/App/Http/Middleware/AuthenticateTest.php
similarity index 100%
rename from tests/Feature/Http/Middleware/AuthenticateTest.php
rename to tests/Feature/App/Http/Middleware/AuthenticateTest.php
diff --git a/tests/Feature/Http/Middleware/IpCheckMiddlewareTest.php b/tests/Feature/App/Http/Middleware/IpCheckMiddlewareTest.php
similarity index 100%
rename from tests/Feature/Http/Middleware/IpCheckMiddlewareTest.php
rename to tests/Feature/App/Http/Middleware/IpCheckMiddlewareTest.php
diff --git a/tests/Feature/Livewire/Admin/AuditTrailsTest.php b/tests/Feature/App/Livewire/Admin/AuditTrailsTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/AuditTrailsTest.php
rename to tests/Feature/App/Livewire/Admin/AuditTrailsTest.php
diff --git a/tests/Feature/Livewire/Admin/DashboardTest.php b/tests/Feature/App/Livewire/Admin/DashboardTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/DashboardTest.php
rename to tests/Feature/App/Livewire/Admin/DashboardTest.php
diff --git a/tests/Feature/Livewire/Admin/NotificationsMenuTest.php b/tests/Feature/App/Livewire/Admin/NotificationsMenuTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/NotificationsMenuTest.php
rename to tests/Feature/App/Livewire/Admin/NotificationsMenuTest.php
diff --git a/tests/Feature/Livewire/Admin/Roles/CreateTest.php b/tests/Feature/App/Livewire/Admin/Roles/CreateTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Roles/CreateTest.php
rename to tests/Feature/App/Livewire/Admin/Roles/CreateTest.php
diff --git a/tests/Feature/Livewire/Admin/Roles/EditTest.php b/tests/Feature/App/Livewire/Admin/Roles/EditTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Roles/EditTest.php
rename to tests/Feature/App/Livewire/Admin/Roles/EditTest.php
diff --git a/tests/Feature/Livewire/Admin/Roles/RolesTest.php b/tests/Feature/App/Livewire/Admin/Roles/RolesTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Roles/RolesTest.php
rename to tests/Feature/App/Livewire/Admin/Roles/RolesTest.php
diff --git a/tests/Feature/Livewire/Admin/Settings/ApplicationSettingsTest.php b/tests/Feature/App/Livewire/Admin/Settings/ApplicationSettingsTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Settings/ApplicationSettingsTest.php
rename to tests/Feature/App/Livewire/Admin/Settings/ApplicationSettingsTest.php
diff --git a/tests/Feature/Livewire/Admin/Settings/SecuritySettingsTest.php b/tests/Feature/App/Livewire/Admin/Settings/SecuritySettingsTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Settings/SecuritySettingsTest.php
rename to tests/Feature/App/Livewire/Admin/Settings/SecuritySettingsTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/ActivityTest.php b/tests/Feature/App/Livewire/Admin/Users/ActivityTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/ActivityTest.php
rename to tests/Feature/App/Livewire/Admin/Users/ActivityTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/Edit/AdminSettingsTest.php b/tests/Feature/App/Livewire/Admin/Users/Edit/AdminSettingsTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/Edit/AdminSettingsTest.php
rename to tests/Feature/App/Livewire/Admin/Users/Edit/AdminSettingsTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/Edit/ChangePasswordTest.php b/tests/Feature/App/Livewire/Admin/Users/Edit/ChangePasswordTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/Edit/ChangePasswordTest.php
rename to tests/Feature/App/Livewire/Admin/Users/Edit/ChangePasswordTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/Edit/ProfileTest.php b/tests/Feature/App/Livewire/Admin/Users/Edit/ProfileTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/Edit/ProfileTest.php
rename to tests/Feature/App/Livewire/Admin/Users/Edit/ProfileTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/Edit/RolesTest.php b/tests/Feature/App/Livewire/Admin/Users/Edit/RolesTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/Edit/RolesTest.php
rename to tests/Feature/App/Livewire/Admin/Users/Edit/RolesTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/Edit/TwoFaTest.php b/tests/Feature/App/Livewire/Admin/Users/Edit/TwoFaTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/Edit/TwoFaTest.php
rename to tests/Feature/App/Livewire/Admin/Users/Edit/TwoFaTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/EditUserTest.php b/tests/Feature/App/Livewire/Admin/Users/EditUserTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/EditUserTest.php
rename to tests/Feature/App/Livewire/Admin/Users/EditUserTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/InviteTest.php b/tests/Feature/App/Livewire/Admin/Users/InviteTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/InviteTest.php
rename to tests/Feature/App/Livewire/Admin/Users/InviteTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/ProfileTest.php b/tests/Feature/App/Livewire/Admin/Users/ProfileTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/ProfileTest.php
rename to tests/Feature/App/Livewire/Admin/Users/ProfileTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/ShowUserTest.php b/tests/Feature/App/Livewire/Admin/Users/ShowUserTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/ShowUserTest.php
rename to tests/Feature/App/Livewire/Admin/Users/ShowUserTest.php
diff --git a/tests/Feature/Livewire/Admin/Users/UsersTest.php b/tests/Feature/App/Livewire/Admin/Users/UsersTest.php
similarity index 100%
rename from tests/Feature/Livewire/Admin/Users/UsersTest.php
rename to tests/Feature/App/Livewire/Admin/Users/UsersTest.php
diff --git a/tests/Feature/Providers/AppServiceProviderTest.php b/tests/Feature/App/Providers/AppServiceProviderTest.php
similarity index 100%
rename from tests/Feature/Providers/AppServiceProviderTest.php
rename to tests/Feature/App/Providers/AppServiceProviderTest.php
diff --git a/tests/Unit/Commands/ClearLogCommandTest.php b/tests/Unit/App/Commands/ClearLogCommandTest.php
similarity index 100%
rename from tests/Unit/Commands/ClearLogCommandTest.php
rename to tests/Unit/App/Commands/ClearLogCommandTest.php
diff --git a/tests/Unit/App/Enums/CountryTest.php b/tests/Unit/App/Enums/CountryTest.php
new file mode 100644
index 0000000..4a1b083
--- /dev/null
+++ b/tests/Unit/App/Enums/CountryTest.php
@@ -0,0 +1,29 @@
+<?php
+
+use App\Enums\Country;
+
+test('Can get country', function () {
+    $country = Country::United_Kingdom;
+
+    expect($country)
+        ->name->toBe('United_Kingdom')
+        ->value->toBe('GB');
+});
+
+test('Can get country by name', function () {
+    $country = Country::United_Kingdom->name;
+
+    expect($country)->toBe('United_Kingdom');
+});
+
+test('Can get country by value', function () {
+    $country = Country::United_Kingdom->value;
+
+    expect($country)->toBe('GB');
+});
+
+test('label to include spaces', function () {
+    $country = Country::United_Kingdom;
+
+    expect($country->label())->toBe('United Kingdom');
+});
diff --git a/tests/Unit/Http/HelpersTest.php b/tests/Unit/App/Http/HelpersTest.php
similarity index 100%
rename from tests/Unit/Http/HelpersTest.php
rename to tests/Unit/App/Http/HelpersTest.php
diff --git a/tests/Unit/Http/HttpTest.php b/tests/Unit/App/Http/HttpTest.php
similarity index 100%
rename from tests/Unit/Http/HttpTest.php
rename to tests/Unit/App/Http/HttpTest.php
diff --git a/tests/Unit/Http/Requests/RegisterRequestTest.php b/tests/Unit/App/Http/Requests/RegisterRequestTest.php
similarity index 100%
rename from tests/Unit/Http/Requests/RegisterRequestTest.php
rename to tests/Unit/App/Http/Requests/RegisterRequestTest.php
diff --git a/tests/Unit/Http/Requests/TwoFa/TwoFaUpdateRequestTest.php b/tests/Unit/App/Http/Requests/TwoFa/TwoFaUpdateRequestTest.php
similarity index 100%
rename from tests/Unit/Http/Requests/TwoFa/TwoFaUpdateRequestTest.php
rename to tests/Unit/App/Http/Requests/TwoFa/TwoFaUpdateRequestTest.php
diff --git a/tests/Unit/Models/NotificationTest.php b/tests/Unit/App/Models/NotificationTest.php
similarity index 100%
rename from tests/Unit/Models/NotificationTest.php
rename to tests/Unit/App/Models/NotificationTest.php
diff --git a/tests/Unit/Models/UserTest.php b/tests/Unit/App/Models/UserTest.php
similarity index 100%
rename from tests/Unit/Models/UserTest.php
rename to tests/Unit/App/Models/UserTest.php
diff --git a/tests/Unit/BladeComponents/ButtonTest.php b/tests/Unit/resources/views/components/ButtonTest.php
similarity index 61%
rename from tests/Unit/BladeComponents/ButtonTest.php
rename to tests/Unit/resources/views/components/ButtonTest.php
index d375204..8ba5388 100644
--- a/tests/Unit/BladeComponents/ButtonTest.php
+++ b/tests/Unit/resources/views/components/ButtonTest.php
@@ -9,8 +9,3 @@
     test()->blade('<x-button type="button">Go</x-button>')
         ->assertSee('button type="button"', false);
 });
-
-test('can render button with class', function () {
-    test()->blade('<x-button class="btn btn-primary">Go</x-button>')
-        ->assertSee('button type="submit" class="btn btn-primary"', false);
-});
diff --git a/tests/Unit/BladeComponents/ModalTest.php b/tests/Unit/resources/views/components/ModalTest.php
similarity index 100%
rename from tests/Unit/BladeComponents/ModalTest.php
rename to tests/Unit/resources/views/components/ModalTest.php
diff --git a/tests/Unit/BladeComponents/TabTest.php b/tests/Unit/resources/views/components/TabTest.php
similarity index 100%
rename from tests/Unit/BladeComponents/TabTest.php
rename to tests/Unit/resources/views/components/TabTest.php
diff --git a/tests/Unit/BladeComponents/Form/CheckboxTest.php b/tests/Unit/resources/views/components/form/CheckboxTest.php
similarity index 100%
rename from tests/Unit/BladeComponents/Form/CheckboxTest.php
rename to tests/Unit/resources/views/components/form/CheckboxTest.php
diff --git a/tests/Unit/BladeComponents/Form/FormTest.php b/tests/Unit/resources/views/components/form/FormTest.php
similarity index 100%
rename from tests/Unit/BladeComponents/Form/FormTest.php
rename to tests/Unit/resources/views/components/form/FormTest.php