diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 81e5441..4ccd1e1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,25 +9,18 @@ on:
 jobs:
   linux_tests:
     runs-on: ubuntu-20.04
+
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', '8.1']
-        laravel: ['9.*', '10.*']
+        php: ['8.2']
+        laravel: ['11.*']
+        testbench: ['9.*']
         stability: [prefer-lowest, prefer-stable]
-        exclude:
-          - laravel: '10.*'
-            php: '8.0'
         include:
-          - laravel: '9.*'
-            testbench: '7.*'
-          - laravel: '10.*'
-            testbench: '8.*'
-          - php: '8.1'
-            laravel: '10.*'
-            testbench: '8.*'
-            stability: 'prefer-stable'
-            coverage: '☂ '
+          - laravel: 11.*
+            stability: prefer-stable
+            coverage: ☂ 
 
     name: ${{ matrix.coverage }}PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} - Ubuntu 20.04
 
@@ -42,7 +35,7 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl
           tools: composer:v2
           coverage: xdebug
-          
+
       - name: Set Laravel and Testbench versions
         uses: nick-invision/retry@v1
         with:
@@ -59,13 +52,13 @@ jobs:
 
       - name: Execute tests
         continue-on-error: false
-        run: vendor/bin/phpunit --verbose
-        if: ${{ !matrix.coverage }}
+        run: vendor/bin/phpunit
+        if: '${{ !matrix.coverage }}'
 
       - name: Execute tests with coverage
         continue-on-error: false
-        run: vendor/bin/phpunit --verbose --coverage-clover coverage.xml
-        if: ${{ matrix.coverage }}
+        run: vendor/bin/phpunit --coverage-clover coverage.xml
+        if: '${{ matrix.coverage }}'
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -74,5 +67,4 @@ jobs:
           files: ./coverage.xml
           path_to_write_report: ./coverage/codecov_report.txt
           verbose: true
-        if: ${{ matrix.coverage }}
-
+        if: '${{ matrix.coverage }}'
diff --git a/composer.json b/composer.json
index b81ca6e..84bf00d 100644
--- a/composer.json
+++ b/composer.json
@@ -11,20 +11,28 @@
     ],
     "homepage": "https://github.com/evryn/laravel-toman",
     "keywords": [
-        "zarinpal", "زرین پال",
-        "idpay", "آیدی پی",
-        "laravel", "laraveltoman", "laravel-toman",
-        "toman", "payment", "gateway", "درگاه", "پرداخت"
+        "zarinpal",
+        "زرین پال",
+        "idpay",
+        "آیدی پی",
+        "laravel",
+        "laraveltoman",
+        "laravel-toman",
+        "toman",
+        "payment",
+        "gateway",
+        "درگاه",
+        "پرداخت"
     ],
     "require": {
-        "php": "^8.0|^8.1",
-        "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^9.0|^10.0"
+        "php": "^8.2",
+        "guzzlehttp/guzzle": "^7.8",
+        "laravel/framework": "^11.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.0",
-        "mockery/mockery": "^1.3.3",
-        "orchestra/testbench": "^7.0|^8.0",
+        "phpunit/phpunit": "^10.5|^11.0",
+        "mockery/mockery": "^1.6",
+        "orchestra/testbench": "^9.0",
         "sempro/phpunit-pretty-print": "^1.0"
     },
     "autoload": {
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
index 8656db0..40aa0cb 100644
--- a/docs/_coverpage.md
+++ b/docs/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](_media/logo.png)
 
-# Laravel Toman <small>3.0</small>
+# Laravel Toman <small>4.0</small>
 
 > A painless payment handler!
 
diff --git a/docs/fa/_coverpage.md b/docs/fa/_coverpage.md
index e31c4bb..9a5e832 100644
--- a/docs/fa/_coverpage.md
+++ b/docs/fa/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](../_media/logo.png)
 
-# لاراول تومَن <small>3.0</small>
+# لاراول تومَن <small>4.0</small>
 
 > درگاه پرداخت - مثل آب خوردن!
 
diff --git a/docs/fa/getting-started.md b/docs/fa/getting-started.md
index 2305e47..bc349ec 100644
--- a/docs/fa/getting-started.md
+++ b/docs/fa/getting-started.md
@@ -4,7 +4,8 @@
 
 | پکیج | فریم‌ورک Laravel | PHP  | وضعیت |
 | ------------- |:-------------:|:-----:| ---:|
-| &lrm;3.\*      | &lrm;10.\*, &lrm;9.\* | &lrm;>= 8.0 | فعال 🚀 |
+| &lrm;4.\*      | &lrm;11.\* | &lrm;>= 8.2 | فعال 🚀 |
+| &lrm;3.\*      | &lrm;10.\*, &lrm;9.\* | &lrm;>= 8.0 |  |
 | &lrm;2.\*      | &lrm;9.\*, &lrm;8.\*, &lrm;7.\* | &lrm;>= 7.3 | |
 | &lrm;1.\*      | &lrm;6.\*, &lrm;5.8.\*       |   &lrm;>= 7.2 |  |
 
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 3834412..8d09a57 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -4,7 +4,8 @@
 
 | Package | Laravel Framework | PHP  | Status |
 | ------------- |:-------------:|:-----:| ---:|
-| 3.\*      | 10.\*, 9.\* | >= 8.0 | Active 🚀 |
+| 4.\*      | 11.\* | >= 8.2 | Active 🚀 |
+| 3.\*      | 10.\*, 9.\* | >= 8.0 | |
 | 2.\*      | 9.\*, 8.\*, 7.\* | >= 7.3 | |
 | 1.\*      | 6.\*, 5.8.\*       |   >= 7.2 |  |
 
diff --git a/docs/index.html b/docs/index.html
index 944b81c..1e4c0a9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -55,7 +55,7 @@
       loadNavbar: true,
       fallbackLanguages: ['fa'],
       coverpage: ['/', '/fa/'],
-      name: 'Laravel Toman<small>2.0</small>',
+      name: 'Laravel Toman',
       repo: 'https://github.com/evryn/laravel-toman/',
       alias: {
         '/CHANGELOG': 'https://raw.githubusercontent.com/evryn/laravel-toman/master/CHANGELOG.md',
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f83f8af..663630e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Evryn LaravelToman Test Suit">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Facades">
+      <directory>tests/Facades</directory>
+    </testsuite>
+    <testsuite name="Gateways">
+      <directory>tests/Gateways</directory>
+    </testsuite>
+    <testsuite name="Misc">
+      <directory>tests/Misc</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory>src/</directory>
+    </include>
+  </source>
+</phpunit>
\ No newline at end of file
diff --git a/src/PendingRequest.php b/src/PendingRequest.php
index d39a3d6..5619783 100644
--- a/src/PendingRequest.php
+++ b/src/PendingRequest.php
@@ -93,7 +93,7 @@ public function provideForGateway(array $fields): Collection
                 $value = $this->provideAmount();
             }
 
-            return [$this->getFieldNameForGateway($field) =>  $value];
+            return [$this->getFieldNameForGateway($field) => $value];
         })->merge($this->customData);
     }
 
diff --git a/tests/Gateways/IDPay/Provider.php b/tests/Gateways/IDPay/Provider.php
index 4d1a799..ffbb071 100644
--- a/tests/Gateways/IDPay/Provider.php
+++ b/tests/Gateways/IDPay/Provider.php
@@ -4,8 +4,9 @@
 
 use Evryn\LaravelToman\Gateways\IDPay\Status;
 use Evryn\LaravelToman\Money;
+use Evryn\LaravelToman\Tests\TestCase;
 
-class Provider
+final class Provider extends TestCase
 {
     public static function endpointProvider()
     {
diff --git a/tests/Gateways/Zarinpal/Provider.php b/tests/Gateways/Zarinpal/Provider.php
index 4becac9..3c200ca 100644
--- a/tests/Gateways/Zarinpal/Provider.php
+++ b/tests/Gateways/Zarinpal/Provider.php
@@ -4,8 +4,9 @@
 
 use Evryn\LaravelToman\Gateways\Zarinpal\Status;
 use Evryn\LaravelToman\Money;
+use Evryn\LaravelToman\Tests\TestCase;
 
-class Provider
+final class Provider extends TestCase
 {
     public static function endpointProvider()
     {
@@ -15,7 +16,7 @@ public static function endpointProvider()
         ];
     }
 
-    public function clientErrorProvider()
+    public static function clientErrorProvider()
     {
         return [
             [200, Status::INCOMPLETE_DATA, 'incomplete_data'], // 404 HTTP code is not guaranteed for errors
diff --git a/tests/CallbackRequestTest.php b/tests/Misc/CallbackRequestTest.php
similarity index 96%
rename from tests/CallbackRequestTest.php
rename to tests/Misc/CallbackRequestTest.php
index de91c67..38beccd 100644
--- a/tests/CallbackRequestTest.php
+++ b/tests/Misc/CallbackRequestTest.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Evryn\LaravelToman\Tests;
+namespace Evryn\LaravelToman\Tests\Misc;
 
 use Evryn\LaravelToman\CallbackRequest;
 use Evryn\LaravelToman\Facades\Toman;
 use Evryn\LaravelToman\Gateways\IDPay\Gateway as IDPayGateway;
 use Evryn\LaravelToman\Gateways\Zarinpal\Gateway as ZarinpalGateway;
 use Evryn\LaravelToman\PendingRequest;
+use Evryn\LaravelToman\Tests\TestCase;
 
 final class CallbackRequestTest extends TestCase
 {
diff --git a/tests/LaravelTomanServiceProviderTest.php b/tests/Misc/LaravelTomanServiceProviderTest.php
similarity index 78%
rename from tests/LaravelTomanServiceProviderTest.php
rename to tests/Misc/LaravelTomanServiceProviderTest.php
index 88114c4..6a69dec 100644
--- a/tests/LaravelTomanServiceProviderTest.php
+++ b/tests/Misc/LaravelTomanServiceProviderTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Evryn\LaravelToman\Tests;
+namespace Evryn\LaravelToman\Tests\Misc;
 
+use Evryn\LaravelToman\Tests\TestCase;
 use Illuminate\Support\Facades\File;
 
 final class LaravelTomanServiceProviderTest extends TestCase
@@ -11,7 +12,7 @@ public function publishes_config_correctly()
     {
         // We need to ensure that artisan can publish `toman.php` config file properly
 
-        $source = __DIR__.'/../config/toman.php';
+        $source = __DIR__.'/../../config/toman.php';
         $dest = config_path('toman.php');
 
         File::delete($dest);
@@ -32,8 +33,8 @@ public function publishes_translations_correctly()
         // We need to ensure that artisan can publish default translations files properly
 
         $map = [
-            __DIR__.'/../resources/lang/en/zarinpal.php' => resource_path('lang/vendor/toman/en/zarinpal.php'),
-            __DIR__.'/../resources/lang/fa/zarinpal.php' => resource_path('lang/vendor/toman/fa/zarinpal.php'),
+            __DIR__.'/../../resources/lang/en/zarinpal.php' => resource_path('lang/vendor/toman/en/zarinpal.php'),
+            __DIR__.'/../../resources/lang/fa/zarinpal.php' => resource_path('lang/vendor/toman/fa/zarinpal.php'),
         ];
 
         foreach (array_values($map) as $dest) {