diff --git a/.gitignore b/.gitignore
index b5ebe21..9ad8f32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .idea
-/vendor/
\ No newline at end of file
+/vendor/
+composer.lock
+.phpunit.result.cache
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 2f64ca3..e21caa6 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,26 @@
 {
     "name": "madmagestelegram/types",
     "description": "Representation of telegram bot types in php classes",
+    "keywords": [
+        "telegram",
+        "types",
+        "rpc",
+        "php"
+    ],
     "type": "library",
     "license": "MIT",
     "require": {
-        "php": "^7.2|^8.0",
+        "php": ">=7.4",
         "ext-json": "*",
         "jms/serializer": "^3.1"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5"
+    },
     "autoload": {
         "psr-4": {
-            "MadmagesTelegram\\Types\\": "src/"
+            "MadmagesTelegram\\Types\\": "src/",
+            "Tests\\": "tests/"
         }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..6770863
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./app</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Main">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
new file mode 100644
index 0000000..377b9fd
--- /dev/null
+++ b/tests/BaseTestCase.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Tests;
+
+class BaseTestCase extends \PHPUnit\Framework\TestCase
+{
+    public static function clearNullFields(array $data): array
+    {
+        $data = array_filter($data);
+        array_walk(
+            $data,
+            static function (&$data) {
+                if (is_array($data)) {
+                    $data = self::clearNullFields($data);
+                }
+            }
+        );
+
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/tests/Clients/ClientTest.php b/tests/Clients/ClientTest.php
new file mode 100644
index 0000000..d7bd177
--- /dev/null
+++ b/tests/Clients/ClientTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Clients;
+
+use Tests\BaseTestCase;
+
+class ClientTest extends BaseTestCase
+{
+    /**
+     * @dataProvider clientDataProvider
+     */
+    public function testClient(array $sampleData): void
+    {
+        $client = new TestClient();
+        $data = $client->sendMessage(1, 'test');
+        self::assertSame($sampleData, self::clearNullFields($data));
+    }
+
+    public function testTypedClient(): void
+    {
+        $message = (new TestTypesClient())->sendMessage(1, 'test');
+        self::assertSame(TestTypesClient::SAMPLE_DATA, self::clearNullFields($message->_getData()));
+    }
+
+    public function clientDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'sendMessage',
+                    [
+                        'chat_id' => 1,
+                        'text' => 'test',
+                    ],
+                ],
+            ],
+        ];
+    }
+}
\ No newline at end of file
diff --git a/tests/Clients/TestClient.php b/tests/Clients/TestClient.php
new file mode 100644
index 0000000..bf766c5
--- /dev/null
+++ b/tests/Clients/TestClient.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\Clients;
+
+use MadmagesTelegram\Types\Client;
+
+class TestClient extends Client
+{
+    public function _apiCall(string $method, array $parameters)
+    {
+        return [$method, $parameters];
+    }
+}
\ No newline at end of file
diff --git a/tests/Clients/TestTypesClient.php b/tests/Clients/TestTypesClient.php
new file mode 100644
index 0000000..66561f3
--- /dev/null
+++ b/tests/Clients/TestTypesClient.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Clients;
+
+use MadmagesTelegram\Types\TypedClient;
+
+class TestTypesClient extends TypedClient
+{
+
+    public const SAMPLE_DATA = [
+        'message_id' => 1,
+        'from' =>
+            [
+                'id' => 1,
+                'is_bot' => true,
+                'first_name' => 'test',
+                'username' => 'test',
+            ],
+        'date' => 1,
+        'chat' =>
+            [
+                'id' => 1,
+                'type' => 'private',
+                'username' => 'test',
+                'first_name' => 'test',
+            ],
+        'text' => 'test',
+    ];
+
+    public function _apiCall(string $method, array $parameters): string
+    {
+        return json_encode(self::SAMPLE_DATA, JSON_THROW_ON_ERROR);
+    }
+}
\ No newline at end of file
diff --git a/tests/Types/MessageTest.php b/tests/Types/MessageTest.php
new file mode 100644
index 0000000..b12a018
--- /dev/null
+++ b/tests/Types/MessageTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Tests\Types;
+
+use MadmagesTelegram\Types\Serializer;
+use MadmagesTelegram\Types\Type\Message;
+use Tests\BaseTestCase;
+
+class MessageTest extends BaseTestCase
+{
+    /**
+     * @dataProvider messageDataProvider
+     */
+    public function testSerializeMessage(array $sampleMessage): void
+    {
+        /** @var Message $message */
+        $message = Serializer::deserialize(json_encode($sampleMessage, JSON_THROW_ON_ERROR), Message::class);
+
+        $messageData = self::clearNullFields($message->_getData());
+
+        self::assertSame($sampleMessage, $messageData);
+        self::assertSame($message->getFrom()->getUsername(), 'test');
+    }
+
+    public function messageDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'message_id' => 1,
+                    'from' =>
+                        [
+                            'id' => 1,
+                            'is_bot' => true,
+                            'first_name' => 'test',
+                            'username' => 'test',
+                        ],
+                    'date' => 1,
+                    'chat' =>
+                        [
+                            'id' => 1,
+                            'type' => 'private',
+                            'username' => 'test',
+                            'first_name' => 'test',
+                        ],
+                    'text' => 'test',
+                ],
+            ],
+        ];
+    }
+}
\ No newline at end of file