diff --git a/composer.json b/composer.json
index ba219bbe..d43ee55b 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SellingPartnerApi\\Tests\\": "test/"
+            "SellingPartnerApi\\Tests\\": "tests/"
         }
     },
     "scripts": {
diff --git a/tests/AuthenticationTest.php b/tests/AuthenticationTest.php
index e7269243..9acb32a3 100644
--- a/tests/AuthenticationTest.php
+++ b/tests/AuthenticationTest.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace SellingPartnerApi\Tests;
+
 use PHPUnit\Framework\TestCase;
 use Saloon\Config;
 use Saloon\Exceptions\Request\Statuses\UnauthorizedException;
diff --git a/tests/InMemoryTokenCacheTest.php b/tests/InMemoryTokenCacheTest.php
index 3ef7494c..cafd1a47 100644
--- a/tests/InMemoryTokenCacheTest.php
+++ b/tests/InMemoryTokenCacheTest.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace SellingPartnerApi\Tests;
+
 use PHPUnit\Framework\TestCase;
 use SellingPartnerApi\Authentication\AccessTokenAuthenticator;
 use SellingPartnerApi\Authentication\InMemoryTokenCache;
diff --git a/tests/OAuthTest.php b/tests/OAuthTest.php
index f76e4443..e382834b 100644
--- a/tests/OAuthTest.php
+++ b/tests/OAuthTest.php
@@ -1,5 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
+namespace SellingPartnerApi\Tests;
+
 use PHPUnit\Framework\TestCase;
 use Saloon\Http\Faking\MockClient;
 use Saloon\Http\Faking\MockResponse;
diff --git a/tests/Seller/FBAInboundV0/Requests/UpdateInboundShipmentTest.php b/tests/Seller/FBAInboundV0/Requests/UpdateInboundShipmentTest.php
index 8d9949f3..e32c3740 100644
--- a/tests/Seller/FBAInboundV0/Requests/UpdateInboundShipmentTest.php
+++ b/tests/Seller/FBAInboundV0/Requests/UpdateInboundShipmentTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Seller\FBAInboundV0\Requests;
+declare(strict_types=1);
+
+namespace SellingPartnerApi\Tests\Seller\FBAInboundV0\Requests;
 
 use DateTime;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Seller/FBAInboundV20240320/Responses/ListDeliveryWindowOptionsTest.php b/tests/Seller/FBAInboundV20240320/Responses/ListDeliveryWindowOptionsTest.php
index 164fe2d4..cffec186 100644
--- a/tests/Seller/FBAInboundV20240320/Responses/ListDeliveryWindowOptionsTest.php
+++ b/tests/Seller/FBAInboundV20240320/Responses/ListDeliveryWindowOptionsTest.php
@@ -9,7 +9,7 @@
 
 class ListDeliveryWindowOptionsTest extends TestCase
 {
-    function testDeserializeDateTimeWithoutSeconds(): void
+    public function testDeserializeDateTimeWithoutSeconds(): void
     {
         $now = new DateTime();
         $result = ListDeliveryWindowOptionsResponse::deserialize([
@@ -23,7 +23,7 @@ function testDeserializeDateTimeWithoutSeconds(): void
                     'validUntil' => '2024-09-24T00:00Z',
                     'deliveryWindowOptionId' => 'dwf5ab76c1-ed8a-4885-beb6-3a9992b6954e',
                     'startDate' => $now->format('Y-m-d\TH:i\Z'),
-                ]
+                ],
             ],
         ]);
         $this->assertNotNull($result);
@@ -32,4 +32,4 @@ function testDeserializeDateTimeWithoutSeconds(): void
         // of the original datetime
         $this->assertEqualsWithDelta($now->getTimestamp(), $result->deliveryWindowOptions[0]->startDate->getTimestamp(), 60);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Seller/ReportsV20210630/Responses/ReportTest.php b/tests/Seller/ReportsV20210630/Responses/ReportTest.php
index c17ed986..6b8f719b 100644
--- a/tests/Seller/ReportsV20210630/Responses/ReportTest.php
+++ b/tests/Seller/ReportsV20210630/Responses/ReportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Seller\ReportsV20210630\Responses;
+namespace SellingPartnerApi\Tests\Seller\ReportsV20210630\Responses;
 
 use DateTime;
 use DateTimeInterface;
diff --git a/tests/Seller/ShippingV2/Requests/GetTrackingTest.php b/tests/Seller/ShippingV2/Requests/GetTrackingTest.php
index 9b2a9191..af23cb27 100644
--- a/tests/Seller/ShippingV2/Requests/GetTrackingTest.php
+++ b/tests/Seller/ShippingV2/Requests/GetTrackingTest.php
@@ -1,5 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
+namespace SellingPartnerApi\Tests\Seller\ShippingV2\Requests;
+
 use PHPUnit\Framework\TestCase;
 use Saloon\Config;
 use Saloon\Http\Faking\MockClient;
diff --git a/tests/SerializationTest.php b/tests/SerializationTest.php
index e25cbb18..c9eeeef5 100644
--- a/tests/SerializationTest.php
+++ b/tests/SerializationTest.php
@@ -13,7 +13,6 @@
 use SellingPartnerApi\Seller\OrdersV0\Dto\ConfirmShipmentRequest;
 use SellingPartnerApi\Seller\OrdersV0\Dto\PackageDetail;
 use SellingPartnerApi\Seller\OrdersV0\Requests\ConfirmShipment;
-use SellingPartnerApi\Seller\ProductFeesV0\Responses\GetMyFeesEstimateResponse;
 use SellingPartnerApi\Seller\ProductPricingV0\Dto\GetItemOffersBatchRequest;
 use SellingPartnerApi\Seller\ProductPricingV0\Dto\ItemOffersRequest;
 use SellingPartnerApi\Seller\ProductPricingV0\Requests\GetItemOffersBatch;
diff --git a/tests/TokenCacheTest.php b/tests/TokenCacheTest.php
index ca91495b..d9a0ab28 100644
--- a/tests/TokenCacheTest.php
+++ b/tests/TokenCacheTest.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace SellingPartnerApi\Tests;
+
 use PHPUnit\Framework\TestCase;
 use Saloon\Config;
 use Saloon\Http\Faking\MockClient;