diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index cc243ef..eaeafa7 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -4,8 +4,10 @@
 use PhpCsFixer\Finder;
 
 $rules = [
-    '@PSR2' => true,
-    '@PSR12' => true,
+    '@PER-CS2.0' => true,
+    '@PER-CS2.0:risky' => true,
+    'declare_strict_types' => true,
+    'strict_param' => true,
     'array_syntax' => [
         'syntax' => 'short',
     ],
diff --git a/src/BasicShopifyAPI.php b/src/BasicShopifyAPI.php
index f909183..b00223c 100755
--- a/src/BasicShopifyAPI.php
+++ b/src/BasicShopifyAPI.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 use Closure;
@@ -377,7 +379,7 @@ public function verifyRequest(array $params): bool
                     $value = '["'.implode('", "', $value).'"]';
                 }
             }
-            
+
             ksort($params);
 
             // Encode and hash the params (without HMAC), add the API secret, and compare to the HMAC from params
diff --git a/src/Clients/AbstractClient.php b/src/Clients/AbstractClient.php
index 79bc4ec..4276c16 100644
--- a/src/Clients/AbstractClient.php
+++ b/src/Clients/AbstractClient.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Clients;
 
 use Exception;
diff --git a/src/Clients/Graph.php b/src/Clients/Graph.php
index 7afdb48..ebefb7a 100644
--- a/src/Clients/Graph.php
+++ b/src/Clients/Graph.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Clients;
 
 use Gnikyt\BasicShopifyAPI\Contracts\GraphRequester;
diff --git a/src/Clients/Rest.php b/src/Clients/Rest.php
index bc24d01..2afd6f5 100644
--- a/src/Clients/Rest.php
+++ b/src/Clients/Rest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Clients;
 
 use Exception;
@@ -112,7 +114,7 @@ public function request(string $type, string $path, ?array $params = null, array
         $guzzleParams = [];
         if ($params !== null) {
             $keys = array_keys($params);
-            if (isset($keys[0]) && in_array($keys[0], ['query', 'json'])) {
+            if (isset($keys[0]) && in_array($keys[0], ['query', 'json'], true)) {
                 // Inputted type
                 $guzzleParams = $params;
             } else {
diff --git a/src/Contracts/ClientAware.php b/src/Contracts/ClientAware.php
index 2a586fd..705d0ed 100644
--- a/src/Contracts/ClientAware.php
+++ b/src/Contracts/ClientAware.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\Options;
diff --git a/src/Contracts/GraphRequester.php b/src/Contracts/GraphRequester.php
index c819c4e..cdb4890 100644
--- a/src/Contracts/GraphRequester.php
+++ b/src/Contracts/GraphRequester.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use GuzzleHttp\Promise\Promise;
diff --git a/src/Contracts/LimitAccesser.php b/src/Contracts/LimitAccesser.php
index 18407fe..8e59647 100644
--- a/src/Contracts/LimitAccesser.php
+++ b/src/Contracts/LimitAccesser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 /**
diff --git a/src/Contracts/Respondable.php b/src/Contracts/Respondable.php
index 0465415..5059316 100644
--- a/src/Contracts/Respondable.php
+++ b/src/Contracts/Respondable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;
diff --git a/src/Contracts/RestRequester.php b/src/Contracts/RestRequester.php
index da081dc..8b9c461 100644
--- a/src/Contracts/RestRequester.php
+++ b/src/Contracts/RestRequester.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Exception;
diff --git a/src/Contracts/SessionAware.php b/src/Contracts/SessionAware.php
index 258604c..2afc69d 100644
--- a/src/Contracts/SessionAware.php
+++ b/src/Contracts/SessionAware.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\Session;
diff --git a/src/Contracts/StateStorage.php b/src/Contracts/StateStorage.php
index dff1170..f82fa16 100644
--- a/src/Contracts/StateStorage.php
+++ b/src/Contracts/StateStorage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\Session;
diff --git a/src/Contracts/TimeAccesser.php b/src/Contracts/TimeAccesser.php
index 7673aaa..b755ea6 100644
--- a/src/Contracts/TimeAccesser.php
+++ b/src/Contracts/TimeAccesser.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 /**
diff --git a/src/Contracts/TimeDeferrer.php b/src/Contracts/TimeDeferrer.php
index 6e818cb..cd35f18 100644
--- a/src/Contracts/TimeDeferrer.php
+++ b/src/Contracts/TimeDeferrer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 /**
diff --git a/src/Deferrers/Sleep.php b/src/Deferrers/Sleep.php
index 7caed8a..510d4f7 100644
--- a/src/Deferrers/Sleep.php
+++ b/src/Deferrers/Sleep.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Deferrers;
 
 use Gnikyt\BasicShopifyAPI\Contracts\TimeDeferrer;
diff --git a/src/Middleware/AbstractMiddleware.php b/src/Middleware/AbstractMiddleware.php
index b27e500..c9db004 100644
--- a/src/Middleware/AbstractMiddleware.php
+++ b/src/Middleware/AbstractMiddleware.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
diff --git a/src/Middleware/AuthRequest.php b/src/Middleware/AuthRequest.php
index ae7ee0c..22fcb12 100644
--- a/src/Middleware/AuthRequest.php
+++ b/src/Middleware/AuthRequest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Exception;
@@ -7,6 +9,7 @@
 use Gnikyt\BasicShopifyAPI\Options;
 use Gnikyt\BasicShopifyAPI\Traits\IsRequestType;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Ensures we have the proper request for private and public calls.
@@ -38,8 +41,8 @@ public function __invoke(callable $handler): callable
             $apiPassword = $self->api->getOptions()->getApiPassword();
             $accessToken = $self->api->getSession()->getAccessToken();
 
-            if ($self->isAuthableRequest((string) $uri)) {
-                if ($self->isRestRequest((string) $uri)) {
+            if ($self->isAuthableRequest($uri)) {
+                if ($self->isRestRequest($uri)) {
                     // Checks for REST
                     if ($isPrivate && ($apiKey === null || $apiPassword === null)) {
                         // Key and password are required for private API calls
@@ -50,7 +53,7 @@ public function __invoke(callable $handler): callable
                         // Private: Add auth for REST calls, add the basic auth header
                         $request = $request->withHeader(
                             'Authorization',
-                            'Basic '.base64_encode("{$apiKey}:{$apiPassword}")
+                            'Basic ' . base64_encode("{$apiKey}:{$apiPassword}")
                         );
                     } else {
                         // Public: Add the token header
@@ -78,7 +81,7 @@ public function __invoke(callable $handler): callable
             $uri = $request->getUri();
             $request = $request->withUri(
                 $uri->withPath(
-                    $this->versionPath($uri->getPath())
+                    $this->versionPath($uri)
                 )
             );
 
@@ -88,53 +91,42 @@ public function __invoke(callable $handler): callable
 
     /**
      * Determines if the request requires auth headers.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isAuthableRequest(string $uri): bool
+    protected function isAuthableRequest(UriInterface $uri): bool
     {
-        return preg_match('/\/admin\/oauth\/(authorize|access_token)/', $uri) === 0;
+        return preg_match('/\/admin\/oauth\/(authorize|access_token)/', $uri->getPath()) === 0;
     }
 
     /**
      * Versions the API call with the set version.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return string
      */
-    protected function versionPath(string $uri): string
+    protected function versionPath(UriInterface $uri): string
     {
         $version = $this->api->getOptions()->getVersion();
-        if ($version === null ||
-            preg_match(Options::VERSION_PATTERN, $uri) ||
-            !$this->isAuthableRequest($uri) ||
-            !$this->isVersionableRequest($uri)
+        if (
+            $version === null
+            || preg_match(Options::VERSION_PATTERN, $uri->getPath())
+            || !$this->isAuthableRequest($uri)
+            || !$this->isVersionableRequest($uri)
         ) {
             // No version set, or already versioned... nothing to do
-            return $uri;
+            return $uri->getPath();
         }
 
         // Graph request
         if ($this->isGraphRequest($uri)) {
-            return str_replace('/admin/api', "/admin/api/{$version}", $uri);
+            return preg_replace('/\/admin(\/api)?\//', "/admin/api/{$version}/", $uri->getPath());
         }
 
         // REST request
-        return preg_replace('/\/admin(\/api)?\//', "/admin/api/{$version}/", $uri);
+        return preg_replace('/\/admin(\/api)?\//', "/admin/api/{$version}/", $uri->getPath());
     }
 
     /**
      * Determines if the request requires versioning.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isVersionableRequest(string $uri): bool
+    protected function isVersionableRequest(UriInterface $uri): bool
     {
-        return preg_match('/\/admin\/(oauth\/access_scopes)/', $uri) === 0;
+        return preg_match('/\/admin\/(oauth\/access_scopes)/', $uri->getPath()) === 0;
     }
 }
diff --git a/src/Middleware/RateLimiting.php b/src/Middleware/RateLimiting.php
index 55af020..2d69692 100644
--- a/src/Middleware/RateLimiting.php
+++ b/src/Middleware/RateLimiting.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
diff --git a/src/Middleware/UpdateApiLimits.php b/src/Middleware/UpdateApiLimits.php
index 851db4c..6c8a539 100644
--- a/src/Middleware/UpdateApiLimits.php
+++ b/src/Middleware/UpdateApiLimits.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
diff --git a/src/Middleware/UpdateRequestTime.php b/src/Middleware/UpdateRequestTime.php
index 7b7c485..b839f9a 100644
--- a/src/Middleware/UpdateRequestTime.php
+++ b/src/Middleware/UpdateRequestTime.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\Traits\IsRequestType;
diff --git a/src/Options.php b/src/Options.php
index 65ea389..577c9b5 100644
--- a/src/Options.php
+++ b/src/Options.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 use Exception;
diff --git a/src/ResponseAccess.php b/src/ResponseAccess.php
index a820a4e..9110b65 100644
--- a/src/ResponseAccess.php
+++ b/src/ResponseAccess.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 use ArrayAccess;
diff --git a/src/Session.php b/src/Session.php
index 4e74d6b..52dee4a 100644
--- a/src/Session.php
+++ b/src/Session.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 /**
diff --git a/src/Store/Memory.php b/src/Store/Memory.php
index 1da3324..13d9bfe 100644
--- a/src/Store/Memory.php
+++ b/src/Store/Memory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Store;
 
 use Gnikyt\BasicShopifyAPI\Contracts\StateStorage;
diff --git a/src/Traits/IsRequestType.php b/src/Traits/IsRequestType.php
index 59d1153..1eae30b 100644
--- a/src/Traits/IsRequestType.php
+++ b/src/Traits/IsRequestType.php
@@ -1,7 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Traits;
 
+use Psr\Http\Message\UriInterface;
+
 /**
  * Determine GraphQL or REST request type.
  */
@@ -9,24 +13,16 @@ trait IsRequestType
 {
     /**
      * Determines if the request is to Graph API.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isGraphRequest(string $uri): bool
+    protected function isGraphRequest(UriInterface $uri): bool
     {
-        return strpos($uri, 'graphql.json') !== false;
+        return strpos($uri->getPath(), 'graphql.json') !== false;
     }
 
     /**
      * Determines if the request is to REST API.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isRestRequest(string $uri): bool
+    protected function isRestRequest(UriInterface $uri): bool
     {
         return $this->isGraphRequest($uri) === false;
     }
diff --git a/src/Traits/IsResponseType.php b/src/Traits/IsResponseType.php
index c715104..47abf8a 100644
--- a/src/Traits/IsResponseType.php
+++ b/src/Traits/IsResponseType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Traits;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
diff --git a/src/Traits/ResponseTransform.php b/src/Traits/ResponseTransform.php
index 2147380..b08690a 100644
--- a/src/Traits/ResponseTransform.php
+++ b/src/Traits/ResponseTransform.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Traits;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;
@@ -15,8 +17,11 @@ trait ResponseTransform
      */
     public function toResponse(StreamInterface $body): ResponseAccess
     {
-        $decoded = json_decode($body, true, 512, JSON_BIGINT_AS_STRING);
-
+        $decoded = json_decode(
+            json: (string) $body,
+            associative: true,
+            flags: JSON_BIGINT_AS_STRING
+        );
         return new ResponseAccess($decoded);
     }
 }
diff --git a/test/BaseTest.php b/test/BaseTest.php
index aeb35db..ef455c7 100644
--- a/test/BaseTest.php
+++ b/test/BaseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test;
 
 use Closure;
diff --git a/test/BasicShopifyAPITest.php b/test/BasicShopifyAPITest.php
index 9e383a9..ff7fd3e 100644
--- a/test/BasicShopifyAPITest.php
+++ b/test/BasicShopifyAPITest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test;
 
 use Exception;
diff --git a/test/Clients/GraphTest.php b/test/Clients/GraphTest.php
index 5f72b22..8d58baf 100644
--- a/test/Clients/GraphTest.php
+++ b/test/Clients/GraphTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Clients;
 
 use Gnikyt\BasicShopifyAPI\Options;
diff --git a/test/Clients/RestTest.php b/test/Clients/RestTest.php
index 66d20f8..e84462f 100644
--- a/test/Clients/RestTest.php
+++ b/test/Clients/RestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Clients;
 
 use Exception;
@@ -44,9 +46,9 @@ public function testExtractLinkHeader(): void
                 200,
                 [
                     'http_x_shopify_shop_api_call_limit' => '1/80',
-                    'link' => '<https://example.myshopify.com/admin/api/unstable/products.json?page_info='.$pageInfo.'>; rel="next"',
+                    'link' => '<https://example.myshopify.com/admin/api/unstable/products.json?page_info=' . $pageInfo . '>; rel="next"',
                 ],
-                file_get_contents(__DIR__.'/../fixtures/rest/admin__shop.json')
+                file_get_contents(__DIR__ . '/../fixtures/rest/admin__shop.json')
             ),
         ];
 
@@ -71,7 +73,7 @@ public function testRequestAccess(): void
             new GuzzleResponse(
                 200,
                 [],
-                file_get_contents(__DIR__.'/../fixtures/admin__oauth__access_token.json')
+                file_get_contents(__DIR__ . '/../fixtures/admin__oauth__access_token.json')
             ),
         ];
 
@@ -87,9 +89,6 @@ public function testRequestAccess(): void
         // Request access
         $code = '!@#';
         $result = $api->requestAccessToken($code);
-        /** @var \GuzzleHttp\Handler\MockHandler $handler */
-        $handler = $api->getOptions()->getGuzzleHandler();
-        $data = json_decode($handler->getLastRequest()->getBody(), true);
 
         $this->assertSame('f85632530bf277ec9ac6f649fc327f17', $result);
     }
@@ -110,7 +109,7 @@ public function testRequestAndSetAccess(): void
             new GuzzleResponse(
                 200,
                 [],
-                file_get_contents(__DIR__.'/../fixtures/admin__oauth__access_token__grant.json')
+                file_get_contents(__DIR__ . '/../fixtures/admin__oauth__access_token__grant.json')
             ),
         ];
 
@@ -176,7 +175,7 @@ public function testRequestSuccess(): void
             new GuzzleResponse(
                 200,
                 ['http_x_shopify_shop_api_call_limit' => '2/80'],
-                file_get_contents(__DIR__.'/../fixtures/rest/admin__shop.json')
+                file_get_contents(__DIR__ . '/../fixtures/rest/admin__shop.json')
             ),
         ];
 
@@ -210,7 +209,7 @@ public function testRequestForceRequestType(): void
             new GuzzleResponse(
                 200,
                 [],
-                file_get_contents(__DIR__.'/../fixtures/rest/admin__shop.json')
+                file_get_contents(__DIR__ . '/../fixtures/rest/admin__shop.json')
             ),
         ];
 
@@ -236,7 +235,7 @@ public function testRequestFailure(): void
             new GuzzleResponse(
                 404,
                 ['http_x_shopify_shop_api_call_limit' => '2/80'],
-                file_get_contents(__DIR__.'/../fixtures/rest/admin__shop_oops.json')
+                file_get_contents(__DIR__ . '/../fixtures/rest/admin__shop_oops.json')
             ),
         ];
 
@@ -286,7 +285,7 @@ public function testRequestAsync(): void
             new GuzzleResponse(
                 200,
                 ['http_x_shopify_shop_api_call_limit' => '2/80'],
-                file_get_contents(__DIR__.'/../fixtures/rest/admin__shop.json')
+                file_get_contents(__DIR__ . '/../fixtures/rest/admin__shop.json')
             ),
         ];
 
diff --git a/test/Middleware/AuthRequestTest.php b/test/Middleware/AuthRequestTest.php
index e2c2b5e..ff40003 100644
--- a/test/Middleware/AuthRequestTest.php
+++ b/test/Middleware/AuthRequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
diff --git a/test/Middleware/RateLimitingTest.php b/test/Middleware/RateLimitingTest.php
index dd11511..dffe965 100644
--- a/test/Middleware/RateLimitingTest.php
+++ b/test/Middleware/RateLimitingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Middleware;
 
 use Gnikyt\BasicShopifyAPI\Middleware\RateLimiting;
diff --git a/test/Middleware/UpdateApiLimitsTest.php b/test/Middleware/UpdateApiLimitsTest.php
index c742f40..db03f09 100644
--- a/test/Middleware/UpdateApiLimitsTest.php
+++ b/test/Middleware/UpdateApiLimitsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
diff --git a/test/Middleware/UpdateRequestTimeTest.php b/test/Middleware/UpdateRequestTimeTest.php
index f3d3576..908f892 100644
--- a/test/Middleware/UpdateRequestTimeTest.php
+++ b/test/Middleware/UpdateRequestTimeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Middleware;
 
 use Gnikyt\BasicShopifyAPI\Middleware\UpdateRequestTime;
@@ -27,8 +29,7 @@ public function testRuns(): void
 
         // Run a request
         $mw(
-            function (RequestInterface $request, array $options): void {
-            }
+            function (RequestInterface $request, array $options): void {}
         )(new Request('GET', '/admin/shop.json'), []);
 
         // Check we have timestamp now
diff --git a/test/ResponseAccessTest.php b/test/ResponseAccessTest.php
index ddea9d6..0b3eb7e 100644
--- a/test/ResponseAccessTest.php
+++ b/test/ResponseAccessTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;
diff --git a/test/SessionTest.php b/test/SessionTest.php
index 57afe82..e17a52a 100644
--- a/test/SessionTest.php
+++ b/test/SessionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;
diff --git a/test/Store/MemoryTest.php b/test/Store/MemoryTest.php
index 2dd92d2..d6d6478 100644
--- a/test/Store/MemoryTest.php
+++ b/test/Store/MemoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Store;
 
 use Gnikyt\BasicShopifyAPI\Session;
diff --git a/test/Traits/IsRequestTypeTest.php b/test/Traits/IsRequestTypeTest.php
index 75af1d7..3288997 100644
--- a/test/Traits/IsRequestTypeTest.php
+++ b/test/Traits/IsRequestTypeTest.php
@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Traits;
 
 use Gnikyt\BasicShopifyAPI\Test\BaseTest;
 use Gnikyt\BasicShopifyAPI\Traits\IsRequestType;
+use GuzzleHttp\Psr7\Uri;
 use PHPUnit\Framework\TestCase;
 
 class IsRequestTypeTest extends BaseTest
@@ -11,7 +14,7 @@ class IsRequestTypeTest extends BaseTest
     public function test(): void
     {
         // Create anon class
-        $klass = new class() {
+        $klass = new class {
             use IsRequestType;
 
             private $self;
@@ -23,14 +26,14 @@ public function setSelf(TestCase $self): void
 
             public function testGraph(): void
             {
-                $this->self->assertTrue($this->isGraphRequest('/admin/api/graphql.json'));
-                $this->self->assertFalse($this->isGraphRequest('/admin/api/unstable/shop.json'));
+                $this->self->assertTrue($this->isGraphRequest(new Uri('/admin/api/graphql.json')));
+                $this->self->assertFalse($this->isGraphRequest(new Uri('/admin/api/unstable/shop.json')));
             }
 
             public function testRest(): void
             {
-                $this->self->assertFalse($this->isRestRequest('/admin/api/graphql.json'));
-                $this->self->assertTrue($this->isRestRequest('/admin/api/unstable/shop.json'));
+                $this->self->assertFalse($this->isRestRequest(new Uri('/admin/api/graphql.json')));
+                $this->self->assertTrue($this->isRestRequest(new Uri('/admin/api/unstable/shop.json')));
             }
         };
 
diff --git a/test/Traits/IsResponseTypeTest.php b/test/Traits/IsResponseTypeTest.php
index d92052a..d6a1627 100644
--- a/test/Traits/IsResponseTypeTest.php
+++ b/test/Traits/IsResponseTypeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Traits;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
@@ -14,7 +16,7 @@ class IsResponseTypeTest extends BaseTest
     public function test(): void
     {
         // Create anon class
-        $klass = new class() {
+        $klass = new class {
             use IsResponseType;
 
             private $self;
diff --git a/test/Traits/ResponseTransformTest.php b/test/Traits/ResponseTransformTest.php
index 3cf2c41..12362ea 100644
--- a/test/Traits/ResponseTransformTest.php
+++ b/test/Traits/ResponseTransformTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test\Traits;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;
@@ -15,7 +17,7 @@ public function test(): void
         $response = new Response(200, [], file_get_contents(__DIR__.'/../fixtures/rest/admin__shop.json'));
 
         // Create a anon class
-        $kclass = new class() {
+        $kclass = new class {
             use ResponseTransform;
         };
         $result = $kclass->toResponse($response->getBody());