diff --git a/composer.json b/composer.json
index 925e8f64..43a97f41 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "JikanTest\\": "test/JikanTest/"
+          "JikanTest\\": [
+              "test/unit"
+          ]
         }
     },
     "require": {
diff --git a/grumphp.yml b/grumphp.yml
index 31f39c39..f803d4fc 100644
--- a/grumphp.yml
+++ b/grumphp.yml
@@ -13,4 +13,4 @@ grumphp:
                 - 'die'
         paratest:
             always_execute: true
-        phplint: ~
\ No newline at end of file
+        phplint: ~
diff --git a/phpunit.xml b/phpunit.xml
index 5a0d5699..a9782dd1 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,13 +1,22 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         cacheDirectory=".phpunit.cache"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         colors="true"
+         failOnEmptyTestSuite="true"
+>
   <testsuites>
-    <testsuite name="Unit">
-      <directory>./test/JikanTest</directory>
+    <testsuite name="unit">
+      <directory phpVersion="8.2" phpVersionOperator=">=">test/unit</directory>
     </testsuite>
   </testsuites>
+
+  <php>
+    <ini name="precision" value="14"/>
+    <ini name="serialize_precision" value="14"/>
+
+    <const name="PHPUNIT_TESTSUITE" value="true"/>
+  </php>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a51f1cae..ed2efffa 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <phpunit colors="true">
     <testsuites>
         <testsuite name="Unit">
-            <directory>./test/JikanTest</directory>
+            <directory>./test/unit</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/test/JikanTest/Helper/JStringTest.php b/test/unit/Helper/JStringTest.php
similarity index 97%
rename from test/JikanTest/Helper/JStringTest.php
rename to test/unit/Helper/JStringTest.php
index 06856ffb..841bc514 100644
--- a/test/JikanTest/Helper/JStringTest.php
+++ b/test/unit/Helper/JStringTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Helper;
+namespace JikanTest\Helper;
 
 use Jikan\Helper\JString;
-use PHPUnit\Framework\TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class JStringTest
diff --git a/test/JikanTest/Helper/MediaTest.php b/test/unit/Helper/MediaTest.php
similarity index 91%
rename from test/JikanTest/Helper/MediaTest.php
rename to test/unit/Helper/MediaTest.php
index 63580fff..77ec81de 100644
--- a/test/JikanTest/Helper/MediaTest.php
+++ b/test/unit/Helper/MediaTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Helper;
+namespace JikanTest\Helper;
 
 use Jikan\Helper\Media;
-use PHPUnit\Framework\TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MediaTest
diff --git a/test/JikanTest/Helper/ParserTest.php b/test/unit/Helper/ParserTest.php
similarity index 97%
rename from test/JikanTest/Helper/ParserTest.php
rename to test/unit/Helper/ParserTest.php
index 88e695c9..86710a4d 100644
--- a/test/JikanTest/Helper/ParserTest.php
+++ b/test/unit/Helper/ParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Helper;
+namespace JikanTest\Helper;
 
 use Jikan\Helper\Parser;
-use PHPUnit\Framework\TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class ParserTest
diff --git a/test/JikanTest/HttpFilesystemCacheClientCallback.php b/test/unit/HttpFilesystemCacheClientCallback.php
similarity index 78%
rename from test/JikanTest/HttpFilesystemCacheClientCallback.php
rename to test/unit/HttpFilesystemCacheClientCallback.php
index 51590254..e5c7cf07 100644
--- a/test/JikanTest/HttpFilesystemCacheClientCallback.php
+++ b/test/unit/HttpFilesystemCacheClientCallback.php
@@ -3,6 +3,10 @@
 
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -41,10 +45,10 @@ public function __construct(string $cachePath, HttpClientInterface $httpClient =
      * @param string $url
      * @param array $options
      * @return ResponseInterface
-     * @throws \Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface
-     * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
-     * @throws \Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface
-     * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface
+     * @throws ClientExceptionInterface
+     * @throws RedirectionExceptionInterface
+     * @throws ServerExceptionInterface
+     * @throws TransportExceptionInterface
      */
     public function __invoke(string $method, string $url, array $options = []): ResponseInterface
     {
diff --git a/test/JikanTest/Model/Common/DatePropTest.php b/test/unit/Model/Common/DatePropTest.php
similarity index 93%
rename from test/JikanTest/Model/Common/DatePropTest.php
rename to test/unit/Model/Common/DatePropTest.php
index 58e11ff6..5abafb39 100644
--- a/test/JikanTest/Model/Common/DatePropTest.php
+++ b/test/unit/Model/Common/DatePropTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Model\Common;
+namespace JikanTest\Model\Common;
 
 use Jikan\Model\Common\DateProp;
-use PHPUnit\Framework\TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class DatePropTest
diff --git a/test/JikanTest/Model/Common/DateRangeTest.php b/test/unit/Model/Common/DateRangeTest.php
similarity index 97%
rename from test/JikanTest/Model/Common/DateRangeTest.php
rename to test/unit/Model/Common/DateRangeTest.php
index 7f2681bb..7b1afcb2 100644
--- a/test/JikanTest/Model/Common/DateRangeTest.php
+++ b/test/unit/Model/Common/DateRangeTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Model\Common;
+namespace JikanTest\Model\Common;
 
 use Jikan\Model\Common\DateProp;
 use Jikan\Model\Common\DateRange;
-use PHPUnit\Framework\TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class DateRangeTest
diff --git a/test/JikanTest/Parser/Anime/AnimeEpisodeParserTest.php b/test/unit/Parser/Anime/AnimeEpisodeParserTest.php
similarity index 100%
rename from test/JikanTest/Parser/Anime/AnimeEpisodeParserTest.php
rename to test/unit/Parser/Anime/AnimeEpisodeParserTest.php
diff --git a/test/JikanTest/Parser/Anime/AnimeEpisodesParserTest.php b/test/unit/Parser/Anime/AnimeEpisodesParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Anime/AnimeEpisodesParserTest.php
rename to test/unit/Parser/Anime/AnimeEpisodesParserTest.php
index 51b7b2eb..33eabc47 100644
--- a/test/JikanTest/Parser/Anime/AnimeEpisodesParserTest.php
+++ b/test/unit/Parser/Anime/AnimeEpisodesParserTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class AnimeEpisodesParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Anime/AnimeMoreInfoParserTest.php b/test/unit/Parser/Anime/AnimeMoreInfoParserTest.php
similarity index 90%
rename from test/JikanTest/Parser/Anime/AnimeMoreInfoParserTest.php
rename to test/unit/Parser/Anime/AnimeMoreInfoParserTest.php
index 1209fa3d..70f21dc6 100644
--- a/test/JikanTest/Parser/Anime/AnimeMoreInfoParserTest.php
+++ b/test/unit/Parser/Anime/AnimeMoreInfoParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class AnimeMoreInfoParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Anime/AnimeParserTest.php b/test/unit/Parser/Anime/AnimeParserTest.php
similarity index 99%
rename from test/JikanTest/Parser/Anime/AnimeParserTest.php
rename to test/unit/Parser/Anime/AnimeParserTest.php
index febd235f..c5a6eb1c 100644
--- a/test/JikanTest/Parser/Anime/AnimeParserTest.php
+++ b/test/unit/Parser/Anime/AnimeParserTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\MalUrl;
 use Jikan\Model\Common\Title;
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeParserTest
diff --git a/test/JikanTest/Parser/Anime/AnimeRecentlyUpdatedByUsersParserTest.php b/test/unit/Parser/Anime/AnimeRecentlyUpdatedByUsersParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Anime/AnimeRecentlyUpdatedByUsersParserTest.php
rename to test/unit/Parser/Anime/AnimeRecentlyUpdatedByUsersParserTest.php
index cf89e64c..bf01adf2 100644
--- a/test/JikanTest/Parser/Anime/AnimeRecentlyUpdatedByUsersParserTest.php
+++ b/test/unit/Parser/Anime/AnimeRecentlyUpdatedByUsersParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class AnimeRecentlyUpdatedByUsersParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Anime/AnimeRecommendationParserTest.php b/test/unit/Parser/Anime/AnimeRecommendationParserTest.php
similarity index 96%
rename from test/JikanTest/Parser/Anime/AnimeRecommendationParserTest.php
rename to test/unit/Parser/Anime/AnimeRecommendationParserTest.php
index cbe8d159..49e06455 100644
--- a/test/JikanTest/Parser/Anime/AnimeRecommendationParserTest.php
+++ b/test/unit/Parser/Anime/AnimeRecommendationParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class AnimeRecommendationParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Anime/AnimeReviewsParserTest.php b/test/unit/Parser/Anime/AnimeReviewsParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Anime/AnimeReviewsParserTest.php
rename to test/unit/Parser/Anime/AnimeReviewsParserTest.php
index 704baf2c..9e864196 100644
--- a/test/JikanTest/Parser/Anime/AnimeReviewsParserTest.php
+++ b/test/unit/Parser/Anime/AnimeReviewsParserTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Anime\AnimeReview;
 use Jikan\Parser\Anime\AnimeReviewsParser;
 use Jikan\Request\Anime\AnimeReviewsRequest;
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 class AnimeReviewsParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Anime/AnimeStatsParserTest.php b/test/unit/Parser/Anime/AnimeStatsParserTest.php
similarity index 93%
rename from test/JikanTest/Parser/Anime/AnimeStatsParserTest.php
rename to test/unit/Parser/Anime/AnimeStatsParserTest.php
index d31ddf65..fc76a622 100644
--- a/test/JikanTest/Parser/Anime/AnimeStatsParserTest.php
+++ b/test/unit/Parser/Anime/AnimeStatsParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Anime;
+namespace JikanTest\Parser\Anime;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Anime\AnimeStatsParser;
-use JikanTest\Parser\Anime\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeStatsParserTest
diff --git a/test/JikanTest/Parser/Character/AnimeographyParserTest.php b/test/unit/Parser/Character/AnimeographyParserTest.php
similarity index 93%
rename from test/JikanTest/Parser/Character/AnimeographyParserTest.php
rename to test/unit/Parser/Character/AnimeographyParserTest.php
index d01362d1..27d0e941 100644
--- a/test/JikanTest/Parser/Character/AnimeographyParserTest.php
+++ b/test/unit/Parser/Character/AnimeographyParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Character;
+namespace JikanTest\Parser\Character;
 
-use JikanTest\Parser\Character\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeographyParserTest
diff --git a/test/JikanTest/Parser/Character/CharacterListItemParserTest.php b/test/unit/Parser/Character/CharacterListItemParserTest.php
similarity index 94%
rename from test/JikanTest/Parser/Character/CharacterListItemParserTest.php
rename to test/unit/Parser/Character/CharacterListItemParserTest.php
index c7d9662e..953b2d6e 100644
--- a/test/JikanTest/Parser/Character/CharacterListItemParserTest.php
+++ b/test/unit/Parser/Character/CharacterListItemParserTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Parser\Character;
+namespace JikanTest\Parser\Character;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Character\VoiceActor;
 use Jikan\Parser\Character\CharacterListItemParser;
-use JikanTest\Parser\Character\Client;
 use Symfony\Component\DomCrawler\Crawler;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class CharacterListItemParserTest
@@ -22,7 +22,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/35073/Overlord_II/characters');
 
         $this->parser = new CharacterListItemParser(
diff --git a/test/JikanTest/Parser/Character/CharacterParserTest.php b/test/unit/Parser/Character/CharacterParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Character/CharacterParserTest.php
rename to test/unit/Parser/Character/CharacterParserTest.php
index c1e64a40..8a7fbc6e 100644
--- a/test/JikanTest/Parser/Character/CharacterParserTest.php
+++ b/test/unit/Parser/Character/CharacterParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Character;
+namespace JikanTest\Parser\Character;
 
-use JikanTest\Parser\Character\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 /**
  * Class CharacterParserTest
diff --git a/test/JikanTest/Parser/Character/StaffListItemParserTest.php b/test/unit/Parser/Character/StaffListItemParserTest.php
similarity index 92%
rename from test/JikanTest/Parser/Character/StaffListItemParserTest.php
rename to test/unit/Parser/Character/StaffListItemParserTest.php
index adea066a..96dc85bf 100644
--- a/test/JikanTest/Parser/Character/StaffListItemParserTest.php
+++ b/test/unit/Parser/Character/StaffListItemParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Character;
+namespace JikanTest\Parser\Character;
 
-use JikanTest\Parser\Character\Client;
+use Jikan\Http\HttpClientWrapper;
 use Symfony\Component\DomCrawler\Crawler;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class StaffListItemParserTest
@@ -20,7 +20,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/35073/_/characters');
 
         $this->parser = new \Jikan\Parser\Anime\StaffListItemParser(
diff --git a/test/JikanTest/Parser/Character/VoiceActorParserTest.php b/test/unit/Parser/Character/VoiceActorParserTest.php
similarity index 94%
rename from test/JikanTest/Parser/Character/VoiceActorParserTest.php
rename to test/unit/Parser/Character/VoiceActorParserTest.php
index c41b3a41..55cb4b94 100644
--- a/test/JikanTest/Parser/Character/VoiceActorParserTest.php
+++ b/test/unit/Parser/Character/VoiceActorParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Character;
+namespace JikanTest\Parser\Character;
 
-use JikanTest\Parser\Character\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 /**
  * Class VoiceActorParserTest
diff --git a/test/JikanTest/Parser/Club/ClubParserTest.php b/test/unit/Parser/Club/ClubParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Club/ClubParserTest.php
rename to test/unit/Parser/Club/ClubParserTest.php
index d79fe2de..2b4f181f 100644
--- a/test/JikanTest/Parser/Club/ClubParserTest.php
+++ b/test/unit/Parser/Club/ClubParserTest.php
@@ -1,11 +1,10 @@
 <?php
-namespace Parser\Club;
+namespace JikanTest\Parser\Club;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\MalUrl;
 use Jikan\Model\Common\UserMetaBasic;
-use JikanTest\Parser\Club\HttpClientWrapper;
-use TestCase;
-use VCR\VCR;
+use JikanTest\TestCase;
 
 class ClubParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Club/UserListParserTest.php b/test/unit/Parser/Club/UserListParserTest.php
similarity index 88%
rename from test/JikanTest/Parser/Club/UserListParserTest.php
rename to test/unit/Parser/Club/UserListParserTest.php
index b8a48260..f96b2d63 100644
--- a/test/JikanTest/Parser/Club/UserListParserTest.php
+++ b/test/unit/Parser/Club/UserListParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Club;
+namespace JikanTest\Parser\Club;
 
-use JikanTest\Parser\Club\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class UserListParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Common/MalUrlParserTest.php b/test/unit/Parser/Common/MalUrlParserTest.php
similarity index 91%
rename from test/JikanTest/Parser/Common/MalUrlParserTest.php
rename to test/unit/Parser/Common/MalUrlParserTest.php
index 566b2755..e31fefc1 100644
--- a/test/JikanTest/Parser/Common/MalUrlParserTest.php
+++ b/test/unit/Parser/Common/MalUrlParserTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Parser\Common;
+namespace JikanTest\Parser\Common;
 
 use Jikan\Parser\Common\MalUrlParser;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MalUrlParserTest
  *
- * @package JikanTest\Parser\Common
+ * @package unit\Parser\Common
  */
 class MalUrlParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Forum/ForumTopicParserTest.php b/test/unit/Parser/Forum/ForumTopicParserTest.php
similarity index 96%
rename from test/JikanTest/Parser/Forum/ForumTopicParserTest.php
rename to test/unit/Parser/Forum/ForumTopicParserTest.php
index f6ea368d..653e8667 100644
--- a/test/JikanTest/Parser/Forum/ForumTopicParserTest.php
+++ b/test/unit/Parser/Forum/ForumTopicParserTest.php
@@ -2,12 +2,12 @@
 
 /** @noinspection PhpCSValidationInspection */
 
-namespace Parser\Forum;
+namespace JikanTest\Parser\Forum;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Forum\ForumPost;
 use Jikan\Parser\Forum\ForumTopicParser;
-use JikanTest\Parser\Forum\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class ForumTopicParserTest
diff --git a/test/JikanTest/Parser/Genre/AnimeGenreParserTest.php b/test/unit/Parser/Genre/AnimeGenreParserTest.php
similarity index 89%
rename from test/JikanTest/Parser/Genre/AnimeGenreParserTest.php
rename to test/unit/Parser/Genre/AnimeGenreParserTest.php
index 51b957bf..3aab28b9 100644
--- a/test/JikanTest/Parser/Genre/AnimeGenreParserTest.php
+++ b/test/unit/Parser/Genre/AnimeGenreParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Genre;
+namespace JikanTest\Parser\Genre;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\AnimeCard;
 use Jikan\Parser\Genre\AnimeGenreParser;
-use JikanTest\Parser\Genre\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeGenreParserTest
@@ -21,7 +21,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/genre/1');
         $this->parser = new AnimeGenreParser($crawler);
     }
diff --git a/test/JikanTest/Parser/Genre/MangaGenreParserTest.php b/test/unit/Parser/Genre/MangaGenreParserTest.php
similarity index 89%
rename from test/JikanTest/Parser/Genre/MangaGenreParserTest.php
rename to test/unit/Parser/Genre/MangaGenreParserTest.php
index efb4a5f5..f47a64eb 100644
--- a/test/JikanTest/Parser/Genre/MangaGenreParserTest.php
+++ b/test/unit/Parser/Genre/MangaGenreParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Genre;
+namespace JikanTest\Parser\Genre;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\MangaCard;
 use Jikan\Parser\Genre\MangaGenreParser;
-use JikanTest\Parser\Genre\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MangaGenreParserTest
@@ -21,7 +21,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/manga/genre/1');
         $this->parser = new MangaGenreParser($crawler);
     }
diff --git a/test/JikanTest/Parser/Magazine/MagazineParserTest.php b/test/unit/Parser/Magazine/MagazineParserTest.php
similarity index 84%
rename from test/JikanTest/Parser/Magazine/MagazineParserTest.php
rename to test/unit/Parser/Magazine/MagazineParserTest.php
index a96f3298..c784d01e 100644
--- a/test/JikanTest/Parser/Magazine/MagazineParserTest.php
+++ b/test/unit/Parser/Magazine/MagazineParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Magazine;
+namespace JikanTest\Parser\Magazine;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Magazine\MagazineParser;
-use JikanTest\Parser\Magazine\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MagazineParserTest
@@ -20,7 +20,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/manga/magazine/1');
         $this->parser = new MagazineParser($crawler);
     }
diff --git a/test/JikanTest/Parser/Manga/CharactersParserTest.php b/test/unit/Parser/Manga/CharactersParserTest.php
similarity index 91%
rename from test/JikanTest/Parser/Manga/CharactersParserTest.php
rename to test/unit/Parser/Manga/CharactersParserTest.php
index 6cff8255..fe5ee21e 100644
--- a/test/JikanTest/Parser/Manga/CharactersParserTest.php
+++ b/test/unit/Parser/Manga/CharactersParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Manga;
+namespace JikanTest\Parser\Manga;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Manga\CharactersParser;
-use JikanTest\Parser\Manga\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class CharactersParserTest
diff --git a/test/JikanTest/Parser/Manga/MangaParserTest.php b/test/unit/Parser/Manga/MangaParserTest.php
similarity index 98%
rename from test/JikanTest/Parser/Manga/MangaParserTest.php
rename to test/unit/Parser/Manga/MangaParserTest.php
index a72b9538..5066a6d5 100644
--- a/test/JikanTest/Parser/Manga/MangaParserTest.php
+++ b/test/unit/Parser/Manga/MangaParserTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Parser\Manga;
+namespace JikanTest\Parser\Manga;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\DateRange;
 use Jikan\Model\Common\MalUrl;
 use Jikan\Model\Common\Title;
 use Jikan\MyAnimeList\MalClient;
-use JikanTest\Parser\Manga\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MangaParserTest
diff --git a/test/JikanTest/Parser/Manga/MangaRecentlyUpdatedByUsersParserTest.php b/test/unit/Parser/Manga/MangaRecentlyUpdatedByUsersParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Manga/MangaRecentlyUpdatedByUsersParserTest.php
rename to test/unit/Parser/Manga/MangaRecentlyUpdatedByUsersParserTest.php
index 86400a8b..f537915d 100644
--- a/test/JikanTest/Parser/Manga/MangaRecentlyUpdatedByUsersParserTest.php
+++ b/test/unit/Parser/Manga/MangaRecentlyUpdatedByUsersParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Manga;
+namespace JikanTest\Parser\Manga;
 
-use JikanTest\Parser\Manga\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class MangaRecentlyUpdatedByUsersParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Manga/MangaRecommendationParserTest.php b/test/unit/Parser/Manga/MangaRecommendationParserTest.php
similarity index 96%
rename from test/JikanTest/Parser/Manga/MangaRecommendationParserTest.php
rename to test/unit/Parser/Manga/MangaRecommendationParserTest.php
index 2be001b5..d5e5cdfb 100644
--- a/test/JikanTest/Parser/Manga/MangaRecommendationParserTest.php
+++ b/test/unit/Parser/Manga/MangaRecommendationParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Manga;
+namespace JikanTest\Parser\Manga;
 
-use JikanTest\Parser\Manga\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class MangaRecommendationParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Manga/MangaReviewsParserTest.php b/test/unit/Parser/Manga/MangaReviewsParserTest.php
similarity index 97%
rename from test/JikanTest/Parser/Manga/MangaReviewsParserTest.php
rename to test/unit/Parser/Manga/MangaReviewsParserTest.php
index a6aaa343..a5c2be18 100644
--- a/test/JikanTest/Parser/Manga/MangaReviewsParserTest.php
+++ b/test/unit/Parser/Manga/MangaReviewsParserTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Parser\Manga;
+namespace JikanTest\Parser\Manga;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Manga\MangaReview;
 use Jikan\Parser\Manga\MangaReviewsParser;
 use Jikan\Request\Manga\MangaReviewsRequest;
-use JikanTest\Parser\Manga\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 class MangaReviewsParserTest extends TestCase
 {
diff --git a/test/JikanTest/Parser/Manga/MangaStatsParserTest.php b/test/unit/Parser/Manga/MangaStatsParserTest.php
similarity index 93%
rename from test/JikanTest/Parser/Manga/MangaStatsParserTest.php
rename to test/unit/Parser/Manga/MangaStatsParserTest.php
index 29297cdf..e5217b98 100644
--- a/test/JikanTest/Parser/Manga/MangaStatsParserTest.php
+++ b/test/unit/Parser/Manga/MangaStatsParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Manga;
+namespace JikanTest\Parser\Manga;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Manga\MangaStatsParser;
-use JikanTest\Parser\Manga\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MangaStatsParserTest
diff --git a/test/JikanTest/Parser/News/NewsListItemParserTest.php b/test/unit/Parser/News/NewsListItemParserTest.php
similarity index 92%
rename from test/JikanTest/Parser/News/NewsListItemParserTest.php
rename to test/unit/Parser/News/NewsListItemParserTest.php
index dfe64b1a..16d81e74 100644
--- a/test/JikanTest/Parser/News/NewsListItemParserTest.php
+++ b/test/unit/Parser/News/NewsListItemParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\News;
+namespace JikanTest\Parser\News;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\News\NewsListItemParser;
-use JikanTest\Parser\News\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class NewsListItemParserTest
@@ -14,7 +14,7 @@ class NewsListItemParserTest extends TestCase
     /**
      * @var NewsListItemParser
      */
-    private $parser;
+    private NewsListItemParser $parser;
 
     public function setUp(): void
     {
@@ -59,7 +59,7 @@ public function it_gets_the_image(): void
      */
     public function it_gets_the_date(): void
     {
-        self::assertEquals('2023-06-07 00:33', $this->parser->getDate()->format('Y-m-d H:i'));
+        self::assertEquals('2024-06-07 00:33', $this->parser->getDate()->format('Y-m-d H:i'));
     }
 
     /**
diff --git a/test/JikanTest/Parser/Person/PersonParserTest.php b/test/unit/Parser/Person/PersonParserTest.php
similarity index 96%
rename from test/JikanTest/Parser/Person/PersonParserTest.php
rename to test/unit/Parser/Person/PersonParserTest.php
index dad8fef6..68b465be 100644
--- a/test/JikanTest/Parser/Person/PersonParserTest.php
+++ b/test/unit/Parser/Person/PersonParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Person;
+namespace JikanTest\Parser\Person;
 
-use JikanTest\Parser\Person\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 /**
  * Class PersonParserTest
diff --git a/test/JikanTest/Parser/Pictures/PicturesPageParserTest.php b/test/unit/Parser/Pictures/PicturesPageParserTest.php
similarity index 87%
rename from test/JikanTest/Parser/Pictures/PicturesPageParserTest.php
rename to test/unit/Parser/Pictures/PicturesPageParserTest.php
index 912dcfc8..d4f3aa2e 100644
--- a/test/JikanTest/Parser/Pictures/PicturesPageParserTest.php
+++ b/test/unit/Parser/Pictures/PicturesPageParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Pictures;
+namespace JikanTest\Parser\Pictures;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Resource\CommonImageResource\CommonImageResource;
 use Jikan\Parser\Common\PicturesPageParser;
-use JikanTest\Parser\Pictures\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class PicturesPageParserTest
@@ -15,22 +15,22 @@ class PicturesPageParserTest extends TestCase
     /**
      * @var PicturesPageParser
      */
-    private $animeParser;
+    private PicturesPageParser $animeParser;
 
     /**
      * @var PicturesPageParser
      */
-    private $mangaParser;
+    private PicturesPageParser $mangaParser;
 
     /**
      * @var PicturesPageParser
      */
-    private $personParser;
+    private PicturesPageParser $personParser;
 
     /**
      * @var PicturesPageParser
      */
-    private $characterParser;
+    private PicturesPageParser $characterParser;
 
     /**
      * @test
@@ -39,7 +39,7 @@ public function it_gets_manga_pictures()
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/manga/50145/jikan/pics');
         $this->mangaParser = new PicturesPageParser($crawler);
         $pictures = $this->mangaParser->getModel();
@@ -63,7 +63,7 @@ public function it_gets_anime_pictures()
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/22147/jikan/pics');
         $this->animeParser = new PicturesPageParser($crawler);
         $pictures = $this->animeParser->getModel();
@@ -87,7 +87,7 @@ public function it_gets_person_pictures()
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/people/11162/jikan/pics');
         $this->personParser = new PicturesPageParser($crawler);
         $pictures = $this->personParser->getModel();
@@ -111,7 +111,7 @@ public function it_gets_character_pictures()
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/character/105591/jikan/pics');
         $this->characterParser = new PicturesPageParser($crawler);
         $pictures = $this->characterParser->getModel();
diff --git a/test/JikanTest/Parser/Producer/ProducerParserTest.php b/test/unit/Parser/Producer/ProducerParserTest.php
similarity index 90%
rename from test/JikanTest/Parser/Producer/ProducerParserTest.php
rename to test/unit/Parser/Producer/ProducerParserTest.php
index 69d0b080..e4345519 100644
--- a/test/JikanTest/Parser/Producer/ProducerParserTest.php
+++ b/test/unit/Parser/Producer/ProducerParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Producer;
+namespace JikanTest\Parser\Producer;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\Url;
 use Jikan\Parser\Producer\ProducerParser;
-use JikanTest\Parser\Person\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class ProducerParserTest
@@ -15,13 +15,13 @@ class ProducerParserTest extends TestCase
     /**
      * @var ProducerParser
      */
-    private $parser;
+    private ProducerParser $parser;
 
     public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/producer/1');
         $this->parser = new ProducerParser($crawler);
     }
@@ -41,7 +41,7 @@ public function it_gets_url()
     public function it_gets_anime()
     {
         $anime = $this->parser->getResults();
-        self::assertCount(306, $anime);
+        self::assertCount(309, $anime);
         self::assertContainsOnlyInstancesOf(\Jikan\Model\Common\AnimeCard::class, $anime);
     }
 
@@ -73,7 +73,7 @@ public function it_gets_established()
     public function it_gets_favorites()
     {
         self::assertEquals(
-            4476,
+            4805,
             $this->parser->getFavorites()
         );
     }
@@ -95,7 +95,7 @@ public function it_gets_about()
     public function it_gets_count()
     {
         self::assertEquals(
-            306,
+            309,
             $this->parser->getAnimeCount()
         );
     }
diff --git a/test/JikanTest/Parser/Schedule/ScheduleParserTest.php b/test/unit/Parser/Schedule/ScheduleParserTest.php
similarity index 81%
rename from test/JikanTest/Parser/Schedule/ScheduleParserTest.php
rename to test/unit/Parser/Schedule/ScheduleParserTest.php
index 67fb7278..114bdef6 100644
--- a/test/JikanTest/Parser/Schedule/ScheduleParserTest.php
+++ b/test/unit/Parser/Schedule/ScheduleParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Schedule;
+namespace JikanTest\Parser\Schedule;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\AnimeCard;
 use Jikan\Parser\Schedule\ScheduleParser;
-use JikanTest\Parser\Person\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class ScheduleParserTest
@@ -21,7 +21,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/season/schedule');
         $this->parser = new ScheduleParser($crawler);
     }
@@ -33,7 +33,7 @@ public function it_gets_mondays()
     {
         $monday = $this->parser->getShedule('monday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $monday);
-        self::assertCount(9, $monday);
+        self::assertCount(11, $monday);
     }
 
     /**
@@ -43,7 +43,7 @@ public function it_gets_tuesdays()
     {
         $tuesday = $this->parser->getShedule('tuesday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $tuesday);
-        self::assertCount(5, $tuesday);
+        self::assertCount(7, $tuesday);
     }
 
     /**
@@ -53,7 +53,7 @@ public function it_gets_wednesdays()
     {
         $wednesday = $this->parser->getShedule('wednesday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $wednesday);
-        self::assertCount(11, $wednesday);
+        self::assertCount(9, $wednesday);
     }
 
     /**
@@ -63,7 +63,7 @@ public function it_gets_thursdays()
     {
         $thursday = $this->parser->getShedule('thursday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $thursday);
-        self::assertCount(6, $thursday);
+        self::assertCount(9, $thursday);
     }
 
     /**
@@ -73,7 +73,7 @@ public function it_gets_fridays()
     {
         $friday = $this->parser->getShedule('friday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $friday);
-        self::assertCount(9, $friday);
+        self::assertCount(14, $friday);
     }
 
     /**
@@ -83,7 +83,7 @@ public function it_gets_saturdays()
     {
         $saturday = $this->parser->getShedule('saturday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $saturday);
-        self::assertCount(14, $saturday);
+        self::assertCount(17, $saturday);
     }
 
     /**
@@ -93,7 +93,7 @@ public function it_gets_sundays()
     {
         $sunday = $this->parser->getShedule('sunday');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $sunday);
-        self::assertCount(21, $sunday);
+        self::assertCount(27, $sunday);
     }
 
     /**
@@ -103,7 +103,7 @@ public function it_gets_all()
     {
         $all = $this->parser->getShedule('all');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $all);
-        self::assertCount(115, $all);
+        self::assertCount(144, $all);
     }
 
     /**
@@ -113,7 +113,7 @@ public function it_gets_other()
     {
         $other = $this->parser->getShedule('other');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $other);
-        self::assertCount(10, $other);
+        self::assertCount(12, $other);
     }
 
     /**
@@ -123,6 +123,6 @@ public function it_gets_unknown()
     {
         $unknown = $this->parser->getShedule('unknown');
         self::assertContainsOnlyInstancesOf(AnimeCard::class, $unknown);
-        self::assertCount(21, $unknown);
+        self::assertCount(29, $unknown);
     }
 }
diff --git a/test/JikanTest/Parser/Search/AnimeSearchAiringTest.php b/test/unit/Parser/Search/AnimeSearchAiringTest.php
similarity index 94%
rename from test/JikanTest/Parser/Search/AnimeSearchAiringTest.php
rename to test/unit/Parser/Search/AnimeSearchAiringTest.php
index 6e8e0467..1e46f13a 100644
--- a/test/JikanTest/Parser/Search/AnimeSearchAiringTest.php
+++ b/test/unit/Parser/Search/AnimeSearchAiringTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Search;
+namespace JikanTest\Parser\Search;
 
 use Jikan\MyAnimeList\MalClient;
 use Jikan\Request\Search\AnimeSearchRequest;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeSearchAiringTest
diff --git a/test/JikanTest/Parser/Search/AnimeSearchEpisodeTest.php b/test/unit/Parser/Search/AnimeSearchEpisodeTest.php
similarity index 94%
rename from test/JikanTest/Parser/Search/AnimeSearchEpisodeTest.php
rename to test/unit/Parser/Search/AnimeSearchEpisodeTest.php
index 8735c414..c248fe4a 100644
--- a/test/JikanTest/Parser/Search/AnimeSearchEpisodeTest.php
+++ b/test/unit/Parser/Search/AnimeSearchEpisodeTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Search;
+namespace JikanTest\Parser\Search;
 
 use Jikan\MyAnimeList\MalClient;
 use Jikan\Request\Search\AnimeSearchRequest;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeSearchEpisodeTest
diff --git a/test/JikanTest/Parser/Search/AnimeSearchTest.php b/test/unit/Parser/Search/AnimeSearchTest.php
similarity index 92%
rename from test/JikanTest/Parser/Search/AnimeSearchTest.php
rename to test/unit/Parser/Search/AnimeSearchTest.php
index 92da042a..efed184a 100644
--- a/test/JikanTest/Parser/Search/AnimeSearchTest.php
+++ b/test/unit/Parser/Search/AnimeSearchTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Search;
+namespace JikanTest\Parser\Search;
 
 use Jikan\MyAnimeList\MalClient;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeSearchTest
@@ -100,7 +100,7 @@ public function it_gets_the_end_date()
      */
     public function it_gets_the_members()
     {
-        self::assertEquals(1029210, $this->anime->getMembers());
+        self::assertEquals(1106026, $this->anime->getMembers());
     }
 
     /**
@@ -116,6 +116,6 @@ public function it_gets_the_rated()
      */
     public function it_gets_the_score()
     {
-        self::assertEquals(8.56, $this->anime->getScore());
+        self::assertEquals(8.55, $this->anime->getScore());
     }
 }
diff --git a/test/JikanTest/Parser/Search/CharacterSearchTest.php b/test/unit/Parser/Search/CharacterSearchTest.php
similarity index 97%
rename from test/JikanTest/Parser/Search/CharacterSearchTest.php
rename to test/unit/Parser/Search/CharacterSearchTest.php
index 5f00d913..21983328 100644
--- a/test/JikanTest/Parser/Search/CharacterSearchTest.php
+++ b/test/unit/Parser/Search/CharacterSearchTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Search;
+namespace JikanTest\Parser\Search;
 
 use Jikan\Model\Common\MalUrl;
 use Jikan\MyAnimeList\MalClient;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class CharacterSearchTest
diff --git a/test/JikanTest/Parser/Search/MangaSearchTest.php b/test/unit/Parser/Search/MangaSearchTest.php
similarity index 95%
rename from test/JikanTest/Parser/Search/MangaSearchTest.php
rename to test/unit/Parser/Search/MangaSearchTest.php
index 7eccea5d..ccfed6bd 100644
--- a/test/JikanTest/Parser/Search/MangaSearchTest.php
+++ b/test/unit/Parser/Search/MangaSearchTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Search;
+namespace JikanTest\Parser\Search;
 
 use Jikan\MyAnimeList\MalClient;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class MangaSearchTest
@@ -105,7 +105,7 @@ public function it_gets_the_end_date()
      */
     public function it_gets_the_members()
     {
-        self::assertEquals($this->manga->getMembers(), 6906);
+        self::assertEquals($this->manga->getMembers(), 7680);
     }
 
     /**
diff --git a/test/JikanTest/Parser/Search/PersonSearchTest.php b/test/unit/Parser/Search/PersonSearchTest.php
similarity index 95%
rename from test/JikanTest/Parser/Search/PersonSearchTest.php
rename to test/unit/Parser/Search/PersonSearchTest.php
index 121ef0d5..9b60e9f8 100644
--- a/test/JikanTest/Parser/Search/PersonSearchTest.php
+++ b/test/unit/Parser/Search/PersonSearchTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Search;
+namespace JikanTest\Parser\Search;
 
 use Jikan\MyAnimeList\MalClient;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class PersonSearchTest
diff --git a/test/JikanTest/Parser/SeasonList/SeasonListItemParserTest.php b/test/unit/Parser/SeasonList/SeasonListItemParserTest.php
similarity index 85%
rename from test/JikanTest/Parser/SeasonList/SeasonListItemParserTest.php
rename to test/unit/Parser/SeasonList/SeasonListItemParserTest.php
index 7c4c92c9..6677a20c 100644
--- a/test/JikanTest/Parser/SeasonList/SeasonListItemParserTest.php
+++ b/test/unit/Parser/SeasonList/SeasonListItemParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\SeasonList;
+namespace JikanTest\Parser\SeasonList;
 
-use Jikan\Parser\SeasonList\HttpClientWrapper;
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\SeasonList\SeasonListItemParser;
-use TestCase;
+use JikanTest\TestCase;
 
 class SeasonListItemParserTest extends TestCase
 {
@@ -30,7 +30,7 @@ public function setUp(): void
      */
     public function it_gets_the_year(): void
     {
-        self::assertEquals(2023, $this->parser->getYear());
+        self::assertEquals(2024, $this->parser->getYear());
     }
 
     /**
diff --git a/test/JikanTest/Parser/SeasonList/SeasonListParserTest.php b/test/unit/Parser/SeasonList/SeasonListParserTest.php
similarity index 83%
rename from test/JikanTest/Parser/SeasonList/SeasonListParserTest.php
rename to test/unit/Parser/SeasonList/SeasonListParserTest.php
index 2ffe056a..4ef619b2 100644
--- a/test/JikanTest/Parser/SeasonList/SeasonListParserTest.php
+++ b/test/unit/Parser/SeasonList/SeasonListParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\SeasonList;
+namespace JikanTest\Parser\SeasonList;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\SeasonList\SeasonListItem;
 use Jikan\Parser\SeasonList\SeasonListParser;
-use JikanTest\Parser\SeasonList\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class SeasonListParserTest
@@ -22,7 +22,7 @@ public function setUp(): void
         parent::setUp();
 
         $request = new \Jikan\Request\SeasonList\SeasonListRequest();
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', $request->getPath());
         $this->parser = new SeasonListParser($crawler);
     }
diff --git a/test/JikanTest/Parser/Seasonal/SeasonalAnimeParserTest.php b/test/unit/Parser/Seasonal/SeasonalAnimeParserTest.php
similarity index 98%
rename from test/JikanTest/Parser/Seasonal/SeasonalAnimeParserTest.php
rename to test/unit/Parser/Seasonal/SeasonalAnimeParserTest.php
index 50827025..dd9ff5d8 100644
--- a/test/JikanTest/Parser/Seasonal/SeasonalAnimeParserTest.php
+++ b/test/unit/Parser/Seasonal/SeasonalAnimeParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Seasonal;
+namespace JikanTest\Parser\Seasonal;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Common\AnimeCardParser;
-use JikanTest\Parser\Seasonal\HttpClientWrapper;
 use Symfony\Component\DomCrawler\Crawler;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class SeasonalParserTest
diff --git a/test/JikanTest/Parser/Seasonal/SeasonalParserTest.php b/test/unit/Parser/Seasonal/SeasonalParserTest.php
similarity index 91%
rename from test/JikanTest/Parser/Seasonal/SeasonalParserTest.php
rename to test/unit/Parser/Seasonal/SeasonalParserTest.php
index a4fcddbd..50ed9d2e 100644
--- a/test/JikanTest/Parser/Seasonal/SeasonalParserTest.php
+++ b/test/unit/Parser/Seasonal/SeasonalParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\Seasonal;
+namespace JikanTest\Parser\Seasonal;
 
-use JikanTest\Parser\Seasonal\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 /**
  * Class SeasonalParserTest
diff --git a/test/JikanTest/Parser/Top/TopAnimeParserTest.php b/test/unit/Parser/Top/TopAnimeParserTest.php
similarity index 93%
rename from test/JikanTest/Parser/Top/TopAnimeParserTest.php
rename to test/unit/Parser/Top/TopAnimeParserTest.php
index 95f6c88b..941e6ab3 100644
--- a/test/JikanTest/Parser/Top/TopAnimeParserTest.php
+++ b/test/unit/Parser/Top/TopAnimeParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Top;
+namespace JikanTest\Parser\Top;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Top\TopListItemParser;
-use JikanTest\Parser\Top\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class TopAnimeParserTest
@@ -20,7 +20,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/topanime.php');
 
         $this->parser = new TopListItemParser(
diff --git a/test/JikanTest/Parser/Top/TopCharacterParserTest.php b/test/unit/Parser/Top/TopCharacterParserTest.php
similarity index 93%
rename from test/JikanTest/Parser/Top/TopCharacterParserTest.php
rename to test/unit/Parser/Top/TopCharacterParserTest.php
index a9e192b3..e247cf71 100644
--- a/test/JikanTest/Parser/Top/TopCharacterParserTest.php
+++ b/test/unit/Parser/Top/TopCharacterParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Top;
+namespace JikanTest\Parser\Top;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Common\MalUrl;
 use Jikan\Parser\Top\TopListItemParser;
-use JikanTest\Parser\Top\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class TopCharacterParserTest
@@ -21,7 +21,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/character.php');
 
         $this->parser = new TopListItemParser(
diff --git a/test/JikanTest/Parser/Top/TopMangaParserTest.php b/test/unit/Parser/Top/TopMangaParserTest.php
similarity index 94%
rename from test/JikanTest/Parser/Top/TopMangaParserTest.php
rename to test/unit/Parser/Top/TopMangaParserTest.php
index c702ba4f..34206006 100644
--- a/test/JikanTest/Parser/Top/TopMangaParserTest.php
+++ b/test/unit/Parser/Top/TopMangaParserTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Parser\Top;
+namespace JikanTest\Parser\Top;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Top\TopListItemParser;
-use JikanTest\Parser\Top\Client;
 use Symfony\Component\DomCrawler\Crawler;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class TopMangaParserTest
@@ -26,7 +26,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $this->crawler = $crawler = $client->request('GET', 'https://myanimelist.net/topmanga.php');
 
         $this->parser = new TopListItemParser(
diff --git a/test/JikanTest/Parser/Top/TopPeopleParserTest.php b/test/unit/Parser/Top/TopPeopleParserTest.php
similarity index 92%
rename from test/JikanTest/Parser/Top/TopPeopleParserTest.php
rename to test/unit/Parser/Top/TopPeopleParserTest.php
index 9a3103c1..bfbeb053 100644
--- a/test/JikanTest/Parser/Top/TopPeopleParserTest.php
+++ b/test/unit/Parser/Top/TopPeopleParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\Top;
+namespace JikanTest\Parser\Top;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\Top\TopListItemParser;
-use JikanTest\Parser\Top\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class TopPeopleParserTest
@@ -20,7 +20,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/people.php');
 
         $this->parser = new TopListItemParser(
diff --git a/test/JikanTest/Parser/UserFriend/FriendParserTest.php b/test/unit/Parser/UserFriend/FriendParserTest.php
similarity index 69%
rename from test/JikanTest/Parser/UserFriend/FriendParserTest.php
rename to test/unit/Parser/UserFriend/FriendParserTest.php
index 20b82b74..14c96e14 100644
--- a/test/JikanTest/Parser/UserFriend/FriendParserTest.php
+++ b/test/unit/Parser/UserFriend/FriendParserTest.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Parser\UserFriend;
+namespace JikanTest\Parser\UserFriend;
 
-use JikanTest\Parser\User\Friends\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 class FriendParserTest extends TestCase
 {
     /**
      * @var \Jikan\Parser\User\Friends\FriendParser
      */
-    private $parser;
+    private \Jikan\Parser\User\Friends\FriendParser $parser;
 
     public function setUp(): void
     {
         parent::setUp();
 
         $client = new HttpClientWrapper($this->httpClient);
-        $crawler = $client->request('GET', 'https://myanimelist.net/profile/morshuwarrior/friends');
+        $crawler = $client->request('GET', 'https://myanimelist.net/profile/nekomata1037/friends');
         $this->parser = new \Jikan\Parser\User\Friends\FriendParser(
             $crawler->filterXPath(
                 '//div[contains(@class, "boxlist-container")]/div[contains(@class, "boxlist")][3]'
@@ -30,7 +30,7 @@ public function setUp(): void
      */
     public function it_gets_the_name()
     {
-        self::assertEquals('EmperorKaido', $this->parser->getName());
+        self::assertEquals('sandshark', $this->parser->getName());
     }
 
     /**
@@ -38,7 +38,7 @@ public function it_gets_the_name()
      */
     public function it_gets_the_url()
     {
-        self::assertEquals('https://myanimelist.net/profile/EmperorKaido', $this->parser->getUrl());
+        self::assertEquals('https://myanimelist.net/profile/sandshark', $this->parser->getUrl());
     }
 
     /**
@@ -47,7 +47,7 @@ public function it_gets_the_url()
     public function it_gets_the_avatar()
     {
         self::assertEquals(
-            'https://cdn.myanimelist.net/images/userimages/5229794.jpg?t=1664642400',
+            'https://cdn.myanimelist.net/s/common/userimages/7168664d-c9f3-4e6c-9936-bf7b3cb25e6b_76w?s=2f3e2ce6c0bed17cb41fd558d269f311',
             $this->parser->getAvatar()
         );
     }
@@ -58,7 +58,7 @@ public function it_gets_the_avatar()
     public function it_gets_friends_since()
     {
         self::assertEquals(
-            '2019-11-14 12:08',
+            '2018-07-26 08:45',
             $this->parser->getFriendsSince()->format('Y-m-d H:i')
         );
     }
diff --git a/test/JikanTest/Parser/UserHistory/UserHistoryParserTest.php b/test/unit/Parser/UserHistory/UserHistoryParserTest.php
similarity index 91%
rename from test/JikanTest/Parser/UserHistory/UserHistoryParserTest.php
rename to test/unit/Parser/UserHistory/UserHistoryParserTest.php
index 391c2a7b..b268402b 100644
--- a/test/JikanTest/Parser/UserHistory/UserHistoryParserTest.php
+++ b/test/unit/Parser/UserHistory/UserHistoryParserTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Parser\UserHistory;
+namespace JikanTest\Parser\UserHistory;
 
-use JikanTest\Parser\UserHistory\HttpClientWrapper;
-use TestCase;
+use Jikan\Http\HttpClientWrapper;
+use JikanTest\TestCase;
 
 /**
  * Class HistoryParserTest
diff --git a/test/JikanTest/Parser/UserProfile/UserProfileParserTest.php b/test/unit/Parser/UserProfile/UserProfileParserTest.php
similarity index 93%
rename from test/JikanTest/Parser/UserProfile/UserProfileParserTest.php
rename to test/unit/Parser/UserProfile/UserProfileParserTest.php
index 959363e9..17276ed9 100644
--- a/test/JikanTest/Parser/UserProfile/UserProfileParserTest.php
+++ b/test/unit/Parser/UserProfile/UserProfileParserTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Parser\UserProfile;
+namespace JikanTest\Parser\UserProfile;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Parser\User\Profile\UserProfileParser;
-use JikanTest\Parser\User\Profile\HttpClientWrapper;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class ProfileParserTest
@@ -47,7 +47,7 @@ public function it_gets_the_url()
     public function it_gets_the_image()
     {
         self::assertEquals(
-            'https://cdn.myanimelist.net/images/userimages/3600201.jpg?t=1664231400',
+            'https://cdn.myanimelist.net/s/common/userimages/7168664d-c9f3-4e6c-9936-bf7b3cb25e6b_225w?s=6a5507ec62b4f11918233a31f37a0490',
             $this->parser->getImageUrl()
         );
     }
diff --git a/test/JikanTest/Parser/Video/AnimeVideoParserTest.php b/test/unit/Parser/Video/AnimeVideoParserTest.php
similarity index 86%
rename from test/JikanTest/Parser/Video/AnimeVideoParserTest.php
rename to test/unit/Parser/Video/AnimeVideoParserTest.php
index a2d5926f..d81a02f3 100644
--- a/test/JikanTest/Parser/Video/AnimeVideoParserTest.php
+++ b/test/unit/Parser/Video/AnimeVideoParserTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Parser\Video;
+namespace JikanTest\Parser\Video;
 
+use Jikan\Http\HttpClientWrapper;
 use Jikan\Model\Anime\PromoListItem;
 use Jikan\Model\Anime\StreamEpisodeListItem;
 use Jikan\Parser\Anime\VideosParser;
 use JikanTest\Parser\Video\AnimeVideoParser;
-use JikanTest\Parser\Video\Client;
-use TestCase;
+use JikanTest\TestCase;
 
 /**
  * Class AnimeVideoParserTest
@@ -23,7 +23,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $client = new Client($this->httpClient);
+        $client = new HttpClientWrapper($this->httpClient);
         $crawler = $client->request('GET', 'https://myanimelist.net/anime/1/_/video');
         $this->parser = new VideosParser($crawler);
     }
diff --git a/test/JikanTest/TestCase.php b/test/unit/TestCase.php
similarity index 87%
rename from test/JikanTest/TestCase.php
rename to test/unit/TestCase.php
index 3f096eeb..37c69cf2 100644
--- a/test/JikanTest/TestCase.php
+++ b/test/unit/TestCase.php
@@ -4,13 +4,20 @@
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
+/**
+ *
+ */
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
+
     /**
-     * @var HttpClientInterface
+     * @var HttpClientInterface|MockHttpClient
      */
     protected HttpClientInterface|MockHttpClient $httpClient;
 
+    /**
+     * @return void
+     */
     protected function setUp(): void
     {
         parent::setUp();