diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index e031ee7..3badd79 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -68,7 +68,7 @@
         'whitespace_after_comma_in_array' => true,
     ])
     ->setFinder(PhpCsFixer\Finder::create()
-        ->exclude(['vendor', 'tests/Http/Responses/metadata'])
+        ->exclude(['vendor', 'tests/Unit/Http/Responses/metadata'])
         ->in(__DIR__)
     )
     ;
diff --git a/composer.json b/composer.json
index b9c0bca..7c9e3fc 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
   "require-dev": {
     "roave/security-advisories": "dev-latest",
     "friendsofphp/php-cs-fixer": "^3.52",
-    "phpunit/phpunit": "^10.0",
+    "phpunit/phpunit": "^10.5",
     "larastan/larastan": "^2.9",
     "orchestra/testbench": "^8.9|^9.0",
     "phpstan/phpstan-phpunit": "^1.3",
@@ -47,7 +47,8 @@
     "vimeo/psalm": "^5.23",
     "psalm/plugin-laravel": "^2.10",
     "psalm/plugin-phpunit": "^0.19",
-    "infection/infection": "^0.27.10"
+    "infection/infection": "^0.27.10",
+    "laravel/framework": "^10.48"
   },
   "scripts": {
     "lint": "parallel-lint --exclude .git --exclude vendor .",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a8dd75f..cffad2a 100755
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,9 +6,14 @@
       <text outputFile="php://stdout" showUncoveredFiles="false"/>
     </report>
   </coverage>
-  <testsuite name="Laravel-JMS-Serializer">
-    <directory suffix="Test.php">tests</directory>
-  </testsuite>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Feature">
+      <directory suffix="Test.php">tests/Feature</directory>
+    </testsuite>
+  </testsuites>
   <source>
     <include>
       <directory suffix=".php">src</directory>
diff --git a/tests/Feature/ServiceProviderTest.php b/tests/Feature/ServiceProviderTest.php
new file mode 100644
index 0000000..129b7de
--- /dev/null
+++ b/tests/Feature/ServiceProviderTest.php
@@ -0,0 +1,72 @@
+<?php
+declare(strict_types=1);
+
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Feature;
+
+use Dropelikeit\LaravelJmsSerializer\Contracts\ResponseBuilder;
+use Dropelikeit\LaravelJmsSerializer\Http\Responses\ResponseFactory;
+use Dropelikeit\LaravelJmsSerializer\ServiceProvider;
+use Illuminate\Config\Repository;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\TestCase;
+
+final class ServiceProviderTest extends TestCase
+{
+    private readonly Application $application;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $configRepository = $this
+            ->getMockBuilder(Repository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $configRepository
+            ->expects(self::once())
+            ->method('set')
+            ->with('laravel-jms-serializer', [
+                'serialize_null' => true,
+                'serialize_type' => 'json', // Contracts\Config::SERIALIZE_TYPE_XML
+                'debug' => false,
+                'add_default_handlers' => true,
+                'custom_handlers' => [],
+            ]);
+
+        $configRepository
+            ->expects(self::exactly(6))
+            ->method('get')
+            ->willReturnOnConsecutiveCalls([], true, 'json', false, true, []);
+
+        Storage::shouldReceive('exists')->once()->with(__DIR__ . '/data/storage/framework/cache/data')->andReturn(true);
+
+        $this->application = new Application();
+        $this->application->useStoragePath(__DIR__ . '/data/storage');
+
+        $this->application->bind('config', fn () => $configRepository);
+
+        $this->application->register(ServiceProvider::class);
+    }
+
+    /**
+     * @test
+     */
+    public function canBuildResponseFactoryByIdFromConfiguredServiceProvider(): void
+    {
+        $responseFactory = $this->application->get('ResponseFactory');
+
+        $this->assertInstanceOf(ResponseBuilder::class, $responseFactory);
+    }
+
+    /**
+     * @test
+     */
+    public function canBuildResponseFactoryByClassConfiguredServiceProvider(): void
+    {
+        $responseFactory = $this->application->get(ResponseFactory::class);
+
+        $this->assertInstanceOf(ResponseBuilder::class, $responseFactory);
+    }
+}
diff --git a/tests/Feature/data/.gitkeep b/tests/Feature/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/tests/Config/ConfigTest.php b/tests/Unit/Config/ConfigTest.php
similarity index 99%
rename from tests/Config/ConfigTest.php
rename to tests/Unit/Config/ConfigTest.php
index bd8b8c3..c5f5424 100644
--- a/tests/Config/ConfigTest.php
+++ b/tests/Unit/Config/ConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\Config;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\Config;
 
 use Dropelikeit\LaravelJmsSerializer\Config\Config;
 use Dropelikeit\LaravelJmsSerializer\Contracts\CustomHandlerConfiguration;
diff --git a/tests/Facades/ResponseFactoryFacadeTest.php b/tests/Unit/Facades/ResponseFactoryFacadeTest.php
similarity index 85%
rename from tests/Facades/ResponseFactoryFacadeTest.php
rename to tests/Unit/Facades/ResponseFactoryFacadeTest.php
index f320a60..6624f9d 100644
--- a/tests/Facades/ResponseFactoryFacadeTest.php
+++ b/tests/Unit/Facades/ResponseFactoryFacadeTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\Facades;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\Facades;
 
 use Dropelikeit\LaravelJmsSerializer\Facades\ResponseFactoryFacade;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Http/Responses/ResponseFactoryTest.php b/tests/Unit/Http/Responses/ResponseFactoryTest.php
similarity index 96%
rename from tests/Http/Responses/ResponseFactoryTest.php
rename to tests/Unit/Http/Responses/ResponseFactoryTest.php
index 2a86c04..e35a131 100644
--- a/tests/Http/Responses/ResponseFactoryTest.php
+++ b/tests/Unit/Http/Responses/ResponseFactoryTest.php
@@ -1,17 +1,17 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\Http\Responses;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\Http\Responses;
 
 use Dropelikeit\LaravelJmsSerializer\Config\Config;
 use Dropelikeit\LaravelJmsSerializer\Contracts;
 use Dropelikeit\LaravelJmsSerializer\Exception\SerializeType;
 use Dropelikeit\LaravelJmsSerializer\Http\Responses\ResponseFactory;
 use Dropelikeit\LaravelJmsSerializer\Serializer\Factory;
-use Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\Dummy;
-use Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\JsonDummy;
-use Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\Response;
-use Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\XmlDummy;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\Dummy;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\JsonDummy;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\Response;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\XmlDummy;
 use Illuminate\Http\Response as LaravelResponse;
 use InvalidArgumentException;
 use JMS\Serializer\SerializationContext;
@@ -90,7 +90,7 @@ public function canCreateFromArrayIterator(): void
 
         $responseFactory = new ResponseFactory((new Factory())->getSerializer($this->config), $this->config);
 
-        $response = $responseFactory->create(Response::create([new \Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\Response\Item()]));
+        $response = $responseFactory->create(Response::create([new Response\Item()]));
 
         self::assertEquals(200, $response->getStatusCode());
         self::assertEquals('[{"key":"magic_number","value":12}]', $response->getContent());
diff --git a/tests/Serializer/FactoryTest.php b/tests/Unit/Serializer/FactoryTest.php
similarity index 98%
rename from tests/Serializer/FactoryTest.php
rename to tests/Unit/Serializer/FactoryTest.php
index b8d2b04..3e4f0ce 100644
--- a/tests/Serializer/FactoryTest.php
+++ b/tests/Unit/Serializer/FactoryTest.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\Serializer;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\Serializer;
 
 use DateTime;
 use Dropelikeit\LaravelJmsSerializer\Config\Config;
 use Dropelikeit\LaravelJmsSerializer\Contracts\CustomHandlerConfiguration;
 use Dropelikeit\LaravelJmsSerializer\Serializer\Factory;
-use Dropelikeit\LaravelJmsSerializer\Tests\Serializer\data\CustomHandler;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\Serializer\data\CustomHandler;
 use InvalidArgumentException;
 use JMS\Serializer\Context;
 use JMS\Serializer\Handler\HandlerRegistry;
diff --git a/tests/Serializer/data/CustomHandler.php b/tests/Unit/Serializer/data/CustomHandler.php
similarity index 92%
rename from tests/Serializer/data/CustomHandler.php
rename to tests/Unit/Serializer/data/CustomHandler.php
index ebb789b..a0f142b 100644
--- a/tests/Serializer/data/CustomHandler.php
+++ b/tests/Unit/Serializer/data/CustomHandler.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\Serializer\data;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\Serializer\data;
 
 use Dropelikeit\LaravelJmsSerializer\Contracts\CustomHandlerConfiguration;
 use JMS\Serializer\Context;
diff --git a/tests/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php
similarity index 98%
rename from tests/ServiceProviderTest.php
rename to tests/Unit/ServiceProviderTest.php
index f8809a6..bd49cca 100644
--- a/tests/ServiceProviderTest.php
+++ b/tests/Unit/ServiceProviderTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit;
 
 use Dropelikeit\LaravelJmsSerializer\Config\Config;
 use Dropelikeit\LaravelJmsSerializer\Http\Responses\ResponseFactory;
diff --git a/tests/data/ResponseFactory/Dummy.php b/tests/Unit/data/ResponseFactory/Dummy.php
similarity index 84%
rename from tests/data/ResponseFactory/Dummy.php
rename to tests/Unit/data/ResponseFactory/Dummy.php
index f956957..fdf54c9 100644
--- a/tests/data/ResponseFactory/Dummy.php
+++ b/tests/Unit/data/ResponseFactory/Dummy.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory;
 
-use Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\Response\Item;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\Response\Item;
 use JMS\Serializer\Annotation as Serializer;
 
 /**
diff --git a/tests/data/ResponseFactory/JsonDummy.php b/tests/Unit/data/ResponseFactory/JsonDummy.php
similarity index 81%
rename from tests/data/ResponseFactory/JsonDummy.php
rename to tests/Unit/data/ResponseFactory/JsonDummy.php
index b9548cb..e2b875c 100644
--- a/tests/data/ResponseFactory/JsonDummy.php
+++ b/tests/Unit/data/ResponseFactory/JsonDummy.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/tests/data/ResponseFactory/Response.php b/tests/Unit/data/ResponseFactory/Response.php
similarity index 81%
rename from tests/data/ResponseFactory/Response.php
rename to tests/Unit/data/ResponseFactory/Response.php
index da9e0bc..730444d 100644
--- a/tests/data/ResponseFactory/Response.php
+++ b/tests/Unit/data/ResponseFactory/Response.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory;
 
 use ArrayIterator;
-use Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\Response\Item;
+use Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\Response\Item;
 use Webmozart\Assert\Assert;
 
 /**
diff --git a/tests/data/ResponseFactory/Response/Item.php b/tests/Unit/data/ResponseFactory/Response/Item.php
similarity index 87%
rename from tests/data/ResponseFactory/Response/Item.php
rename to tests/Unit/data/ResponseFactory/Response/Item.php
index 714b365..1c90bc1 100644
--- a/tests/data/ResponseFactory/Response/Item.php
+++ b/tests/Unit/data/ResponseFactory/Response/Item.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory\Response;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/tests/data/ResponseFactory/XmlDummy.php b/tests/Unit/data/ResponseFactory/XmlDummy.php
similarity index 83%
rename from tests/data/ResponseFactory/XmlDummy.php
rename to tests/Unit/data/ResponseFactory/XmlDummy.php
index 69c346f..aa68d11 100644
--- a/tests/data/ResponseFactory/XmlDummy.php
+++ b/tests/Unit/data/ResponseFactory/XmlDummy.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Dropelikeit\LaravelJmsSerializer\Tests\data\ResponseFactory;
+namespace Dropelikeit\LaravelJmsSerializer\Tests\Unit\data\ResponseFactory;
 
 use JMS\Serializer\Annotation\XmlAttribute;
 use JMS\Serializer\Annotation\XmlRoot;
diff --git a/tests/data/ResponseFactory/dummy_array.php b/tests/Unit/data/ResponseFactory/dummy_array.php
similarity index 100%
rename from tests/data/ResponseFactory/dummy_array.php
rename to tests/Unit/data/ResponseFactory/dummy_array.php