diff --git a/src/test/java/io/blamer/bot/answer/generator/impl/StartMessageGeneratorTest.java b/src/test/java/io/blamer/bot/answer/generator/impl/StartMessageGeneratorTest.java
new file mode 100644
index 0000000..327431d
--- /dev/null
+++ b/src/test/java/io/blamer/bot/answer/generator/impl/StartMessageGeneratorTest.java
@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) Copyright (c) 2023 Blamer.io
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.blamer.bot.answer.generator.impl;
+
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.telegram.telegrambots.meta.api.objects.Message;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.meta.api.objects.commands.BotCommand;
+
+@ExtendWith(MockitoExtension.class)
+class StartMessageGeneratorTest {
+
+    @Test
+    void createsStartMessage(@Mock final Update update, @Mock final Message message) {
+        Mockito.when(update.getMessage()).thenReturn(message);
+        Assertions.assertNotNull(new StartMessageGenerator().messageFromUpdate(update));
+    }
+
+    @Test
+    void createsDescription() {
+        final BotCommand actual = new StartMessageGenerator().messageAsBotCommand();
+        MatcherAssert.assertThat(actual.getCommand(), Matchers.equalTo("/start"));
+        MatcherAssert.assertThat(
+            actual.getDescription(),
+            Matchers.equalTo("Just start command")
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/io/blamer/bot/answer/generator/impl/TokenMessageGeneratorTest.java b/src/test/java/io/blamer/bot/answer/generator/impl/TokenMessageGeneratorTest.java
new file mode 100644
index 0000000..2a52fff
--- /dev/null
+++ b/src/test/java/io/blamer/bot/answer/generator/impl/TokenMessageGeneratorTest.java
@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) Copyright (c) 2023 Blamer.io
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.blamer.bot.answer.generator.impl;
+
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.telegram.telegrambots.meta.api.objects.Message;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.meta.api.objects.commands.BotCommand;
+
+@ExtendWith(MockitoExtension.class)
+class TokenMessageGeneratorTest {
+
+    @Test
+    void createsStartMessage(@Mock final Update update, @Mock final Message message) {
+        Mockito.when(update.getMessage()).thenReturn(message);
+        Assertions.assertNotNull(new TokenMessageGenerator().messageFromUpdate(update));
+    }
+
+    @Test
+    void createsDescription() {
+        final BotCommand actual = new TokenMessageGenerator().messageAsBotCommand();
+        MatcherAssert.assertThat(actual.getCommand(), Matchers.equalTo("/token"));
+        MatcherAssert.assertThat(
+            actual.getDescription(),
+            Matchers.equalTo("Set GitHub token to get updates")
+        );
+    }
+}
\ No newline at end of file