diff --git a/.gitignore b/.gitignore
index b79cb17..17b77ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ report/
 .idea/
 composer.lock
 *.swp
-.phpunit.result.cache
\ No newline at end of file
+.phpunit.result.cache
+.projections.json
diff --git a/.travis.yml b/.travis.yml
index 9d5360f..2f5e1e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ language: php
 php:
   - '7.4'
   - '8.0'
+  - '8.1'
+  - '8.2'
 
 notifications:
   email:
diff --git a/composer.json b/composer.json
index 4cfccc3..262bfab 100644
--- a/composer.json
+++ b/composer.json
@@ -5,13 +5,13 @@
     "license": "MIT",
     "type": "library",
     "require": {
-        "php": ">=7.4.0 || >= 8.0.0",
-        "illuminate/auth": "^7.0 || ^8.0 || ^9.0",
-        "illuminate/config": "^7.0 || ^8.0 || ^9.0",
-        "illuminate/console": "^7.0 || ^8.0 || ^9.0",
-        "illuminate/contracts": "^7.0 || ^8.0 || ^9.0",
-        "illuminate/support": "^7.0 || ^8.0 || ^9.0",
-        "illuminate/cache": "^7.0 || ^8.0 || ^9.0",
+        "php": ">=7.4.0",
+        "illuminate/auth": ">=7.0",
+        "illuminate/config": ">=7.0",
+        "illuminate/console": ">=7.0",
+        "illuminate/contracts": ">=7.0",
+        "illuminate/support": ">=7.0",
+        "illuminate/cache": ">=7.0",
         "lcobucci/jwt": "^4.0",
         "nesbot/carbon": "^2.0",
         "vlucas/phpdotenv": "^4.0 || ^5.2"
@@ -38,6 +38,9 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": false
+        }
     }
 }
diff --git a/tests/Unit/JWTGuardTest.php b/tests/Unit/Auth/JWTGuardTest.php
similarity index 99%
rename from tests/Unit/JWTGuardTest.php
rename to tests/Unit/Auth/JWTGuardTest.php
index b096795..c66360f 100644
--- a/tests/Unit/JWTGuardTest.php
+++ b/tests/Unit/Auth/JWTGuardTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\Auth;
 
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Auth\Events\Attempting;
@@ -22,7 +22,6 @@
 use SPie\LaravelJWT\Contracts\TokenBlockList;
 use SPie\LaravelJWT\Contracts\TokenProvider;
 use SPie\LaravelJWT\Exceptions\InvalidTokenException;
-use SPie\LaravelJWT\Contracts\JWT;
 use SPie\LaravelJWT\Contracts\JWTHandler;
 use SPie\LaravelJWT\Test\HttpHelper;
 use SPie\LaravelJWT\Test\JWTHelper;
diff --git a/tests/Unit/CacheTokenBlockListTest.php b/tests/Unit/BlockList/CacheTokenBlockListTest.php
similarity index 98%
rename from tests/Unit/CacheTokenBlockListTest.php
rename to tests/Unit/BlockList/CacheTokenBlockListTest.php
index 23d1e1e..70f93f8 100644
--- a/tests/Unit/CacheTokenBlockListTest.php
+++ b/tests/Unit/BlockList/CacheTokenBlockListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\BlockList;
 
 use Illuminate\Cache\Repository;
 use Mockery;
diff --git a/tests/Unit/EventFactoryTest.php b/tests/Unit/Events/EventFactoryTest.php
similarity index 97%
rename from tests/Unit/EventFactoryTest.php
rename to tests/Unit/Events/EventFactoryTest.php
index f3eb391..02c1c19 100644
--- a/tests/Unit/EventFactoryTest.php
+++ b/tests/Unit/Events/EventFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\Events;
 
 use Illuminate\Auth\Events\Attempting;
 use Illuminate\Auth\Events\Failed;
diff --git a/tests/Unit/JWTTokensTest.php b/tests/Unit/Middleware/JWTTokensTest.php
similarity index 94%
rename from tests/Unit/JWTTokensTest.php
rename to tests/Unit/Middleware/JWTTokensTest.php
index bf50303..055555b 100644
--- a/tests/Unit/JWTTokensTest.php
+++ b/tests/Unit/Middleware/JWTTokensTest.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\Middleware;
 
-use Illuminate\Auth\AuthenticationException;
 use PHPUnit\Framework\TestCase;
 use SPie\LaravelJWT\Contracts\JWTGuard;
 use SPie\LaravelJWT\Middleware\JWTTokens;
diff --git a/tests/Unit/LaravelServiceProviderTest.php b/tests/Unit/Providers/LaravelServiceProviderTest.php
similarity index 99%
rename from tests/Unit/LaravelServiceProviderTest.php
rename to tests/Unit/Providers/LaravelServiceProviderTest.php
index ff9d52c..21845ae 100644
--- a/tests/Unit/LaravelServiceProviderTest.php
+++ b/tests/Unit/Providers/LaravelServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\Providers;
 
 use Illuminate\Auth\AuthManager;
 use Illuminate\Config\Repository;
diff --git a/tests/Unit/LumenServiceProviderTest.php b/tests/Unit/Providers/LumenServiceProviderTest.php
similarity index 98%
rename from tests/Unit/LumenServiceProviderTest.php
rename to tests/Unit/Providers/LumenServiceProviderTest.php
index 78555d0..5f7c5e2 100644
--- a/tests/Unit/LumenServiceProviderTest.php
+++ b/tests/Unit/Providers/LumenServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\Providers;
 
 use Illuminate\Auth\AuthManager;
 use Illuminate\Config\Repository;
diff --git a/tests/Unit/RegistrarTest.php b/tests/Unit/Providers/RegistrarTest.php
similarity index 99%
rename from tests/Unit/RegistrarTest.php
rename to tests/Unit/Providers/RegistrarTest.php
index 61a5b81..98afd90 100644
--- a/tests/Unit/RegistrarTest.php
+++ b/tests/Unit/Providers/RegistrarTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\Providers;
 
 use Illuminate\Auth\AuthManager;
 use Illuminate\Contracts\Auth\UserProvider;
diff --git a/tests/Unit/CookieTokenProviderTest.php b/tests/Unit/TokenProvider/CookieTokenProviderTest.php
similarity index 98%
rename from tests/Unit/CookieTokenProviderTest.php
rename to tests/Unit/TokenProvider/CookieTokenProviderTest.php
index f068828..0f22fc8 100644
--- a/tests/Unit/CookieTokenProviderTest.php
+++ b/tests/Unit/TokenProvider/CookieTokenProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\TokenProvider;
 
 use Illuminate\Contracts\Cookie\Factory;
 use Illuminate\Http\Request;
diff --git a/tests/Unit/HeaderTokenProviderTest.php b/tests/Unit/TokenProvider/HeaderTokenProviderTest.php
similarity index 97%
rename from tests/Unit/HeaderTokenProviderTest.php
rename to tests/Unit/TokenProvider/HeaderTokenProviderTest.php
index caa6783..ff7c8f8 100644
--- a/tests/Unit/HeaderTokenProviderTest.php
+++ b/tests/Unit/TokenProvider/HeaderTokenProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\TokenProvider;
 
 use Illuminate\Http\Request;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Unit/JsonTokenProviderTest.php b/tests/Unit/TokenProvider/JsonTokenProviderTest.php
similarity index 97%
rename from tests/Unit/JsonTokenProviderTest.php
rename to tests/Unit/TokenProvider/JsonTokenProviderTest.php
index 26e9e87..45074c3 100644
--- a/tests/Unit/JsonTokenProviderTest.php
+++ b/tests/Unit/TokenProvider/JsonTokenProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SPie\LaravelJWT\Test\Unit;
+namespace SPie\LaravelJWT\Test\Unit\TokenProvider;
 
 use Illuminate\Http\Request;
 use PHPUnit\Framework\TestCase;