From 0cb190e928e29e1c6a0d947a90e664c50ee7550c Mon Sep 17 00:00:00 2001
From: Alex Root Junior <jroot.junior@gmail.com>
Date: Sat, 11 Mar 2023 20:19:20 +0200
Subject: [PATCH] Update tests

---
 tests/mocked_bot.py                           | 10 +-
 .../test_session/test_aiohttp_session.py      | 74 ++++++++------
 .../test_session/test_base_session.py         | 97 ++++++++++---------
 .../test_methods/test_add_sticker_to_set.py   | 17 +---
 .../test_answer_callback_query.py             | 11 +--
 .../test_methods/test_answer_inline_query.py  | 46 +--------
 .../test_answer_pre_checkout_query.py         | 11 +--
 .../test_answer_shipping_query.py             | 11 +--
 .../test_methods/test_answer_web_app_query.py | 16 +--
 .../test_approve_chat_join_request.py         | 14 +--
 .../test_methods/test_ban_chat_member.py      | 11 +--
 .../test_methods/test_ban_chat_sender_chat.py | 16 +--
 tests/test_api/test_methods/test_base.py      | 64 +++---------
 tests/test_api/test_methods/test_close.py     | 13 +--
 .../test_methods/test_close_forum_topic.py    | 16 +--
 .../test_close_general_forum_topic.py         | 11 +--
 .../test_methods/test_copy_message.py         | 17 +---
 .../test_create_chat_invite_link.py           | 25 +----
 .../test_methods/test_create_forum_topic.py   | 20 +---
 .../test_methods/test_create_invoice_link.py  | 20 +---
 .../test_create_new_sticker_set.py            | 20 +---
 .../test_decline_chat_join_request.py         | 14 +--
 .../test_methods/test_delete_chat_photo.py    | 11 +--
 .../test_delete_chat_sticker_set.py           | 11 +--
 .../test_methods/test_delete_forum_topic.py   | 16 +--
 .../test_methods/test_delete_message.py       | 11 +--
 .../test_methods/test_delete_my_commands.py   | 11 +--
 .../test_delete_sticker_from_set.py           | 11 +--
 .../test_methods/test_delete_sticker_set.py   | 11 +--
 .../test_methods/test_delete_webhook.py       | 11 +--
 .../test_edit_chat_invite_link.py             | 23 +----
 .../test_methods/test_edit_forum_topic.py     | 19 +---
 .../test_edit_general_forum_topic.py          | 11 +--
 .../test_methods/test_edit_message_caption.py | 20 +---
 .../test_edit_message_live_location.py        | 13 +--
 .../test_methods/test_edit_message_media.py   | 13 +--
 .../test_edit_message_reply_markup.py         | 19 +---
 .../test_methods/test_edit_message_text.py    | 13 +--
 .../test_export_chat_invite_link.py           | 13 +--
 .../test_methods/test_forward_message.py      | 22 +----
 tests/test_api/test_methods/test_get_chat.py  | 13 +--
 .../test_get_chat_administrators.py           | 19 +---
 .../test_methods/test_get_chat_member.py      | 20 +---
 .../test_get_chat_member_count.py             | 11 +--
 .../test_methods/test_get_chat_menu_button.py | 13 +--
 .../test_get_custom_emoji_stickers.py         | 30 +-----
 tests/test_api/test_methods/test_get_file.py  | 13 +--
 .../test_get_forum_topic_icon_stickers.py     | 13 +--
 .../test_methods/test_get_game_high_scores.py | 19 +---
 tests/test_api/test_methods/test_get_me.py    | 15 +--
 .../test_methods/test_get_my_commands.py      | 11 +--
 ...est_get_my_default_administrator_rights.py | 26 +----
 .../test_methods/test_get_my_description.py   | 13 +--
 .../test_get_my_short_description.py          | 13 +--
 .../test_methods/test_get_sticker_set.py      | 32 +-----
 .../test_api/test_methods/test_get_updates.py | 11 +--
 .../test_get_user_profile_photos.py           | 20 +---
 .../test_methods/test_get_webhook_info.py     | 17 +---
 .../test_hide_general_forum_topic.py          | 11 +--
 .../test_api/test_methods/test_leave_chat.py  | 11 +--
 tests/test_api/test_methods/test_log_out.py   | 13 +--
 .../test_methods/test_pin_chat_message.py     | 11 +--
 .../test_methods/test_promote_chat_member.py  | 11 +--
 .../test_methods/test_reopen_forum_topic.py   | 16 +--
 .../test_reopen_general_forum_topic.py        | 11 +--
 .../test_methods/test_restrict_chat_member.py | 13 +--
 .../test_revoke_chat_invite_link.py           | 24 +----
 .../test_methods/test_send_animation.py       | 22 +----
 .../test_api/test_methods/test_send_audio.py  | 20 +---
 .../test_methods/test_send_chat_action.py     | 20 +---
 .../test_methods/test_send_contact.py         | 20 +---
 tests/test_api/test_methods/test_send_dice.py | 11 +--
 .../test_methods/test_send_document.py        | 20 +---
 tests/test_api/test_methods/test_send_game.py | 26 +----
 .../test_methods/test_send_invoice.py         | 35 +------
 .../test_methods/test_send_location.py        | 20 +---
 .../test_methods/test_send_media_group.py     | 44 +--------
 .../test_methods/test_send_message.py         | 20 +---
 .../test_api/test_methods/test_send_photo.py  | 22 +----
 tests/test_api/test_methods/test_send_poll.py | 35 +------
 .../test_methods/test_send_sticker.py         | 28 +-----
 .../test_api/test_methods/test_send_venue.py  | 32 +-----
 .../test_api/test_methods/test_send_video.py  | 22 +----
 .../test_methods/test_send_video_note.py      | 26 +----
 .../test_api/test_methods/test_send_voice.py  | 20 +---
 ...est_set_chat_administrator_custom_title.py | 13 +--
 .../test_methods/test_set_chat_description.py | 11 +--
 .../test_methods/test_set_chat_menu_button.py | 13 +--
 .../test_methods/test_set_chat_permissions.py | 13 +--
 .../test_methods/test_set_chat_photo.py       | 13 +--
 .../test_methods/test_set_chat_sticker_set.py | 11 +--
 .../test_methods/test_set_chat_title.py       | 11 +--
 ..._set_custom_emoji_sticker_set_thumbnail.py | 15 +--
 .../test_methods/test_set_game_score.py       | 13 +--
 .../test_methods/test_set_my_commands.py      | 14 +--
 ...est_set_my_default_administrator_rights.py | 13 +--
 .../test_methods/test_set_my_description.py   | 11 +--
 .../test_set_my_short_description.py          | 11 +--
 .../test_set_passport_data_errors.py          | 11 +--
 .../test_set_sticker_emoji_list.py            | 11 +--
 .../test_methods/test_set_sticker_keywords.py | 11 +--
 .../test_set_sticker_mask_position.py         | 11 +--
 .../test_set_sticker_position_in_set.py       | 11 +--
 .../test_set_sticker_set_thumbnail.py         | 13 +--
 .../test_set_sticker_set_title.py             | 11 +--
 .../test_api/test_methods/test_set_webhook.py | 11 +--
 .../test_stop_message_live_location.py        | 13 +--
 tests/test_api/test_methods/test_stop_poll.py | 25 +----
 .../test_methods/test_unban_chat_member.py    | 11 +--
 .../test_unban_chat_sender_chat.py            | 16 +--
 .../test_unhide_general_forum_topic.py        | 11 +--
 .../test_unpin_all_chat_messages.py           | 15 +--
 .../test_unpin_all_forum_topic_messages.py    | 16 +--
 .../test_methods/test_unpin_chat_message.py   | 11 +--
 .../test_methods/test_upload_sticker_file.py  | 17 +---
 tests/test_dispatcher/test_dispatcher.py      |  6 +-
 tests/test_webhook/test_aiohtt_server.py      |  3 +-
 117 files changed, 230 insertions(+), 1852 deletions(-)

diff --git a/tests/mocked_bot.py b/tests/mocked_bot.py
index de823be8..29c477a0 100644
--- a/tests/mocked_bot.py
+++ b/tests/mocked_bot.py
@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, AsyncGenerator, Deque, Optional, Type
 from aiogram import Bot
 from aiogram.client.session.base import BaseSession
 from aiogram.methods import TelegramMethod
-from aiogram.methods.base import Request, Response, TelegramType
+from aiogram.methods.base import Response, TelegramType
 from aiogram.types import UNSET_PARSE_MODE, ResponseParameters, User
 
 
@@ -12,14 +12,14 @@ class MockedSession(BaseSession):
     def __init__(self):
         super(MockedSession, self).__init__()
         self.responses: Deque[Response[TelegramType]] = deque()
-        self.requests: Deque[Request] = deque()
+        self.requests: Deque[TelegramMethod[TelegramType]] = deque()
         self.closed = True
 
     def add_result(self, response: Response[TelegramType]) -> Response[TelegramType]:
         self.responses.append(response)
         return response
 
-    def get_request(self) -> Request:
+    def get_request(self) -> TelegramMethod[TelegramType]:
         return self.requests.pop()
 
     async def close(self):
@@ -32,7 +32,7 @@ class MockedSession(BaseSession):
         timeout: Optional[int] = UNSET_PARSE_MODE,
     ) -> TelegramType:
         self.closed = False
-        self.requests.append(method.build_request(bot))
+        self.requests.append(method)
         response: Response[TelegramType] = self.responses.pop()
         self.check_response(
             method=method, status_code=response.error_code, content=response.json()
@@ -89,5 +89,5 @@ class MockedBot(Bot):
         self.session.add_result(response)
         return response
 
-    def get_request(self) -> Request:
+    def get_request(self) -> TelegramMethod[TelegramType]:
         return self.session.get_request()
diff --git a/tests/test_api/test_client/test_session/test_aiohttp_session.py b/tests/test_api/test_client/test_session/test_aiohttp_session.py
index a2431661..21b09b67 100644
--- a/tests/test_api/test_client/test_session/test_aiohttp_session.py
+++ b/tests/test_api/test_client/test_session/test_aiohttp_session.py
@@ -1,5 +1,5 @@
 import asyncio
-from typing import AsyncContextManager, AsyncGenerator
+from typing import Any, AsyncContextManager, AsyncGenerator
 from unittest.mock import AsyncMock, patch
 
 import aiohttp_socks
@@ -11,7 +11,7 @@ from aiogram import Bot
 from aiogram.client.session import aiohttp
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.exceptions import TelegramNetworkError
-from aiogram.methods import Request, TelegramMethod
+from aiogram.methods import TelegramMethod
 from aiogram.types import UNSET_PARSE_MODE, InputFile
 from tests.mocked_bot import MockedBot
 
@@ -103,44 +103,60 @@ class TestAiohttpSession:
             await session.close()
             mocked_close.assert_called_once()
 
-    def test_build_form_data_with_data_only(self):
-        request = Request(
-            method="method",
-            data={
-                "str": "value",
-                "int": 42,
-                "bool": True,
-                "unset": UNSET_PARSE_MODE,
-                "null": None,
-                "list": ["foo"],
-                "dict": {"bar": "baz"},
-            },
-        )
+    def test_build_form_data_with_data_only(self, bot: MockedBot):
+        class TestMethod(TelegramMethod[bool]):
+            __api_method__ = "test"
+            __returning__ = bool
+
+            str_: str
+            int_: int
+            bool_: bool
+            unset_: str = UNSET_PARSE_MODE
+            null_: None
+            list_: list[str]
+            dict_: dict[str, Any]
 
         session = AiohttpSession()
-        form = session.build_form_data(request)
+        form = session.build_form_data(
+            bot,
+            TestMethod(
+                str_="value",
+                int_=42,
+                bool_=True,
+                unset_=UNSET_PARSE_MODE,
+                null_=None,
+                list_=["foo"],
+                dict_={"bar": "baz"},
+            ),
+        )
 
         fields = form._fields
         assert len(fields) == 5
         assert all(isinstance(field[2], str) for field in fields)
-        assert "null" not in [item[0]["name"] for item in fields]
+        assert "null_" not in [item[0]["name"] for item in fields]
 
-    def test_build_form_data_with_files(self):
-        request = Request(
-            method="method",
-            data={"key": "value"},
-            files={"document": BareInputFile(filename="file.txt")},
-        )
+    def test_build_form_data_with_files(self, bot: Bot):
+        class TestMethod(TelegramMethod[bool]):
+            __api_method__ = "test"
+            __returning__ = bool
+
+            key: str
+            document: InputFile
 
         session = AiohttpSession()
-        form = session.build_form_data(request)
+        form = session.build_form_data(
+            bot,
+            TestMethod(key="value", document=BareInputFile(filename="file.txt")),
+        )
 
         fields = form._fields
 
-        assert len(fields) == 2
+        assert len(fields) == 3
         assert fields[1][0]["name"] == "document"
-        assert fields[1][0]["filename"] == "file.txt"
-        assert isinstance(fields[1][2], BareInputFile)
+        assert fields[1][2].startswith("attach://")
+        assert fields[2][0]["name"] == fields[1][2][9:]
+        assert fields[2][0]["filename"] == "file.txt"
+        assert isinstance(fields[2][2], BareInputFile)
 
     async def test_make_request(self, bot: MockedBot, aresponses: ResponsesMockServer):
         aresponses.add(
@@ -158,9 +174,7 @@ class TestAiohttpSession:
 
         class TestMethod(TelegramMethod[int]):
             __returning__ = int
-
-            def build_request(self, bot: Bot) -> Request:
-                return Request(method="method", data={})
+            __api_method__ = "method"
 
         call = TestMethod()
 
diff --git a/tests/test_api/test_client/test_session/test_base_session.py b/tests/test_api/test_client/test_session/test_base_session.py
index 82547f89..7c04bdb4 100644
--- a/tests/test_api/test_client/test_session/test_base_session.py
+++ b/tests/test_api/test_client/test_session/test_base_session.py
@@ -1,6 +1,6 @@
 import datetime
 import json
-from typing import AsyncContextManager, AsyncGenerator, Optional
+from typing import Any, AsyncContextManager, AsyncGenerator, Optional
 from unittest.mock import AsyncMock, patch
 
 import pytest
@@ -8,7 +8,7 @@ import pytest
 from aiogram import Bot
 from aiogram.client.session.base import BaseSession, TelegramType
 from aiogram.client.telegram import PRODUCTION, TelegramAPIServer
-from aiogram.enums import ChatType, TopicIconColor
+from aiogram.enums import ChatType, ParseMode, TopicIconColor
 from aiogram.exceptions import (
     ClientDecodeError,
     RestartingTelegram,
@@ -25,6 +25,7 @@ from aiogram.exceptions import (
 )
 from aiogram.methods import DeleteMessage, GetMe, TelegramMethod
 from aiogram.types import UNSET_PARSE_MODE, User
+from aiogram.types.base import UNSET_DISABLE_WEB_PAGE_PREVIEW, UNSET_PROTECT_CONTENT
 from tests.mocked_bot import MockedBot
 
 
@@ -42,11 +43,12 @@ class CustomSession(BaseSession):
         assert isinstance(method, TelegramMethod)
 
     async def stream_content(
-        self, url: str, timeout: int, chunk_size: int
+        self, url: str, timeout: int, chunk_size: int, raise_for_status: bool
     ) -> AsyncGenerator[bytes, None]:  # pragma: no cover
         assert isinstance(url, str)
         assert isinstance(timeout, int)
         assert isinstance(chunk_size, int)
+        assert isinstance(raise_for_status, bool)
         yield b"\f" * 10
 
 
@@ -82,58 +84,54 @@ class TestBaseSession:
         assert session.api == api
         assert "example.com" in session.api.base
 
-    def test_prepare_value(self):
+    @pytest.mark.parametrize(
+        "value,result",
+        [
+            [None, None],
+            ["text", "text"],
+            [ChatType.PRIVATE, "private"],
+            [TopicIconColor.RED, "16478047"],
+            [42, "42"],
+            [True, "true"],
+            [["test"], '["test"]'],
+            [["test", ["test"]], '["test", ["test"]]'],
+            [[{"test": "pass", "spam": None}], '[{"test": "pass"}]'],
+            [{"test": "pass", "number": 42, "spam": None}, '{"test": "pass", "number": 42}'],
+            [{"foo": {"test": "pass", "spam": None}}, '{"foo": {"test": "pass"}}'],
+            [
+                datetime.datetime(year=2017, month=5, day=17, hour=4, minute=11, second=42),
+                "1494983502",
+            ],
+        ],
+    )
+    def test_prepare_value(self, value: Any, result: str, bot: MockedBot):
         session = CustomSession()
 
-        now = datetime.datetime.now()
+        assert session.prepare_value(value, bot=bot, files={}) == result
 
-        assert session.prepare_value("text") == "text"
-        assert session.prepare_value(["test"]) == '["test"]'
-        assert session.prepare_value({"test": "ok"}) == '{"test": "ok"}'
-        assert session.prepare_value(now) == str(round(now.timestamp()))
-        assert isinstance(session.prepare_value(datetime.timedelta(minutes=2)), str)
-        assert session.prepare_value(42) == "42"
-        assert session.prepare_value(ChatType.PRIVATE) == "private"
-        assert session.prepare_value(TopicIconColor.RED) == "16478047"
-
-    def test_clean_json(self):
+    def test_prepare_value_timedelta(self, bot: MockedBot):
         session = CustomSession()
 
-        cleaned_dict = session.clean_json({"key": "value", "null": None})
-        assert "key" in cleaned_dict
-        assert "null" not in cleaned_dict
+        value = session.prepare_value(datetime.timedelta(minutes=2), bot=bot, files={})
+        assert isinstance(value, str)
 
-        cleaned_list = session.clean_json(["kaboom", 42, None])
-        assert len(cleaned_list) == 2
-        assert 42 in cleaned_list
-        assert None not in cleaned_list
-        assert cleaned_list[0] == "kaboom"
-
-    def test_clean_json_with_nested_json(self):
-        session = CustomSession()
-
-        cleaned = session.clean_json(
-            {
-                "key": "value",
-                "null": None,
-                "nested_list": ["kaboom", 42, None],
-                "nested_dict": {"key": "value", "null": None},
-            }
+    def test_prepare_value_defaults_replace(self):
+        bot = MockedBot(
+            parse_mode=ParseMode.HTML,
+            protect_content=True,
+            disable_web_page_preview=True,
         )
+        assert bot.session.prepare_value(UNSET_PARSE_MODE, bot=bot, files={}) == "HTML"
+        assert (
+            bot.session.prepare_value(UNSET_DISABLE_WEB_PAGE_PREVIEW, bot=bot, files={}) == "true"
+        )
+        assert bot.session.prepare_value(UNSET_PROTECT_CONTENT, bot=bot, files={}) == "true"
 
-        assert len(cleaned) == 3
-        assert "null" not in cleaned
-
-        assert isinstance(cleaned["nested_list"], list)
-        assert cleaned["nested_list"] == ["kaboom", 42]
-
-        assert isinstance(cleaned["nested_dict"], dict)
-        assert cleaned["nested_dict"] == {"key": "value"}
-
-    def test_clean_json_not_json(self):
-        session = CustomSession()
-
-        assert session.clean_json(42) == 42
+    def test_prepare_value_defaults_unset(self):
+        bot = MockedBot()
+        assert bot.session.prepare_value(UNSET_PARSE_MODE, bot=bot, files={}) is None
+        assert bot.session.prepare_value(UNSET_DISABLE_WEB_PAGE_PREVIEW, bot=bot, files={}) is None
+        assert bot.session.prepare_value(UNSET_PROTECT_CONTENT, bot=bot, files={}) is None
 
     @pytest.mark.parametrize(
         "status_code,content,error",
@@ -213,7 +211,10 @@ class TestBaseSession:
     async def test_stream_content(self):
         session = CustomSession()
         stream = session.stream_content(
-            "https://www.python.org/static/img/python-logo.png", timeout=5, chunk_size=65536
+            "https://www.python.org/static/img/python-logo.png",
+            timeout=5,
+            chunk_size=65536,
+            raise_for_status=True,
         )
         assert isinstance(stream, AsyncGenerator)
 
diff --git a/tests/test_api/test_methods/test_add_sticker_to_set.py b/tests/test_api/test_methods/test_add_sticker_to_set.py
index 94e9c3f1..8e617a74 100644
--- a/tests/test_api/test_methods/test_add_sticker_to_set.py
+++ b/tests/test_api/test_methods/test_add_sticker_to_set.py
@@ -1,21 +1,9 @@
-from aiogram.methods import AddStickerToSet, Request
+from aiogram.methods import AddStickerToSet
 from aiogram.types import InputSticker
 from tests.mocked_bot import MockedBot
 
 
 class TestAddStickerToSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=True)
-
-        response: bool = await AddStickerToSet(
-            user_id=42,
-            name="test stickers pack",
-            sticker=InputSticker(sticker="file id", emoji_list=[":)"]),
-        )
-        request: Request = bot.get_request()
-        assert request.method == "addStickerToSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(AddStickerToSet, ok=True, result=True)
 
@@ -24,6 +12,5 @@ class TestAddStickerToSet:
             name="test stickers pack",
             sticker=InputSticker(sticker="file id", emoji_list=[":)"]),
         )
-        request: Request = bot.get_request()
-        assert request.method == "addStickerToSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_answer_callback_query.py b/tests/test_api/test_methods/test_answer_callback_query.py
index 54f9e640..98e9df17 100644
--- a/tests/test_api/test_methods/test_answer_callback_query.py
+++ b/tests/test_api/test_methods/test_answer_callback_query.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestAnswerCallbackQuery:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=True)
-
-        response: bool = await AnswerCallbackQuery(callback_query_id="cq id", text="OK")
-        request: Request = bot.get_request()
-        assert request.method == "answerCallbackQuery"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(AnswerCallbackQuery, ok=True, result=True)
 
         response: bool = await bot.answer_callback_query(callback_query_id="cq id", text="OK")
-        request: Request = bot.get_request()
-        assert request.method == "answerCallbackQuery"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_answer_inline_query.py b/tests/test_api/test_methods/test_answer_inline_query.py
index c3b35a2e..a0cec362 100644
--- a/tests/test_api/test_methods/test_answer_inline_query.py
+++ b/tests/test_api/test_methods/test_answer_inline_query.py
@@ -9,55 +9,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestAnswerInlineQuery:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=True)
-
-        response: bool = await AnswerInlineQuery(
-            inline_query_id="query id", results=[InlineQueryResult()]
-        )
-        request: Request = bot.get_request()
-        assert request.method == "answerInlineQuery"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(AnswerInlineQuery, ok=True, result=True)
 
         response: bool = await bot.answer_inline_query(
             inline_query_id="query id", results=[InlineQueryResult()]
         )
-        request: Request = bot.get_request()
-        assert request.method == "answerInlineQuery"
+        request = bot.get_request()
         assert response == prepare_result.result
-
-    def test_parse_mode(self, bot: MockedBot):
-        query = AnswerInlineQuery(
-            inline_query_id="query id",
-            results=[
-                InlineQueryResultPhoto(id="result id", photo_url="photo", thumbnail_url="thumb")
-            ],
-        )
-        request = query.build_request(bot)
-        assert request.data["results"][0]["parse_mode"] is None
-
-        new_bot = Bot(token="42:TEST", parse_mode="HTML")
-        request = query.build_request(new_bot)
-        assert request.data["results"][0]["parse_mode"] == "HTML"
-
-    def test_parse_mode_input_message_content(self, bot: MockedBot):
-        query = AnswerInlineQuery(
-            inline_query_id="query id",
-            results=[
-                InlineQueryResultPhoto(
-                    id="result id",
-                    photo_url="photo",
-                    thumbnail_url="thumb",
-                    input_message_content=InputTextMessageContent(message_text="test"),
-                )
-            ],
-        )
-        request = query.build_request(bot)
-        assert request.data["results"][0]["input_message_content"]["parse_mode"] is None
-
-        new_bot = Bot(token="42:TEST", parse_mode="HTML")
-        request = query.build_request(new_bot)
-        assert request.data["results"][0]["input_message_content"]["parse_mode"] == "HTML"
diff --git a/tests/test_api/test_methods/test_answer_pre_checkout_query.py b/tests/test_api/test_methods/test_answer_pre_checkout_query.py
index f15f5beb..b2a1f6c9 100644
--- a/tests/test_api/test_methods/test_answer_pre_checkout_query.py
+++ b/tests/test_api/test_methods/test_answer_pre_checkout_query.py
@@ -3,20 +3,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestAnswerPreCheckoutQuery:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=True)
-
-        response: bool = await AnswerPreCheckoutQuery(pre_checkout_query_id="query id", ok=True)
-        request: Request = bot.get_request()
-        assert request.method == "answerPreCheckoutQuery"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(AnswerPreCheckoutQuery, ok=True, result=True)
 
         response: bool = await bot.answer_pre_checkout_query(
             pre_checkout_query_id="query id", ok=True
         )
-        request: Request = bot.get_request()
-        assert request.method == "answerPreCheckoutQuery"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_answer_shipping_query.py b/tests/test_api/test_methods/test_answer_shipping_query.py
index 8a2b5f89..d31f41f8 100644
--- a/tests/test_api/test_methods/test_answer_shipping_query.py
+++ b/tests/test_api/test_methods/test_answer_shipping_query.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestAnswerShippingQuery:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=True)
-
-        response: bool = await AnswerShippingQuery(shipping_query_id="query id", ok=True)
-        request: Request = bot.get_request()
-        assert request.method == "answerShippingQuery"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(AnswerShippingQuery, ok=True, result=True)
 
         response: bool = await bot.answer_shipping_query(shipping_query_id="query id", ok=True)
-        request: Request = bot.get_request()
-        assert request.method == "answerShippingQuery"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_answer_web_app_query.py b/tests/test_api/test_methods/test_answer_web_app_query.py
index 713653f1..6948bead 100644
--- a/tests/test_api/test_methods/test_answer_web_app_query.py
+++ b/tests/test_api/test_methods/test_answer_web_app_query.py
@@ -4,18 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestAnswerWebAppQuery:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(AnswerWebAppQuery, ok=True, result=SentWebAppMessage())
-
-        response: SentWebAppMessage = await AnswerWebAppQuery(
-            web_app_query_id="test",
-            result=InlineQueryResult(),
-        )
-        request: Request = bot.get_request()
-        assert request.method == "answerWebAppQuery"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(AnswerWebAppQuery, ok=True, result=SentWebAppMessage())
 
@@ -23,7 +11,5 @@ class TestAnswerWebAppQuery:
             web_app_query_id="test",
             result=InlineQueryResult(),
         )
-        request: Request = bot.get_request()
-        assert request.method == "answerWebAppQuery"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_approve_chat_join_request.py b/tests/test_api/test_methods/test_approve_chat_join_request.py
index ea81c4ac..6b097702 100755
--- a/tests/test_api/test_methods/test_approve_chat_join_request.py
+++ b/tests/test_api/test_methods/test_approve_chat_join_request.py
@@ -3,17 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestApproveChatJoinRequest:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(ApproveChatJoinRequest, ok=True, result=True)
-
-        response: bool = await ApproveChatJoinRequest(
-            chat_id=-42,
-            user_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "approveChatJoinRequest"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(ApproveChatJoinRequest, ok=True, result=None)
 
@@ -21,6 +10,5 @@ class TestApproveChatJoinRequest:
             chat_id=-42,
             user_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "approveChatJoinRequest"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_ban_chat_member.py b/tests/test_api/test_methods/test_ban_chat_member.py
index 10464737..98ca951e 100644
--- a/tests/test_api/test_methods/test_ban_chat_member.py
+++ b/tests/test_api/test_methods/test_ban_chat_member.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestKickChatMember:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(BanChatMember, ok=True, result=True)
-
-        response: bool = await BanChatMember(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "banChatMember"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(BanChatMember, ok=True, result=True)
 
         response: bool = await bot.ban_chat_member(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "banChatMember"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_ban_chat_sender_chat.py b/tests/test_api/test_methods/test_ban_chat_sender_chat.py
index b93f27a5..6811c975 100755
--- a/tests/test_api/test_methods/test_ban_chat_sender_chat.py
+++ b/tests/test_api/test_methods/test_ban_chat_sender_chat.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestBanChatSenderChat:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(BanChatSenderChat, ok=True, result=True)
-
-        response: bool = await BanChatSenderChat(
-            chat_id=-42,
-            sender_chat_id=-1337,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "banChatSenderChat"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(BanChatSenderChat, ok=True, result=True)
 
@@ -22,7 +10,5 @@ class TestBanChatSenderChat:
             chat_id=-42,
             sender_chat_id=-1337,
         )
-        request: Request = bot.get_request()
-        assert request.method == "banChatSenderChat"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_base.py b/tests/test_api/test_methods/test_base.py
index 38306db1..f2351d40 100644
--- a/tests/test_api/test_methods/test_base.py
+++ b/tests/test_api/test_methods/test_base.py
@@ -1,61 +1,27 @@
-from typing import Dict, Optional
+from unittest.mock import sentinel
 
 import pytest
 
-from aiogram import Bot
-from aiogram.methods.base import prepare_parse_mode
+from aiogram.methods import GetMe, TelegramMethod
+from aiogram.types import User
 from tests.mocked_bot import MockedBot
 
 
-class TestPrepareFile:
-    # TODO: Add tests
-    pass
-
-
-class TestPrepareInputMedia:
-    # TODO: Add tests
-    pass
-
-
-class TestPrepareMediaFile:
-    # TODO: Add tests
-    pass
-
-
-class TestPrepareParseMode:
+class TestTelegramMethodRemoveUnset:
     @pytest.mark.parametrize(
-        "parse_mode,data,result",
+        "values,names",
         [
-            [None, {}, None],
-            ["HTML", {}, "HTML"],
-            ["Markdown", {}, "Markdown"],
-            [None, {"parse_mode": "HTML"}, "HTML"],
-            ["HTML", {"parse_mode": "HTML"}, "HTML"],
-            ["Markdown", {"parse_mode": "HTML"}, "HTML"],
+            [{}, set()],
+            [{"foo": "bar"}, {"foo"}],
+            [{"foo": "bar", "baz": sentinel.DEFAULT}, {"foo"}],
         ],
     )
-    async def test_default_parse_mode(
-        self, bot: MockedBot, parse_mode: str, data: Dict[str, str], result: Optional[str]
-    ):
-        async with Bot(token="42:TEST", parse_mode=parse_mode).context() as bot:
-            assert bot.parse_mode == parse_mode
-            prepare_parse_mode(bot, data)
-            assert data.get("parse_mode") == result
+    def test_remove_unset(self, values, names):
+        validated = TelegramMethod.remove_unset(values)
+        assert set(validated.keys()) == names
 
-    async def test_list(self):
-        data = [{}] * 2
-        data.append({"parse_mode": "HTML"})
-        bot = Bot(token="42:TEST", parse_mode="Markdown")
-        prepare_parse_mode(bot, data)
 
-        assert isinstance(data, list)
-        assert len(data) == 3
-        assert all("parse_mode" in item for item in data)
-        assert data[0]["parse_mode"] == "Markdown"
-        assert data[1]["parse_mode"] == "Markdown"
-        assert data[2]["parse_mode"] == "HTML"
-
-    def test_bot_not_in_context(self, bot: MockedBot):
-        data = {}
-        prepare_parse_mode(bot, data)
-        assert data["parse_mode"] is None
+class TestTelegramMethodCall:
+    async def test_async_emit(self, bot: MockedBot):
+        bot.add_result_for(GetMe, ok=True, result=User(id=42, is_bot=True, first_name="Test"))
+        assert isinstance(await GetMe(), User)
diff --git a/tests/test_api/test_methods/test_close.py b/tests/test_api/test_methods/test_close.py
index f8f8956b..e13223fa 100644
--- a/tests/test_api/test_methods/test_close.py
+++ b/tests/test_api/test_methods/test_close.py
@@ -3,20 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestClose:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(Close, ok=True, result=True)
-
-        response: bool = await Close()
-        request: Request = bot.get_request()
-        assert request.method == "close"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(Close, ok=True, result=True)
 
         response: bool = await bot.close()
-        request: Request = bot.get_request()
-        assert request.method == "close"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_close_forum_topic.py b/tests/test_api/test_methods/test_close_forum_topic.py
index 4857e7a4..ff45c6ac 100644
--- a/tests/test_api/test_methods/test_close_forum_topic.py
+++ b/tests/test_api/test_methods/test_close_forum_topic.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCloseForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(CloseForumTopic, ok=True, result=True)
-
-        response: bool = await CloseForumTopic(
-            chat_id=42,
-            message_thread_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "closeForumTopic"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(CloseForumTopic, ok=True, result=True)
 
@@ -22,7 +10,5 @@ class TestCloseForumTopic:
             chat_id=42,
             message_thread_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "closeForumTopic"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_close_general_forum_topic.py b/tests/test_api/test_methods/test_close_general_forum_topic.py
index a62ce146..b0a022ec 100644
--- a/tests/test_api/test_methods/test_close_general_forum_topic.py
+++ b/tests/test_api/test_methods/test_close_general_forum_topic.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCloseGeneralForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(CloseGeneralForumTopic, ok=True, result=True)
-
-        response: bool = await bot(CloseGeneralForumTopic(chat_id=42))
-        request: Request = bot.get_request()
-        assert request.method == "closeGeneralForumTopic"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(CloseGeneralForumTopic, ok=True, result=True)
 
         response: bool = await bot.close_general_forum_topic(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "closeGeneralForumTopic"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_copy_message.py b/tests/test_api/test_methods/test_copy_message.py
index 38419c6b..bff6004b 100644
--- a/tests/test_api/test_methods/test_copy_message.py
+++ b/tests/test_api/test_methods/test_copy_message.py
@@ -4,19 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCopyMessage:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(CopyMessage, ok=True, result=MessageId(message_id=42))
-
-        response: MessageId = await CopyMessage(
-            chat_id=42,
-            from_chat_id=42,
-            message_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "copyMessage"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(CopyMessage, ok=True, result=MessageId(message_id=42))
 
@@ -25,7 +12,5 @@ class TestCopyMessage:
             from_chat_id=42,
             message_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "copyMessage"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_create_chat_invite_link.py b/tests/test_api/test_methods/test_create_chat_invite_link.py
index cfdca233..87a31be8 100644
--- a/tests/test_api/test_methods/test_create_chat_invite_link.py
+++ b/tests/test_api/test_methods/test_create_chat_invite_link.py
@@ -4,27 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCreateChatInviteLink:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            CreateChatInviteLink,
-            ok=True,
-            result=ChatInviteLink(
-                invite_link="https://t.me/username",
-                creator=User(id=42, is_bot=False, first_name="User"),
-                is_primary=False,
-                is_revoked=False,
-                creates_join_request=False,
-            ),
-        )
-
-        response: ChatInviteLink = await CreateChatInviteLink(
-            chat_id=-42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "createChatInviteLink"
-        # assert request.data == {"chat_id": -42}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             CreateChatInviteLink,
@@ -41,7 +20,5 @@ class TestCreateChatInviteLink:
         response: ChatInviteLink = await bot.create_chat_invite_link(
             chat_id=-42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "createChatInviteLink"
-        # assert request.data == {"chat_id": -42}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_create_forum_topic.py b/tests/test_api/test_methods/test_create_forum_topic.py
index 84eaf02e..071945ca 100644
--- a/tests/test_api/test_methods/test_create_forum_topic.py
+++ b/tests/test_api/test_methods/test_create_forum_topic.py
@@ -4,22 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCreateForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            CreateForumTopic,
-            ok=True,
-            result=ForumTopic(message_thread_id=42, name="test", icon_color=0xFFD67E),
-        )
-
-        response: ForumTopic = await CreateForumTopic(
-            chat_id=42,
-            name="test",
-        )
-        request: Request = bot.get_request()
-        assert request.method == "createForumTopic"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             CreateForumTopic,
@@ -31,7 +15,5 @@ class TestCreateForumTopic:
             chat_id=42,
             name="test",
         )
-        request: Request = bot.get_request()
-        assert request.method == "createForumTopic"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_create_invoice_link.py b/tests/test_api/test_methods/test_create_invoice_link.py
index 7909fac9..75a46326 100644
--- a/tests/test_api/test_methods/test_create_invoice_link.py
+++ b/tests/test_api/test_methods/test_create_invoice_link.py
@@ -4,23 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCreateInvoiceLink:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            CreateInvoiceLink, ok=True, result="https://t.me/invoice/example"
-        )
-
-        response: str = await CreateInvoiceLink(
-            title="test",
-            description="test",
-            payload="test",
-            provider_token="test",
-            currency="BTC",
-            prices=[LabeledPrice(label="Test", amount=1)],
-        )
-        request: Request = bot.get_request()
-        assert request.method == "createInvoiceLink"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             CreateInvoiceLink, ok=True, result="https://t.me/invoice/example"
@@ -34,6 +17,5 @@ class TestCreateInvoiceLink:
             currency="BTC",
             prices=[LabeledPrice(label="Test", amount=1)],
         )
-        request: Request = bot.get_request()
-        assert request.method == "createInvoiceLink"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_create_new_sticker_set.py b/tests/test_api/test_methods/test_create_new_sticker_set.py
index ba44266e..7aef1fc8 100644
--- a/tests/test_api/test_methods/test_create_new_sticker_set.py
+++ b/tests/test_api/test_methods/test_create_new_sticker_set.py
@@ -5,23 +5,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCreateNewStickerSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=True)
-
-        response: bool = await CreateNewStickerSet(
-            user_id=42,
-            name="name",
-            title="title",
-            stickers=[
-                InputSticker(sticker="file id", emoji_list=[":)"]),
-                InputSticker(sticker=FSInputFile("file.png"), emoji_list=["=("]),
-            ],
-            sticker_format=StickerFormat.STATIC,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "createNewStickerSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(CreateNewStickerSet, ok=True, result=True)
 
@@ -35,6 +18,5 @@ class TestCreateNewStickerSet:
             ],
             sticker_format=StickerFormat.STATIC,
         )
-        request: Request = bot.get_request()
-        assert request.method == "createNewStickerSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_decline_chat_join_request.py b/tests/test_api/test_methods/test_decline_chat_join_request.py
index 549f43d1..f85c4375 100755
--- a/tests/test_api/test_methods/test_decline_chat_join_request.py
+++ b/tests/test_api/test_methods/test_decline_chat_join_request.py
@@ -3,17 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeclineChatJoinRequest:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeclineChatJoinRequest, ok=True, result=True)
-
-        response: bool = await DeclineChatJoinRequest(
-            chat_id=-42,
-            user_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "declineChatJoinRequest"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeclineChatJoinRequest, ok=True, result=True)
 
@@ -21,6 +10,5 @@ class TestDeclineChatJoinRequest:
             chat_id=-42,
             user_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "declineChatJoinRequest"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_chat_photo.py b/tests/test_api/test_methods/test_delete_chat_photo.py
index 9faaa8bf..df8c5eef 100644
--- a/tests/test_api/test_methods/test_delete_chat_photo.py
+++ b/tests/test_api/test_methods/test_delete_chat_photo.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteChatPhoto:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=True)
-
-        response: bool = await DeleteChatPhoto(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "deleteChatPhoto"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteChatPhoto, ok=True, result=True)
 
         response: bool = await bot.delete_chat_photo(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "deleteChatPhoto"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_chat_sticker_set.py b/tests/test_api/test_methods/test_delete_chat_sticker_set.py
index ae6af449..c8452d75 100644
--- a/tests/test_api/test_methods/test_delete_chat_sticker_set.py
+++ b/tests/test_api/test_methods/test_delete_chat_sticker_set.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteChatStickerSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=True)
-
-        response: bool = await DeleteChatStickerSet(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "deleteChatStickerSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteChatStickerSet, ok=True, result=True)
 
         response: bool = await bot.delete_chat_sticker_set(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "deleteChatStickerSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_forum_topic.py b/tests/test_api/test_methods/test_delete_forum_topic.py
index e0ad6bfd..63cd629e 100644
--- a/tests/test_api/test_methods/test_delete_forum_topic.py
+++ b/tests/test_api/test_methods/test_delete_forum_topic.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteForumTopic, ok=True, result=True)
-
-        response: bool = await DeleteForumTopic(
-            chat_id=42,
-            message_thread_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "deleteForumTopic"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteForumTopic, ok=True, result=True)
 
@@ -22,7 +10,5 @@ class TestDeleteForumTopic:
             chat_id=42,
             message_thread_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "deleteForumTopic"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_message.py b/tests/test_api/test_methods/test_delete_message.py
index 097496a2..de8b44e4 100644
--- a/tests/test_api/test_methods/test_delete_message.py
+++ b/tests/test_api/test_methods/test_delete_message.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteMessage:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=True)
-
-        response: bool = await DeleteMessage(chat_id=42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "deleteMessage"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteMessage, ok=True, result=True)
 
         response: bool = await bot.delete_message(chat_id=42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "deleteMessage"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_my_commands.py b/tests/test_api/test_methods/test_delete_my_commands.py
index c4902ec4..86e4c47e 100644
--- a/tests/test_api/test_methods/test_delete_my_commands.py
+++ b/tests/test_api/test_methods/test_delete_my_commands.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestKickChatMember:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteMyCommands, ok=True, result=True)
-
-        response: bool = await DeleteMyCommands()
-        request: Request = bot.get_request()
-        assert request.method == "deleteMyCommands"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteMyCommands, ok=True, result=True)
 
         response: bool = await bot.delete_my_commands()
-        request: Request = bot.get_request()
-        assert request.method == "deleteMyCommands"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_sticker_from_set.py b/tests/test_api/test_methods/test_delete_sticker_from_set.py
index bc2a8e79..b8e25153 100644
--- a/tests/test_api/test_methods/test_delete_sticker_from_set.py
+++ b/tests/test_api/test_methods/test_delete_sticker_from_set.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteStickerFromSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=True)
-
-        response: bool = await DeleteStickerFromSet(sticker="sticker id")
-        request: Request = bot.get_request()
-        assert request.method == "deleteStickerFromSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteStickerFromSet, ok=True, result=True)
 
         response: bool = await bot.delete_sticker_from_set(sticker="sticker id")
-        request: Request = bot.get_request()
-        assert request.method == "deleteStickerFromSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_sticker_set.py b/tests/test_api/test_methods/test_delete_sticker_set.py
index 4ab6a1a0..b0f6391c 100644
--- a/tests/test_api/test_methods/test_delete_sticker_set.py
+++ b/tests/test_api/test_methods/test_delete_sticker_set.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteStickerSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteStickerSet, ok=True, result=True)
-
-        response: bool = await DeleteStickerSet(name="test")
-        request: Request = bot.get_request()
-        assert request.method == "deleteStickerSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteStickerSet, ok=True, result=True)
 
         response: bool = await bot.delete_sticker_set(name="test")
-        request: Request = bot.get_request()
-        assert request.method == "deleteStickerSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_delete_webhook.py b/tests/test_api/test_methods/test_delete_webhook.py
index 76591a8a..3f755d73 100644
--- a/tests/test_api/test_methods/test_delete_webhook.py
+++ b/tests/test_api/test_methods/test_delete_webhook.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestDeleteWebhook:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=True)
-
-        response: bool = await DeleteWebhook()
-        request: Request = bot.get_request()
-        assert request.method == "deleteWebhook"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(DeleteWebhook, ok=True, result=True)
 
         response: bool = await bot.delete_webhook()
-        request: Request = bot.get_request()
-        assert request.method == "deleteWebhook"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_chat_invite_link.py b/tests/test_api/test_methods/test_edit_chat_invite_link.py
index ab71c3ae..7bceffcd 100644
--- a/tests/test_api/test_methods/test_edit_chat_invite_link.py
+++ b/tests/test_api/test_methods/test_edit_chat_invite_link.py
@@ -4,26 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditChatInviteLink:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            EditChatInviteLink,
-            ok=True,
-            result=ChatInviteLink(
-                invite_link="https://t.me/username2",
-                creator=User(id=42, is_bot=False, first_name="User"),
-                is_primary=False,
-                is_revoked=False,
-                creates_join_request=False,
-            ),
-        )
-
-        response: ChatInviteLink = await EditChatInviteLink(
-            chat_id=-42, invite_link="https://t.me/username", member_limit=1
-        )
-        request: Request = bot.get_request()
-        assert request.method == "editChatInviteLink"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             EditChatInviteLink,
@@ -40,6 +20,5 @@ class TestEditChatInviteLink:
         response: ChatInviteLink = await bot.edit_chat_invite_link(
             chat_id=-42, invite_link="https://t.me/username", member_limit=1
         )
-        request: Request = bot.get_request()
-        assert request.method == "editChatInviteLink"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_forum_topic.py b/tests/test_api/test_methods/test_edit_forum_topic.py
index 98e30166..2dbb06f9 100644
--- a/tests/test_api/test_methods/test_edit_forum_topic.py
+++ b/tests/test_api/test_methods/test_edit_forum_topic.py
@@ -3,21 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(EditForumTopic, ok=True, result=True)
-
-        response: bool = await EditForumTopic(
-            chat_id=42,
-            message_thread_id=42,
-            name="test",
-            icon_color=0xFFD67E,
-            icon_custom_emoji_id="0",
-        )
-        request: Request = bot.get_request()
-        assert request.method == "editForumTopic"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(EditForumTopic, ok=True, result=True)
 
@@ -27,7 +12,5 @@ class TestEditForumTopic:
             name="test",
             icon_custom_emoji_id="0",
         )
-        request: Request = bot.get_request()
-        assert request.method == "editForumTopic"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_general_forum_topic.py b/tests/test_api/test_methods/test_edit_general_forum_topic.py
index 01bff1d6..cc3fc14f 100644
--- a/tests/test_api/test_methods/test_edit_general_forum_topic.py
+++ b/tests/test_api/test_methods/test_edit_general_forum_topic.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestCloseGeneralForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(EditGeneralForumTopic, ok=True, result=True)
-
-        response: bool = await bot(EditGeneralForumTopic(chat_id=42, name="Test"))
-        request: Request = bot.get_request()
-        assert request.method == "editGeneralForumTopic"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(EditGeneralForumTopic, ok=True, result=True)
 
         response: bool = await bot.edit_general_forum_topic(chat_id=42, name="Test")
-        request: Request = bot.get_request()
-        assert request.method == "editGeneralForumTopic"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_message_caption.py b/tests/test_api/test_methods/test_edit_message_caption.py
index 71a7784e..55ab5d6f 100644
--- a/tests/test_api/test_methods/test_edit_message_caption.py
+++ b/tests/test_api/test_methods/test_edit_message_caption.py
@@ -7,23 +7,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditMessageCaption:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            EditMessageCaption,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                text="text",
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Union[Message, bool] = await EditMessageCaption()
-        request: Request = bot.get_request()
-        assert request.method == "editMessageCaption"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             EditMessageCaption,
@@ -37,6 +20,5 @@ class TestEditMessageCaption:
         )
 
         response: Union[Message, bool] = await bot.edit_message_caption()
-        request: Request = bot.get_request()
-        assert request.method == "editMessageCaption"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_message_live_location.py b/tests/test_api/test_methods/test_edit_message_live_location.py
index 7a2c2f7d..b9aee11a 100644
--- a/tests/test_api/test_methods/test_edit_message_live_location.py
+++ b/tests/test_api/test_methods/test_edit_message_live_location.py
@@ -6,22 +6,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditMessageLiveLocation:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=True)
-
-        response: Union[Message, bool] = await EditMessageLiveLocation(
-            latitude=3.141592, longitude=3.141592
-        )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageLiveLocation"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(EditMessageLiveLocation, ok=True, result=True)
 
         response: Union[Message, bool] = await bot.edit_message_live_location(
             latitude=3.141592, longitude=3.141592
         )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageLiveLocation"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_message_media.py b/tests/test_api/test_methods/test_edit_message_media.py
index 15594aff..57e74d45 100644
--- a/tests/test_api/test_methods/test_edit_message_media.py
+++ b/tests/test_api/test_methods/test_edit_message_media.py
@@ -6,22 +6,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditMessageMedia:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=True)
-
-        response: Union[Message, bool] = await EditMessageMedia(
-            media=InputMediaPhoto(media=BufferedInputFile(b"", "photo.png"))
-        )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageMedia"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(EditMessageMedia, ok=True, result=True)
 
         response: Union[Message, bool] = await bot.edit_message_media(
             media=InputMediaPhoto(media=BufferedInputFile(b"", "photo.png"))
         )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageMedia"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_message_reply_markup.py b/tests/test_api/test_methods/test_edit_message_reply_markup.py
index 38baa76f..1f5d94be 100644
--- a/tests/test_api/test_methods/test_edit_message_reply_markup.py
+++ b/tests/test_api/test_methods/test_edit_message_reply_markup.py
@@ -6,22 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditMessageReplyMarkup:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=True)
-
-        response: Union[Message, bool] = await EditMessageReplyMarkup(
-            chat_id=42,
-            inline_message_id="inline message id",
-            reply_markup=InlineKeyboardMarkup(
-                inline_keyboard=[
-                    [InlineKeyboardButton(text="button", callback_data="placeholder")]
-                ]
-            ),
-        )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageReplyMarkup"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(EditMessageReplyMarkup, ok=True, result=True)
 
@@ -34,6 +18,5 @@ class TestEditMessageReplyMarkup:
                 ]
             ),
         )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageReplyMarkup"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_edit_message_text.py b/tests/test_api/test_methods/test_edit_message_text.py
index 1cdfcfe0..c9e203a8 100644
--- a/tests/test_api/test_methods/test_edit_message_text.py
+++ b/tests/test_api/test_methods/test_edit_message_text.py
@@ -6,22 +6,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestEditMessageText:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(EditMessageText, ok=True, result=True)
-
-        response: Union[Message, bool] = await EditMessageText(
-            chat_id=42, inline_message_id="inline message id", text="text"
-        )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageText"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(EditMessageText, ok=True, result=True)
 
         response: Union[Message, bool] = await bot.edit_message_text(
             chat_id=42, inline_message_id="inline message id", text="text"
         )
-        request: Request = bot.get_request()
-        assert request.method == "editMessageText"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_export_chat_invite_link.py b/tests/test_api/test_methods/test_export_chat_invite_link.py
index 7e3901a0..ba85def7 100644
--- a/tests/test_api/test_methods/test_export_chat_invite_link.py
+++ b/tests/test_api/test_methods/test_export_chat_invite_link.py
@@ -3,22 +3,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestExportChatInviteLink:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            ExportChatInviteLink, ok=True, result="http://example.com"
-        )
-
-        response: str = await ExportChatInviteLink(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "exportChatInviteLink"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             ExportChatInviteLink, ok=True, result="http://example.com"
         )
 
         response: str = await bot.export_chat_invite_link(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "exportChatInviteLink"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_forward_message.py b/tests/test_api/test_methods/test_forward_message.py
index 955b6456..f04ec0f0 100644
--- a/tests/test_api/test_methods/test_forward_message.py
+++ b/tests/test_api/test_methods/test_forward_message.py
@@ -6,24 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestForwardMessage:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            ForwardMessage,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                chat=Chat(id=42, title="chat", type="private"),
-                text="text",
-            ),
-        )
-
-        response: Message = await ForwardMessage(chat_id=42, from_chat_id=42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "forwardMessage"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             ForwardMessage,
@@ -37,7 +19,5 @@ class TestForwardMessage:
         )
 
         response: Message = await bot.forward_message(chat_id=42, from_chat_id=42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "forwardMessage"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_chat.py b/tests/test_api/test_methods/test_get_chat.py
index c5d4bfcd..902b03b3 100644
--- a/tests/test_api/test_methods/test_get_chat.py
+++ b/tests/test_api/test_methods/test_get_chat.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetChat:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetChat, ok=True, result=Chat(id=-42, type="channel", title="chat")
-        )
-
-        response: Chat = await GetChat(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "getChat"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetChat, ok=True, result=Chat(id=-42, type="channel", title="chat")
         )
 
         response: Chat = await bot.get_chat(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "getChat"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_chat_administrators.py b/tests/test_api/test_methods/test_get_chat_administrators.py
index 945b2e02..d8d57fc5 100644
--- a/tests/test_api/test_methods/test_get_chat_administrators.py
+++ b/tests/test_api/test_methods/test_get_chat_administrators.py
@@ -6,22 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetChatAdministrators:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetChatAdministrators,
-            ok=True,
-            result=[
-                ChatMemberOwner(
-                    user=User(id=42, is_bot=False, first_name="User"), is_anonymous=False
-                )
-            ],
-        )
-
-        response: List[ChatMember] = await GetChatAdministrators(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "getChatAdministrators"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetChatAdministrators,
@@ -33,6 +17,5 @@ class TestGetChatAdministrators:
             ],
         )
         response: List[ChatMember] = await bot.get_chat_administrators(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "getChatAdministrators"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_chat_member.py b/tests/test_api/test_methods/test_get_chat_member.py
index e2fd2a75..f59a491b 100644
--- a/tests/test_api/test_methods/test_get_chat_member.py
+++ b/tests/test_api/test_methods/test_get_chat_member.py
@@ -4,20 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetChatMember:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetChatMember,
-            ok=True,
-            result=ChatMemberOwner(
-                user=User(id=42, is_bot=False, first_name="User"), is_anonymous=False
-            ),
-        )
-
-        response: ChatMember = await GetChatMember(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "getChatMember"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetChatMember,
@@ -26,8 +12,6 @@ class TestGetChatMember:
                 user=User(id=42, is_bot=False, first_name="User"), is_anonymous=False
             ),
         )
-
-        response: ChatMember = await bot.get_chat_member(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "getChatMember"
+        response = await bot.get_chat_member(chat_id=-42, user_id=42)
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_chat_member_count.py b/tests/test_api/test_methods/test_get_chat_member_count.py
index 91a7c514..e1aea1ff 100644
--- a/tests/test_api/test_methods/test_get_chat_member_count.py
+++ b/tests/test_api/test_methods/test_get_chat_member_count.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetChatMembersCount:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(GetChatMemberCount, ok=True, result=42)
-
-        response: int = await GetChatMemberCount(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "getChatMemberCount"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(GetChatMemberCount, ok=True, result=42)
 
         response: int = await bot.get_chat_member_count(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "getChatMemberCount"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_chat_menu_button.py b/tests/test_api/test_methods/test_get_chat_menu_button.py
index 89181d3f..63a29eec 100644
--- a/tests/test_api/test_methods/test_get_chat_menu_button.py
+++ b/tests/test_api/test_methods/test_get_chat_menu_button.py
@@ -4,20 +4,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetChatMenuButton:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(GetChatMenuButton, ok=True, result=MenuButtonDefault())
-
-        response: MenuButton = await GetChatMenuButton()
-        request: Request = bot.get_request()
-        assert request.method == "getChatMenuButton"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(GetChatMenuButton, ok=True, result=MenuButtonDefault())
 
         response: MenuButton = await bot.get_chat_menu_button()
-        request: Request = bot.get_request()
-        assert request.method == "getChatMenuButton"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_custom_emoji_stickers.py b/tests/test_api/test_methods/test_get_custom_emoji_stickers.py
index fd3ea8ff..6db0f8f4 100644
--- a/tests/test_api/test_methods/test_get_custom_emoji_stickers.py
+++ b/tests/test_api/test_methods/test_get_custom_emoji_stickers.py
@@ -6,32 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetCustomEmojiStickers:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetCustomEmojiStickers,
-            ok=True,
-            result=[
-                Sticker(
-                    file_id="file id",
-                    width=42,
-                    height=42,
-                    is_animated=False,
-                    is_video=False,
-                    file_unique_id="file id",
-                    custom_emoji_id="1",
-                    type="custom_emoji",
-                )
-            ],
-        )
-
-        response: List[Sticker] = await GetCustomEmojiStickers(
-            custom_emoji_ids=["1"],
-        )
-        request: Request = bot.get_request()
-        assert request.method == "getCustomEmojiStickers"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetCustomEmojiStickers,
@@ -53,7 +27,5 @@ class TestGetCustomEmojiStickers:
         response: List[Sticker] = await bot.get_custom_emoji_stickers(
             custom_emoji_ids=["1", "2"],
         )
-        request: Request = bot.get_request()
-        assert request.method == "getCustomEmojiStickers"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_file.py b/tests/test_api/test_methods/test_get_file.py
index eb95cd20..9c54ac38 100644
--- a/tests/test_api/test_methods/test_get_file.py
+++ b/tests/test_api/test_methods/test_get_file.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetFile:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetFile, ok=True, result=File(file_id="file id", file_unique_id="file id")
-        )
-
-        response: File = await GetFile(file_id="file id")
-        request: Request = bot.get_request()
-        assert request.method == "getFile"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetFile, ok=True, result=File(file_id="file id", file_unique_id="file id")
         )
 
         response: File = await bot.get_file(file_id="file id")
-        request: Request = bot.get_request()
-        assert request.method == "getFile"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_forum_topic_icon_stickers.py b/tests/test_api/test_methods/test_get_forum_topic_icon_stickers.py
index c9a1455a..ab280abc 100644
--- a/tests/test_api/test_methods/test_get_forum_topic_icon_stickers.py
+++ b/tests/test_api/test_methods/test_get_forum_topic_icon_stickers.py
@@ -6,20 +6,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetForumTopicIconStickers:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(GetForumTopicIconStickers, ok=True, result=[])
-
-        response: List[Sticker] = await GetForumTopicIconStickers()
-        request: Request = bot.get_request()
-        assert request.method == "getForumTopicIconStickers"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(GetForumTopicIconStickers, ok=True, result=[])
 
         response: List[Sticker] = await bot.get_forum_topic_icon_stickers()
-        request: Request = bot.get_request()
-        assert request.method == "getForumTopicIconStickers"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_game_high_scores.py b/tests/test_api/test_methods/test_get_game_high_scores.py
index fe84d21d..9dfaf5f4 100644
--- a/tests/test_api/test_methods/test_get_game_high_scores.py
+++ b/tests/test_api/test_methods/test_get_game_high_scores.py
@@ -6,22 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetGameHighScores:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetGameHighScores,
-            ok=True,
-            result=[
-                GameHighScore(
-                    position=1, user=User(id=42, is_bot=False, first_name="User"), score=42
-                )
-            ],
-        )
-
-        response: List[GameHighScore] = await GetGameHighScores(user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "getGameHighScores"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetGameHighScores,
@@ -34,6 +18,5 @@ class TestGetGameHighScores:
         )
 
         response: List[GameHighScore] = await bot.get_game_high_scores(user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "getGameHighScores"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_me.py b/tests/test_api/test_methods/test_get_me.py
index 70f274ec..e84ccd1e 100644
--- a/tests/test_api/test_methods/test_get_me.py
+++ b/tests/test_api/test_methods/test_get_me.py
@@ -4,25 +4,12 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetMe:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetMe, ok=True, result=User(id=42, is_bot=False, first_name="User")
-        )
-
-        response: User = await GetMe()
-        request: Request = bot.get_request()
-        assert request.method == "getMe"
-        assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetMe, ok=True, result=User(id=42, is_bot=False, first_name="User")
         )
         response: User = await bot.get_me()
-        request: Request = bot.get_request()
-        assert request.method == "getMe"
-        assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
 
     async def test_me_property(self, bot: MockedBot):
diff --git a/tests/test_api/test_methods/test_get_my_commands.py b/tests/test_api/test_methods/test_get_my_commands.py
index c627ff11..41a7a7d0 100644
--- a/tests/test_api/test_methods/test_get_my_commands.py
+++ b/tests/test_api/test_methods/test_get_my_commands.py
@@ -6,18 +6,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetMyCommands:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(GetMyCommands, ok=True, result=None)
-
-        response: List[BotCommand] = await GetMyCommands()
-        request: Request = bot.get_request()
-        assert request.method == "getMyCommands"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(GetMyCommands, ok=True, result=None)
 
         response: List[BotCommand] = await bot.get_my_commands()
-        request: Request = bot.get_request()
-        assert request.method == "getMyCommands"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_my_default_administrator_rights.py b/tests/test_api/test_methods/test_get_my_default_administrator_rights.py
index 7e843686..bd18199c 100644
--- a/tests/test_api/test_methods/test_get_my_default_administrator_rights.py
+++ b/tests/test_api/test_methods/test_get_my_default_administrator_rights.py
@@ -4,28 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetMyDefaultAdministratorRights:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetMyDefaultAdministratorRights,
-            ok=True,
-            result=ChatAdministratorRights(
-                is_anonymous=False,
-                can_manage_chat=False,
-                can_delete_messages=False,
-                can_manage_video_chats=False,
-                can_restrict_members=False,
-                can_promote_members=False,
-                can_change_info=False,
-                can_invite_users=False,
-            ),
-        )
-
-        response: ChatAdministratorRights = await GetMyDefaultAdministratorRights()
-        request: Request = bot.get_request()
-        assert request.method == "getMyDefaultAdministratorRights"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetMyDefaultAdministratorRights,
@@ -43,7 +21,5 @@ class TestGetMyDefaultAdministratorRights:
         )
 
         response: ChatAdministratorRights = await bot.get_my_default_administrator_rights()
-        request: Request = bot.get_request()
-        assert request.method == "getMyDefaultAdministratorRights"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_my_description.py b/tests/test_api/test_methods/test_get_my_description.py
index 8a861ecb..32277b43 100644
--- a/tests/test_api/test_methods/test_get_my_description.py
+++ b/tests/test_api/test_methods/test_get_my_description.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetMyDescription:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetMyDescription, ok=True, result=BotDescription(description="Test")
-        )
-
-        response: BotDescription = await GetMyDescription()
-        request: Request = bot.get_request()
-        assert request.method == "getMyDescription"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetMyDescription, ok=True, result=BotDescription(description="Test")
         )
 
         response: BotDescription = await bot.get_my_description()
-        request: Request = bot.get_request()
-        assert request.method == "getMyDescription"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_my_short_description.py b/tests/test_api/test_methods/test_get_my_short_description.py
index 5d362fdb..3b78be89 100644
--- a/tests/test_api/test_methods/test_get_my_short_description.py
+++ b/tests/test_api/test_methods/test_get_my_short_description.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetMyShortDescription:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetMyShortDescription, ok=True, result=BotShortDescription(short_description="Test")
-        )
-
-        response: BotShortDescription = await GetMyShortDescription()
-        request: Request = bot.get_request()
-        assert request.method == "getMyShortDescription"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetMyShortDescription, ok=True, result=BotShortDescription(short_description="Test")
         )
 
         response: BotShortDescription = await bot.get_my_short_description()
-        request: Request = bot.get_request()
-        assert request.method == "getMyShortDescription"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_sticker_set.py b/tests/test_api/test_methods/test_get_sticker_set.py
index d8e7ca45..dd15e795 100644
--- a/tests/test_api/test_methods/test_get_sticker_set.py
+++ b/tests/test_api/test_methods/test_get_sticker_set.py
@@ -4,35 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetStickerSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetStickerSet,
-            ok=True,
-            result=StickerSet(
-                name="test",
-                title="test",
-                is_animated=False,
-                is_video=False,
-                stickers=[
-                    Sticker(
-                        file_id="file if",
-                        width=42,
-                        height=42,
-                        is_animated=False,
-                        is_video=False,
-                        file_unique_id="file id",
-                        type="regular",
-                    )
-                ],
-                sticker_type="regular",
-            ),
-        )
-
-        response: StickerSet = await GetStickerSet(name="test")
-        request: Request = bot.get_request()
-        assert request.method == "getStickerSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetStickerSet,
@@ -58,6 +29,5 @@ class TestGetStickerSet:
         )
 
         response: StickerSet = await bot.get_sticker_set(name="test")
-        request: Request = bot.get_request()
-        assert request.method == "getStickerSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_updates.py b/tests/test_api/test_methods/test_get_updates.py
index b4cd11b9..ad86ceed 100644
--- a/tests/test_api/test_methods/test_get_updates.py
+++ b/tests/test_api/test_methods/test_get_updates.py
@@ -6,18 +6,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetUpdates:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(GetUpdates, ok=True, result=[Update(update_id=42)])
-
-        response: List[Update] = await GetUpdates()
-        request: Request = bot.get_request()
-        assert request.method == "getUpdates"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(GetUpdates, ok=True, result=[Update(update_id=42)])
 
         response: List[Update] = await bot.get_updates()
-        request: Request = bot.get_request()
-        assert request.method == "getUpdates"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_user_profile_photos.py b/tests/test_api/test_methods/test_get_user_profile_photos.py
index cbfd0dbc..ed5329cc 100644
--- a/tests/test_api/test_methods/test_get_user_profile_photos.py
+++ b/tests/test_api/test_methods/test_get_user_profile_photos.py
@@ -4,23 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetUserProfilePhotos:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetUserProfilePhotos,
-            ok=True,
-            result=UserProfilePhotos(
-                total_count=1,
-                photos=[
-                    [PhotoSize(file_id="file_id", width=42, height=42, file_unique_id="file id")]
-                ],
-            ),
-        )
-
-        response: UserProfilePhotos = await GetUserProfilePhotos(user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "getUserProfilePhotos"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetUserProfilePhotos,
@@ -34,6 +17,5 @@ class TestGetUserProfilePhotos:
         )
 
         response: UserProfilePhotos = await bot.get_user_profile_photos(user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "getUserProfilePhotos"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_get_webhook_info.py b/tests/test_api/test_methods/test_get_webhook_info.py
index 06d11dbc..d6723411 100644
--- a/tests/test_api/test_methods/test_get_webhook_info.py
+++ b/tests/test_api/test_methods/test_get_webhook_info.py
@@ -4,20 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestGetWebhookInfo:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            GetWebhookInfo,
-            ok=True,
-            result=WebhookInfo(
-                url="https://example.com", has_custom_certificate=False, pending_update_count=0
-            ),
-        )
-
-        response: WebhookInfo = await GetWebhookInfo()
-        request: Request = bot.get_request()
-        assert request.method == "getWebhookInfo"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             GetWebhookInfo,
@@ -28,6 +14,5 @@ class TestGetWebhookInfo:
         )
 
         response: WebhookInfo = await bot.get_webhook_info()
-        request: Request = bot.get_request()
-        assert request.method == "getWebhookInfo"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_hide_general_forum_topic.py b/tests/test_api/test_methods/test_hide_general_forum_topic.py
index 51e6684b..d142ae5e 100644
--- a/tests/test_api/test_methods/test_hide_general_forum_topic.py
+++ b/tests/test_api/test_methods/test_hide_general_forum_topic.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestHideGeneralForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(HideGeneralForumTopic, ok=True, result=True)
-
-        response: bool = await bot(HideGeneralForumTopic(chat_id=42))
-        request: Request = bot.get_request()
-        assert request.method == "hideGeneralForumTopic"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(HideGeneralForumTopic, ok=True, result=True)
 
         response: bool = await bot.hide_general_forum_topic(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "hideGeneralForumTopic"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_leave_chat.py b/tests/test_api/test_methods/test_leave_chat.py
index db771a7d..e65902ca 100644
--- a/tests/test_api/test_methods/test_leave_chat.py
+++ b/tests/test_api/test_methods/test_leave_chat.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestLeaveChat:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(LeaveChat, ok=True, result=True)
-
-        response: bool = await LeaveChat(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "leaveChat"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(LeaveChat, ok=True, result=True)
 
         response: bool = await bot.leave_chat(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "leaveChat"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_log_out.py b/tests/test_api/test_methods/test_log_out.py
index fd09d116..bb066579 100644
--- a/tests/test_api/test_methods/test_log_out.py
+++ b/tests/test_api/test_methods/test_log_out.py
@@ -3,20 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestLogOut:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(LogOut, ok=True, result=True)
-
-        response: bool = await LogOut()
-        request: Request = bot.get_request()
-        assert request.method == "logOut"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(LogOut, ok=True, result=True)
 
         response: bool = await bot.log_out()
-        request: Request = bot.get_request()
-        assert request.method == "logOut"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_pin_chat_message.py b/tests/test_api/test_methods/test_pin_chat_message.py
index f74cd4cd..5f8a0eba 100644
--- a/tests/test_api/test_methods/test_pin_chat_message.py
+++ b/tests/test_api/test_methods/test_pin_chat_message.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestPinChatMessage:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=True)
-
-        response: bool = await PinChatMessage(chat_id=-42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "pinChatMessage"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(PinChatMessage, ok=True, result=True)
 
         response: bool = await bot.pin_chat_message(chat_id=-42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "pinChatMessage"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_promote_chat_member.py b/tests/test_api/test_methods/test_promote_chat_member.py
index 6721eb1f..8fa4a08f 100644
--- a/tests/test_api/test_methods/test_promote_chat_member.py
+++ b/tests/test_api/test_methods/test_promote_chat_member.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestPromoteChatMember:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=True)
-
-        response: bool = await PromoteChatMember(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "promoteChatMember"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(PromoteChatMember, ok=True, result=True)
 
         response: bool = await bot.promote_chat_member(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "promoteChatMember"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_reopen_forum_topic.py b/tests/test_api/test_methods/test_reopen_forum_topic.py
index 2c4a33b2..ff4c9b66 100644
--- a/tests/test_api/test_methods/test_reopen_forum_topic.py
+++ b/tests/test_api/test_methods/test_reopen_forum_topic.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestReopenForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(ReopenForumTopic, ok=True, result=None)
-
-        response: bool = await ReopenForumTopic(
-            chat_id=42,
-            message_thread_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "reopenForumTopic"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(ReopenForumTopic, ok=True, result=None)
 
@@ -22,7 +10,5 @@ class TestReopenForumTopic:
             chat_id=42,
             message_thread_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "reopenForumTopic"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_reopen_general_forum_topic.py b/tests/test_api/test_methods/test_reopen_general_forum_topic.py
index af1abf55..6eceb7d7 100644
--- a/tests/test_api/test_methods/test_reopen_general_forum_topic.py
+++ b/tests/test_api/test_methods/test_reopen_general_forum_topic.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestReopenGeneralForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(ReopenGeneralForumTopic, ok=True, result=True)
-
-        response: bool = await bot(ReopenGeneralForumTopic(chat_id=42))
-        request: Request = bot.get_request()
-        assert request.method == "reopenGeneralForumTopic"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(ReopenGeneralForumTopic, ok=True, result=True)
 
         response: bool = await bot.reopen_general_forum_topic(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "reopenGeneralForumTopic"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_restrict_chat_member.py b/tests/test_api/test_methods/test_restrict_chat_member.py
index ca9ee4c8..716fa23d 100644
--- a/tests/test_api/test_methods/test_restrict_chat_member.py
+++ b/tests/test_api/test_methods/test_restrict_chat_member.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestRestrictChatMember:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=True)
-
-        response: bool = await RestrictChatMember(
-            chat_id=-42, user_id=42, permissions=ChatPermissions()
-        )
-        request: Request = bot.get_request()
-        assert request.method == "restrictChatMember"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(RestrictChatMember, ok=True, result=True)
 
         response: bool = await bot.restrict_chat_member(
             chat_id=-42, user_id=42, permissions=ChatPermissions()
         )
-        request: Request = bot.get_request()
-        assert request.method == "restrictChatMember"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_revoke_chat_invite_link.py b/tests/test_api/test_methods/test_revoke_chat_invite_link.py
index 84ca46b5..9d8c26b3 100644
--- a/tests/test_api/test_methods/test_revoke_chat_invite_link.py
+++ b/tests/test_api/test_methods/test_revoke_chat_invite_link.py
@@ -4,27 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestRevokeChatInviteLink:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            RevokeChatInviteLink,
-            ok=True,
-            result=ChatInviteLink(
-                invite_link="https://t.me/username",
-                creator=User(id=42, is_bot=False, first_name="User"),
-                is_primary=False,
-                is_revoked=True,
-                creates_join_request=False,
-            ),
-        )
-
-        response: ChatInviteLink = await RevokeChatInviteLink(
-            chat_id=-42,
-            invite_link="https://t.me/username",
-        )
-        request: Request = bot.get_request()
-        assert request.method == "revokeChatInviteLink"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             RevokeChatInviteLink,
@@ -42,6 +21,5 @@ class TestRevokeChatInviteLink:
             chat_id=-42,
             invite_link="https://t.me/username",
         )
-        request: Request = bot.get_request()
-        assert request.method == "revokeChatInviteLink"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_animation.py b/tests/test_api/test_methods/test_send_animation.py
index 5ec7f52a..b9f5508f 100644
--- a/tests/test_api/test_methods/test_send_animation.py
+++ b/tests/test_api/test_methods/test_send_animation.py
@@ -6,25 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendAnimation:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendAnimation,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                animation=Animation(
-                    file_id="file id", width=42, height=42, duration=0, file_unique_id="file id"
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendAnimation(chat_id=42, animation="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendAnimation"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendAnimation,
@@ -40,6 +21,5 @@ class TestSendAnimation:
         )
 
         response: Message = await bot.send_animation(chat_id=42, animation="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendAnimation"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_audio.py b/tests/test_api/test_methods/test_send_audio.py
index 95621f10..b5b2a32b 100644
--- a/tests/test_api/test_methods/test_send_audio.py
+++ b/tests/test_api/test_methods/test_send_audio.py
@@ -6,23 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendAudio:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendAudio,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                audio=Audio(file_id="file id", duration=42, file_unique_id="file id"),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendAudio(chat_id=42, audio="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendAudio"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendAudio,
@@ -36,6 +19,5 @@ class TestSendAudio:
         )
 
         response: Message = await bot.send_audio(chat_id=42, audio="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendAudio"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_chat_action.py b/tests/test_api/test_methods/test_send_chat_action.py
index a37568fe..3c2d8ecb 100644
--- a/tests/test_api/test_methods/test_send_chat_action.py
+++ b/tests/test_api/test_methods/test_send_chat_action.py
@@ -4,27 +4,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendChatAction:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SendChatAction, ok=True, result=True)
-
-        response: bool = await SendChatAction(chat_id=42, action="typing")
-        request: Request = bot.get_request()
-        assert request.method == "sendChatAction"
-        assert response == prepare_result.result
-
-    async def test_bot_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SendChatAction, ok=True, result=True)
-
-        response: bool = await bot.send_chat_action(chat_id=42, action="typing")
-        request: Request = bot.get_request()
-        assert request.method == "sendChatAction"
-        assert response == prepare_result.result
-
     async def test_chat_action_class(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SendChatAction, ok=True, result=True)
 
         response: bool = await bot.send_chat_action(chat_id=42, action=ChatAction.TYPING)
-        request: Request = bot.get_request()
-        assert request.method == "sendChatAction"
-        assert request.data["action"] == "typing"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_contact.py b/tests/test_api/test_methods/test_send_contact.py
index 97f6981c..83c6f3ae 100644
--- a/tests/test_api/test_methods/test_send_contact.py
+++ b/tests/test_api/test_methods/test_send_contact.py
@@ -6,23 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendContact:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendContact,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                contact=Contact(phone_number="911", first_name="911"),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendContact(chat_id=42, phone_number="911", first_name="911")
-        request: Request = bot.get_request()
-        assert request.method == "sendContact"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendContact,
@@ -38,6 +21,5 @@ class TestSendContact:
         response: Message = await bot.send_contact(
             chat_id=42, phone_number="911", first_name="911"
         )
-        request: Request = bot.get_request()
-        assert request.method == "sendContact"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_dice.py b/tests/test_api/test_methods/test_send_dice.py
index 3dea06c4..35196ee6 100644
--- a/tests/test_api/test_methods/test_send_dice.py
+++ b/tests/test_api/test_methods/test_send_dice.py
@@ -4,18 +4,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendDice:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SendDice, ok=True, result=None)
-
-        response: Message = await SendDice(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "sendDice"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SendDice, ok=True, result=None)
 
         response: Message = await bot.send_dice(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "sendDice"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_document.py b/tests/test_api/test_methods/test_send_document.py
index cf758815..54c0d712 100644
--- a/tests/test_api/test_methods/test_send_document.py
+++ b/tests/test_api/test_methods/test_send_document.py
@@ -6,23 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendDocument:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendDocument,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                document=Document(file_id="file id", file_unique_id="file id"),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendDocument(chat_id=42, document="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendDocument"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendDocument,
@@ -36,6 +19,5 @@ class TestSendDocument:
         )
 
         response: Message = await bot.send_document(chat_id=42, document="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendDocument"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_game.py b/tests/test_api/test_methods/test_send_game.py
index 57ab645f..a0d1bb84 100644
--- a/tests/test_api/test_methods/test_send_game.py
+++ b/tests/test_api/test_methods/test_send_game.py
@@ -6,29 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendGame:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendGame,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                game=Game(
-                    title="title",
-                    description="description",
-                    photo=[
-                        PhotoSize(file_id="file id", width=42, height=42, file_unique_id="file id")
-                    ],
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendGame(chat_id=42, game_short_name="game")
-        request: Request = bot.get_request()
-        assert request.method == "sendGame"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendGame,
@@ -48,6 +25,5 @@ class TestSendGame:
         )
 
         response: Message = await bot.send_game(chat_id=42, game_short_name="game")
-        request: Request = bot.get_request()
-        assert request.method == "sendGame"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_invoice.py b/tests/test_api/test_methods/test_send_invoice.py
index e88d9acf..650c4a19 100644
--- a/tests/test_api/test_methods/test_send_invoice.py
+++ b/tests/test_api/test_methods/test_send_invoice.py
@@ -6,38 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendInvoice:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendInvoice,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                invoice=Invoice(
-                    title="test",
-                    description="test",
-                    start_parameter="brilliant",
-                    currency="BTC",
-                    total_amount=1,
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendInvoice(
-            chat_id=42,
-            title="test",
-            description="test",
-            payload="payload",
-            provider_token="TEST:token",
-            start_parameter="brilliant",
-            currency="BTC",
-            prices=[LabeledPrice(amount=1, label="test")],
-        )
-        request: Request = bot.get_request()
-        assert request.method == "sendInvoice"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendInvoice,
@@ -66,6 +34,5 @@ class TestSendInvoice:
             currency="BTC",
             prices=[LabeledPrice(amount=1, label="test")],
         )
-        request: Request = bot.get_request()
-        assert request.method == "sendInvoice"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_location.py b/tests/test_api/test_methods/test_send_location.py
index 7429f0b8..b662106d 100644
--- a/tests/test_api/test_methods/test_send_location.py
+++ b/tests/test_api/test_methods/test_send_location.py
@@ -6,23 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendLocation:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendLocation,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                location=Location(longitude=3.14, latitude=3.14),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendLocation(chat_id=42, latitude=3.14, longitude=3.14)
-        request: Request = bot.get_request()
-        assert request.method == "sendLocation"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendLocation,
@@ -36,6 +19,5 @@ class TestSendLocation:
         )
 
         response: Message = await bot.send_location(chat_id=42, latitude=3.14, longitude=3.14)
-        request: Request = bot.get_request()
-        assert request.method == "sendLocation"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_media_group.py b/tests/test_api/test_methods/test_send_media_group.py
index 149937d4..759184f7 100644
--- a/tests/test_api/test_methods/test_send_media_group.py
+++ b/tests/test_api/test_methods/test_send_media_group.py
@@ -15,47 +15,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendMediaGroup:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendMediaGroup,
-            ok=True,
-            result=[
-                Message(
-                    message_id=42,
-                    date=datetime.datetime.now(),
-                    photo=[
-                        PhotoSize(file_id="file id", width=42, height=42, file_unique_id="file id")
-                    ],
-                    media_group_id="media group",
-                    chat=Chat(id=42, type="private"),
-                ),
-                Message(
-                    message_id=43,
-                    date=datetime.datetime.now(),
-                    video=Video(
-                        file_id="file id",
-                        width=42,
-                        height=42,
-                        duration=0,
-                        file_unique_id="file id",
-                    ),
-                    media_group_id="media group",
-                    chat=Chat(id=42, type="private"),
-                ),
-            ],
-        )
-
-        response: List[Message] = await SendMediaGroup(
-            chat_id=42,
-            media=[
-                InputMediaPhoto(media="file id"),
-                InputMediaVideo(media=BufferedInputFile(b"", "video.mp4")),
-            ],
-        )
-        request: Request = bot.get_request()
-        assert request.method == "sendMediaGroup"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendMediaGroup,
@@ -93,6 +52,5 @@ class TestSendMediaGroup:
                 InputMediaVideo(media=BufferedInputFile(b"", "video.mp4")),
             ],
         )
-        request: Request = bot.get_request()
-        assert request.method == "sendMediaGroup"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_message.py b/tests/test_api/test_methods/test_send_message.py
index 5ebe604a..0210d73f 100644
--- a/tests/test_api/test_methods/test_send_message.py
+++ b/tests/test_api/test_methods/test_send_message.py
@@ -6,23 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendMessage:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendMessage,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                text="test",
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendMessage(chat_id=42, text="test")
-        request: Request = bot.get_request()
-        assert request.method == "sendMessage"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendMessage,
@@ -36,8 +19,7 @@ class TestSendMessage:
         )
 
         response: Message = await bot.send_message(chat_id=42, text="test")
-        request: Request = bot.get_request()
-        assert request.method == "sendMessage"
+        request = bot.get_request()
         assert response == prepare_result.result
 
     async def test_force_reply(self):
diff --git a/tests/test_api/test_methods/test_send_photo.py b/tests/test_api/test_methods/test_send_photo.py
index 0e955dd1..528a04a1 100644
--- a/tests/test_api/test_methods/test_send_photo.py
+++ b/tests/test_api/test_methods/test_send_photo.py
@@ -6,25 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendPhoto:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendPhoto,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                photo=[
-                    PhotoSize(file_id="file id", width=42, height=42, file_unique_id="file id")
-                ],
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendPhoto(chat_id=42, photo="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendPhoto"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendPhoto,
@@ -40,6 +21,5 @@ class TestSendPhoto:
         )
 
         response: Message = await bot.send_photo(chat_id=42, photo="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendPhoto"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_poll.py b/tests/test_api/test_methods/test_send_poll.py
index 9f67af14..4bc791fc 100644
--- a/tests/test_api/test_methods/test_send_poll.py
+++ b/tests/test_api/test_methods/test_send_poll.py
@@ -6,38 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendPoll:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendPoll,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                poll=Poll(
-                    id="QA",
-                    question="Q",
-                    options=[
-                        PollOption(text="A", voter_count=0),
-                        PollOption(text="B", voter_count=0),
-                    ],
-                    is_closed=False,
-                    is_anonymous=False,
-                    type="quiz",
-                    allows_multiple_answers=False,
-                    total_voter_count=0,
-                    correct_option_id=0,
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendPoll(
-            chat_id=42, question="Q?", options=["A", "B"], correct_option_id=0, type="quiz"
-        )
-        request: Request = bot.get_request()
-        assert request.method == "sendPoll"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendPoll,
@@ -66,6 +34,5 @@ class TestSendPoll:
         response: Message = await bot.send_poll(
             chat_id=42, question="Q?", options=["A", "B"], correct_option_id=0, type="quiz"
         )
-        request: Request = bot.get_request()
-        assert request.method == "sendPoll"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_sticker.py b/tests/test_api/test_methods/test_send_sticker.py
index b19313fc..af847e08 100644
--- a/tests/test_api/test_methods/test_send_sticker.py
+++ b/tests/test_api/test_methods/test_send_sticker.py
@@ -6,31 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendSticker:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendSticker,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                sticker=Sticker(
-                    file_id="file id",
-                    width=42,
-                    height=42,
-                    is_animated=False,
-                    is_video=False,
-                    file_unique_id="file id",
-                    type="regular",
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendSticker(chat_id=42, sticker="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendSticker"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendSticker,
@@ -52,6 +27,5 @@ class TestSendSticker:
         )
 
         response: Message = await bot.send_sticker(chat_id=42, sticker="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendSticker"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_venue.py b/tests/test_api/test_methods/test_send_venue.py
index 6a529fcb..4234c7a5 100644
--- a/tests/test_api/test_methods/test_send_venue.py
+++ b/tests/test_api/test_methods/test_send_venue.py
@@ -6,35 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendVenue:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendVenue,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                venue=Venue(
-                    location=Location(latitude=3.14, longitude=3.14),
-                    title="Cupboard Under the Stairs",
-                    address="Under the stairs, 4 Privet Drive, "
-                    "Little Whinging, Surrey, England, Great Britain",
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendVenue(
-            chat_id=42,
-            latitude=3.14,
-            longitude=3.14,
-            title="Cupboard Under the Stairs",
-            address="Under the stairs, 4 Privet Drive, "
-            "Little Whinging, Surrey, England, Great Britain",
-        )
-        request: Request = bot.get_request()
-        assert request.method == "sendVenue"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendVenue,
@@ -60,6 +31,5 @@ class TestSendVenue:
             address="Under the stairs, 4 Privet Drive, "
             "Little Whinging, Surrey, England, Great Britain",
         )
-        request: Request = bot.get_request()
-        assert request.method == "sendVenue"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_video.py b/tests/test_api/test_methods/test_send_video.py
index 86e3c413..16572b3e 100644
--- a/tests/test_api/test_methods/test_send_video.py
+++ b/tests/test_api/test_methods/test_send_video.py
@@ -6,25 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendVideo:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendVideo,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                video=Video(
-                    file_id="file id", width=42, height=42, duration=0, file_unique_id="file id"
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendVideo(chat_id=42, video="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendVideo"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendVideo,
@@ -40,6 +21,5 @@ class TestSendVideo:
         )
 
         response: Message = await bot.send_video(chat_id=42, video="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendVideo"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_video_note.py b/tests/test_api/test_methods/test_send_video_note.py
index bec233c7..3da752f5 100644
--- a/tests/test_api/test_methods/test_send_video_note.py
+++ b/tests/test_api/test_methods/test_send_video_note.py
@@ -6,29 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendVideoNote:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendVideoNote,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                video_note=VideoNote(
-                    file_id="file id", length=0, duration=0, file_unique_id="file id"
-                ),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendVideoNote(
-            chat_id=42,
-            video_note="file id",
-            thumbnail=BufferedInputFile(b"", "file.png"),
-        )
-        request: Request = bot.get_request()
-        assert request.method == "sendVideoNote"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendVideoNote,
@@ -48,6 +25,5 @@ class TestSendVideoNote:
             video_note="file id",
             thumbnail=BufferedInputFile(b"", "file.png"),
         )
-        request: Request = bot.get_request()
-        assert request.method == "sendVideoNote"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_send_voice.py b/tests/test_api/test_methods/test_send_voice.py
index 917a645b..2c55b07d 100644
--- a/tests/test_api/test_methods/test_send_voice.py
+++ b/tests/test_api/test_methods/test_send_voice.py
@@ -6,23 +6,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSendVoice:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SendVoice,
-            ok=True,
-            result=Message(
-                message_id=42,
-                date=datetime.datetime.now(),
-                voice=Voice(file_id="file id", duration=0, file_unique_id="file id"),
-                chat=Chat(id=42, type="private"),
-            ),
-        )
-
-        response: Message = await SendVoice(chat_id=42, voice="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendVoice"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SendVoice,
@@ -36,6 +19,5 @@ class TestSendVoice:
         )
 
         response: Message = await bot.send_voice(chat_id=42, voice="file id")
-        request: Request = bot.get_request()
-        assert request.method == "sendVoice"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_administrator_custom_title.py b/tests/test_api/test_methods/test_set_chat_administrator_custom_title.py
index 7581e37d..7a759618 100644
--- a/tests/test_api/test_methods/test_set_chat_administrator_custom_title.py
+++ b/tests/test_api/test_methods/test_set_chat_administrator_custom_title.py
@@ -3,22 +3,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatTitle:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatAdministratorCustomTitle, ok=True, result=True)
-
-        response: bool = await SetChatAdministratorCustomTitle(
-            chat_id=-42, user_id=42, custom_title="test chat"
-        )
-        request: Request = bot.get_request()
-        assert request.method == "setChatAdministratorCustomTitle"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatAdministratorCustomTitle, ok=True, result=True)
 
         response: bool = await bot.set_chat_administrator_custom_title(
             chat_id=-42, user_id=42, custom_title="test chat"
         )
-        request: Request = bot.get_request()
-        assert request.method == "setChatAdministratorCustomTitle"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_description.py b/tests/test_api/test_methods/test_set_chat_description.py
index 0a11d7e3..eb9885d2 100644
--- a/tests/test_api/test_methods/test_set_chat_description.py
+++ b/tests/test_api/test_methods/test_set_chat_description.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatDescription:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatDescription, ok=True, result=True)
-
-        response: bool = await SetChatDescription(chat_id=-42, description="awesome chat")
-        request: Request = bot.get_request()
-        assert request.method == "setChatDescription"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatDescription, ok=True, result=True)
 
         response: bool = await bot.set_chat_description(chat_id=-42, description="awesome chat")
-        request: Request = bot.get_request()
-        assert request.method == "setChatDescription"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_menu_button.py b/tests/test_api/test_methods/test_set_chat_menu_button.py
index 74923a5f..1cac7081 100644
--- a/tests/test_api/test_methods/test_set_chat_menu_button.py
+++ b/tests/test_api/test_methods/test_set_chat_menu_button.py
@@ -3,20 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatMenuButton:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatMenuButton, ok=True, result=True)
-
-        response: bool = await SetChatMenuButton()
-        request: Request = bot.get_request()
-        assert request.method == "setChatMenuButton"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatMenuButton, ok=True, result=True)
 
         response: bool = await bot.set_chat_menu_button()
-        request: Request = bot.get_request()
-        assert request.method == "setChatMenuButton"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_permissions.py b/tests/test_api/test_methods/test_set_chat_permissions.py
index 73f488c1..1dcd64b9 100644
--- a/tests/test_api/test_methods/test_set_chat_permissions.py
+++ b/tests/test_api/test_methods/test_set_chat_permissions.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatPermissions:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatPermissions, ok=True, result=True)
-
-        response: bool = await SetChatPermissions(
-            chat_id=-42, permissions=ChatPermissions(can_send_messages=False)
-        )
-        request: Request = bot.get_request()
-        assert request.method == "setChatPermissions"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatPermissions, ok=True, result=True)
 
         response: bool = await bot.set_chat_permissions(
             chat_id=-42, permissions=ChatPermissions(can_send_messages=False)
         )
-        request: Request = bot.get_request()
-        assert request.method == "setChatPermissions"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_photo.py b/tests/test_api/test_methods/test_set_chat_photo.py
index e17126f6..68e0bbbc 100644
--- a/tests/test_api/test_methods/test_set_chat_photo.py
+++ b/tests/test_api/test_methods/test_set_chat_photo.py
@@ -4,22 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatPhoto:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatPhoto, ok=True, result=True)
-
-        response: bool = await SetChatPhoto(
-            chat_id=-42, photo=BufferedInputFile(b"", filename="file.png")
-        )
-        request: Request = bot.get_request()
-        assert request.method == "setChatPhoto"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatPhoto, ok=True, result=True)
 
         response: bool = await bot.set_chat_photo(
             chat_id=-42, photo=BufferedInputFile(b"", filename="file.png")
         )
-        request: Request = bot.get_request()
-        assert request.method == "setChatPhoto"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_sticker_set.py b/tests/test_api/test_methods/test_set_chat_sticker_set.py
index cba3ba1f..c87be0cd 100644
--- a/tests/test_api/test_methods/test_set_chat_sticker_set.py
+++ b/tests/test_api/test_methods/test_set_chat_sticker_set.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatStickerSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatStickerSet, ok=True, result=True)
-
-        response: bool = await SetChatStickerSet(chat_id=-42, sticker_set_name="test")
-        request: Request = bot.get_request()
-        assert request.method == "setChatStickerSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatStickerSet, ok=True, result=True)
 
         response: bool = await bot.set_chat_sticker_set(chat_id=-42, sticker_set_name="test")
-        request: Request = bot.get_request()
-        assert request.method == "setChatStickerSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_chat_title.py b/tests/test_api/test_methods/test_set_chat_title.py
index 03f37b15..e45d24f2 100644
--- a/tests/test_api/test_methods/test_set_chat_title.py
+++ b/tests/test_api/test_methods/test_set_chat_title.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetChatTitle:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetChatTitle, ok=True, result=True)
-
-        response: bool = await SetChatTitle(chat_id=-42, title="test chat")
-        request: Request = bot.get_request()
-        assert request.method == "setChatTitle"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetChatTitle, ok=True, result=True)
 
         response: bool = await bot.set_chat_title(chat_id=-42, title="test chat")
-        request: Request = bot.get_request()
-        assert request.method == "setChatTitle"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_custom_emoji_sticker_set_thumbnail.py b/tests/test_api/test_methods/test_set_custom_emoji_sticker_set_thumbnail.py
index 20ad08c9..75d056df 100644
--- a/tests/test_api/test_methods/test_set_custom_emoji_sticker_set_thumbnail.py
+++ b/tests/test_api/test_methods/test_set_custom_emoji_sticker_set_thumbnail.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetCustomEmojiStickerSetThumbnail:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            SetCustomEmojiStickerSetThumbnail, ok=True, result=True
-        )
-
-        response: bool = await SetCustomEmojiStickerSetThumbnail(
-            name="test", custom_emoji_id="custom id"
-        )
-        request: Request = bot.get_request()
-        assert request.method == "setCustomEmojiStickerSetThumbnail"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             SetCustomEmojiStickerSetThumbnail, ok=True, result=True
@@ -23,6 +11,5 @@ class TestSetCustomEmojiStickerSetThumbnail:
         response: bool = await bot.set_custom_emoji_sticker_set_thumbnail(
             name="test", custom_emoji_id="custom id"
         )
-        request: Request = bot.get_request()
-        assert request.method == "setCustomEmojiStickerSetThumbnail"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_game_score.py b/tests/test_api/test_methods/test_set_game_score.py
index 4e739a89..6da8e123 100644
--- a/tests/test_api/test_methods/test_set_game_score.py
+++ b/tests/test_api/test_methods/test_set_game_score.py
@@ -6,22 +6,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetGameScore:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetGameScore, ok=True, result=True)
-
-        response: Union[Message, bool] = await SetGameScore(
-            user_id=42, score=100500, inline_message_id="inline message"
-        )
-        request: Request = bot.get_request()
-        assert request.method == "setGameScore"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetGameScore, ok=True, result=True)
 
         response: Union[Message, bool] = await bot.set_game_score(
             user_id=42, score=100500, inline_message_id="inline message"
         )
-        request: Request = bot.get_request()
-        assert request.method == "setGameScore"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_my_commands.py b/tests/test_api/test_methods/test_set_my_commands.py
index 35f62e0c..16066b73 100644
--- a/tests/test_api/test_methods/test_set_my_commands.py
+++ b/tests/test_api/test_methods/test_set_my_commands.py
@@ -4,23 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetMyCommands:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetMyCommands, ok=True, result=None)
-
-        response: bool = await SetMyCommands(
-            commands=[BotCommand(command="command", description="Bot command")],
-        )
-        request: Request = bot.get_request()
-        assert request.method == "setMyCommands"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetMyCommands, ok=True, result=None)
 
         response: bool = await bot.set_my_commands(
             commands=[],
         )
-        request: Request = bot.get_request()
-        assert request.method == "setMyCommands"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_my_default_administrator_rights.py b/tests/test_api/test_methods/test_set_my_default_administrator_rights.py
index eb24a531..ac8e5d42 100644
--- a/tests/test_api/test_methods/test_set_my_default_administrator_rights.py
+++ b/tests/test_api/test_methods/test_set_my_default_administrator_rights.py
@@ -3,20 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetMyDefaultAdministratorRights:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetMyDefaultAdministratorRights, ok=True, result=True)
-
-        response: bool = await SetMyDefaultAdministratorRights()
-        request: Request = bot.get_request()
-        assert request.method == "setMyDefaultAdministratorRights"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetMyDefaultAdministratorRights, ok=True, result=True)
 
         response: bool = await bot.set_my_default_administrator_rights()
-        request: Request = bot.get_request()
-        assert request.method == "setMyDefaultAdministratorRights"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_my_description.py b/tests/test_api/test_methods/test_set_my_description.py
index 843b66d2..05e9bd7c 100644
--- a/tests/test_api/test_methods/test_set_my_description.py
+++ b/tests/test_api/test_methods/test_set_my_description.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetMyDescription:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetMyDescription, ok=True, result=True)
-
-        response: bool = await SetMyDescription(description="Test")
-        request: Request = bot.get_request()
-        assert request.method == "setMyDescription"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetMyDescription, ok=True, result=True)
 
         response: bool = await bot.set_my_description(description="Test")
-        request: Request = bot.get_request()
-        assert request.method == "setMyDescription"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_my_short_description.py b/tests/test_api/test_methods/test_set_my_short_description.py
index c985dee2..9b40721d 100644
--- a/tests/test_api/test_methods/test_set_my_short_description.py
+++ b/tests/test_api/test_methods/test_set_my_short_description.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetMyShortDescription:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetMyShortDescription, ok=True, result=True)
-
-        response: bool = await SetMyShortDescription(short_description="Test")
-        request: Request = bot.get_request()
-        assert request.method == "setMyShortDescription"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetMyShortDescription, ok=True, result=True)
 
         response: bool = await bot.set_my_short_description(short_description="Test")
-        request: Request = bot.get_request()
-        assert request.method == "setMyShortDescription"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_passport_data_errors.py b/tests/test_api/test_methods/test_set_passport_data_errors.py
index cdc77778..ecc2425b 100644
--- a/tests/test_api/test_methods/test_set_passport_data_errors.py
+++ b/tests/test_api/test_methods/test_set_passport_data_errors.py
@@ -4,20 +4,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetPassportDataErrors:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetPassportDataErrors, ok=True, result=True)
-
-        response: bool = await SetPassportDataErrors(user_id=42, errors=[PassportElementError()])
-        request: Request = bot.get_request()
-        assert request.method == "setPassportDataErrors"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetPassportDataErrors, ok=True, result=True)
 
         response: bool = await bot.set_passport_data_errors(
             user_id=42, errors=[PassportElementError()]
         )
-        request: Request = bot.get_request()
-        assert request.method == "setPassportDataErrors"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_sticker_emoji_list.py b/tests/test_api/test_methods/test_set_sticker_emoji_list.py
index b5ae829c..76984264 100644
--- a/tests/test_api/test_methods/test_set_sticker_emoji_list.py
+++ b/tests/test_api/test_methods/test_set_sticker_emoji_list.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetStickerEmojiList:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetStickerEmojiList, ok=True, result=True)
-
-        response: bool = await SetStickerEmojiList(sticker="sticker id", emoji_list=["X"])
-        request: Request = bot.get_request()
-        assert request.method == "setStickerEmojiList"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetStickerEmojiList, ok=True, result=True)
 
         response: bool = await bot.set_sticker_emoji_list(sticker="sticker id", emoji_list=["X"])
-        request: Request = bot.get_request()
-        assert request.method == "setStickerEmojiList"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_sticker_keywords.py b/tests/test_api/test_methods/test_set_sticker_keywords.py
index 7cea6cae..ff9b31e4 100644
--- a/tests/test_api/test_methods/test_set_sticker_keywords.py
+++ b/tests/test_api/test_methods/test_set_sticker_keywords.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetStickerKeywords:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetStickerKeywords, ok=True, result=True)
-
-        response: bool = await SetStickerKeywords(sticker="sticker id", keywords=["X"])
-        request: Request = bot.get_request()
-        assert request.method == "setStickerKeywords"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetStickerKeywords, ok=True, result=True)
 
         response: bool = await bot.set_sticker_keywords(sticker="sticker id", keywords=["X"])
-        request: Request = bot.get_request()
-        assert request.method == "setStickerKeywords"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_sticker_mask_position.py b/tests/test_api/test_methods/test_set_sticker_mask_position.py
index dec92d19..fa041461 100644
--- a/tests/test_api/test_methods/test_set_sticker_mask_position.py
+++ b/tests/test_api/test_methods/test_set_sticker_mask_position.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetStickerEmojiList:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetStickerMaskPosition, ok=True, result=True)
-
-        response: bool = await SetStickerMaskPosition(sticker="sticker id")
-        request: Request = bot.get_request()
-        assert request.method == "setStickerMaskPosition"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetStickerMaskPosition, ok=True, result=True)
 
         response: bool = await bot.set_sticker_mask_position(sticker="sticker id")
-        request: Request = bot.get_request()
-        assert request.method == "setStickerMaskPosition"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_sticker_position_in_set.py b/tests/test_api/test_methods/test_set_sticker_position_in_set.py
index c67c7be5..ce06652c 100644
--- a/tests/test_api/test_methods/test_set_sticker_position_in_set.py
+++ b/tests/test_api/test_methods/test_set_sticker_position_in_set.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetStickerPositionInSet:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetStickerPositionInSet, ok=True, result=True)
-
-        response: bool = await SetStickerPositionInSet(sticker="sticker", position=42)
-        request: Request = bot.get_request()
-        assert request.method == "setStickerPositionInSet"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetStickerPositionInSet, ok=True, result=True)
 
         response: bool = await bot.set_sticker_position_in_set(sticker="sticker", position=42)
-        request: Request = bot.get_request()
-        assert request.method == "setStickerPositionInSet"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_sticker_set_thumbnail.py b/tests/test_api/test_methods/test_set_sticker_set_thumbnail.py
index 41795be6..6c33f862 100644
--- a/tests/test_api/test_methods/test_set_sticker_set_thumbnail.py
+++ b/tests/test_api/test_methods/test_set_sticker_set_thumbnail.py
@@ -3,20 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetStickerSetThumbnail:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetStickerSetThumbnail, ok=True, result=None)
-
-        response: bool = await SetStickerSetThumbnail(name="test", user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "setStickerSetThumbnail"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetStickerSetThumbnail, ok=True, result=None)
 
         response: bool = await bot.set_sticker_set_thumbnail(name="test", user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "setStickerSetThumbnail"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_sticker_set_title.py b/tests/test_api/test_methods/test_set_sticker_set_title.py
index 1dc306bc..2a9645cb 100644
--- a/tests/test_api/test_methods/test_set_sticker_set_title.py
+++ b/tests/test_api/test_methods/test_set_sticker_set_title.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetStickerSetTitle:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetStickerSetTitle, ok=True, result=True)
-
-        response: bool = await SetStickerSetTitle(name="test", title="Test")
-        request: Request = bot.get_request()
-        assert request.method == "setStickerSetTitle"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetStickerSetTitle, ok=True, result=True)
 
         response: bool = await bot.set_sticker_set_title(name="test", title="Test")
-        request: Request = bot.get_request()
-        assert request.method == "setStickerSetTitle"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_set_webhook.py b/tests/test_api/test_methods/test_set_webhook.py
index cfa291c3..c38a2bfa 100644
--- a/tests/test_api/test_methods/test_set_webhook.py
+++ b/tests/test_api/test_methods/test_set_webhook.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestSetWebhook:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(SetWebhook, ok=True, result=True)
-
-        response: bool = await SetWebhook(url="https://example.com")
-        request: Request = bot.get_request()
-        assert request.method == "setWebhook"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(SetWebhook, ok=True, result=True)
 
         response: bool = await bot.set_webhook(url="https://example.com")
-        request: Request = bot.get_request()
-        assert request.method == "setWebhook"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_stop_message_live_location.py b/tests/test_api/test_methods/test_stop_message_live_location.py
index 2c1168f1..99c8b675 100644
--- a/tests/test_api/test_methods/test_stop_message_live_location.py
+++ b/tests/test_api/test_methods/test_stop_message_live_location.py
@@ -6,22 +6,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestStopMessageLiveLocation:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(StopMessageLiveLocation, ok=True, result=True)
-
-        response: Union[Message, bool] = await StopMessageLiveLocation(
-            inline_message_id="inline message id"
-        )
-        request: Request = bot.get_request()
-        assert request.method == "stopMessageLiveLocation"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(StopMessageLiveLocation, ok=True, result=True)
 
         response: Union[Message, bool] = await bot.stop_message_live_location(
             inline_message_id="inline message id"
         )
-        request: Request = bot.get_request()
-        assert request.method == "stopMessageLiveLocation"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_stop_poll.py b/tests/test_api/test_methods/test_stop_poll.py
index 7601c771..ef2d36d6 100644
--- a/tests/test_api/test_methods/test_stop_poll.py
+++ b/tests/test_api/test_methods/test_stop_poll.py
@@ -4,28 +4,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestStopPoll:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            StopPoll,
-            ok=True,
-            result=Poll(
-                id="QA",
-                question="Q",
-                options=[PollOption(text="A", voter_count=0), PollOption(text="B", voter_count=0)],
-                is_closed=False,
-                is_anonymous=False,
-                type="quiz",
-                allows_multiple_answers=False,
-                total_voter_count=0,
-                correct_option_id=0,
-            ),
-        )
-
-        response: Poll = await StopPoll(chat_id=42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "stopPoll"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             StopPoll,
@@ -44,6 +22,5 @@ class TestStopPoll:
         )
 
         response: Poll = await bot.stop_poll(chat_id=42, message_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "stopPoll"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_unban_chat_member.py b/tests/test_api/test_methods/test_unban_chat_member.py
index 72ba662c..291512fa 100644
--- a/tests/test_api/test_methods/test_unban_chat_member.py
+++ b/tests/test_api/test_methods/test_unban_chat_member.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUnbanChatMember:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(UnbanChatMember, ok=True, result=True)
-
-        response: bool = await UnbanChatMember(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "unbanChatMember"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(UnbanChatMember, ok=True, result=True)
 
         response: bool = await bot.unban_chat_member(chat_id=-42, user_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "unbanChatMember"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_unban_chat_sender_chat.py b/tests/test_api/test_methods/test_unban_chat_sender_chat.py
index 4a259c62..54c334ab 100755
--- a/tests/test_api/test_methods/test_unban_chat_sender_chat.py
+++ b/tests/test_api/test_methods/test_unban_chat_sender_chat.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUnbanChatSenderChat:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(UnbanChatSenderChat, ok=True, result=True)
-
-        response: bool = await UnbanChatSenderChat(
-            chat_id=-42,
-            sender_chat_id=-1337,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "unbanChatSenderChat"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(UnbanChatSenderChat, ok=True, result=True)
 
@@ -22,7 +10,5 @@ class TestUnbanChatSenderChat:
             chat_id=-42,
             sender_chat_id=-1337,
         )
-        request: Request = bot.get_request()
-        assert request.method == "unbanChatSenderChat"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_unhide_general_forum_topic.py b/tests/test_api/test_methods/test_unhide_general_forum_topic.py
index 45fcb0c8..eb69223b 100644
--- a/tests/test_api/test_methods/test_unhide_general_forum_topic.py
+++ b/tests/test_api/test_methods/test_unhide_general_forum_topic.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUnhideGeneralForumTopic:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(UnhideGeneralForumTopic, ok=True, result=True)
-
-        response: bool = await bot(UnhideGeneralForumTopic(chat_id=42))
-        request: Request = bot.get_request()
-        assert request.method == "unhideGeneralForumTopic"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(UnhideGeneralForumTopic, ok=True, result=True)
 
         response: bool = await bot.unhide_general_forum_topic(chat_id=42)
-        request: Request = bot.get_request()
-        assert request.method == "unhideGeneralForumTopic"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_unpin_all_chat_messages.py b/tests/test_api/test_methods/test_unpin_all_chat_messages.py
index 82202742..173ce711 100644
--- a/tests/test_api/test_methods/test_unpin_all_chat_messages.py
+++ b/tests/test_api/test_methods/test_unpin_all_chat_messages.py
@@ -3,24 +3,11 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUnpinAllChatMessages:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(UnpinAllChatMessages, ok=True, result=True)
-
-        response: bool = await UnpinAllChatMessages(
-            chat_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "unpinAllChatMessages"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(UnpinAllChatMessages, ok=True, result=True)
 
         response: bool = await bot.unpin_all_chat_messages(
             chat_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "unpinAllChatMessages"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_unpin_all_forum_topic_messages.py b/tests/test_api/test_methods/test_unpin_all_forum_topic_messages.py
index 445f2b4c..ac7b409c 100644
--- a/tests/test_api/test_methods/test_unpin_all_forum_topic_messages.py
+++ b/tests/test_api/test_methods/test_unpin_all_forum_topic_messages.py
@@ -3,18 +3,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUnpinAllForumTopicMessages:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(UnpinAllForumTopicMessages, ok=True, result=True)
-
-        response: bool = await UnpinAllForumTopicMessages(
-            chat_id=42,
-            message_thread_id=42,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "unpinAllForumTopicMessages"
-        # assert request.data == {}
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(UnpinAllForumTopicMessages, ok=True, result=True)
 
@@ -22,7 +10,5 @@ class TestUnpinAllForumTopicMessages:
             chat_id=42,
             message_thread_id=42,
         )
-        request: Request = bot.get_request()
-        assert request.method == "unpinAllForumTopicMessages"
-        # assert request.data == {}
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_unpin_chat_message.py b/tests/test_api/test_methods/test_unpin_chat_message.py
index 52f8765a..804b3ae2 100644
--- a/tests/test_api/test_methods/test_unpin_chat_message.py
+++ b/tests/test_api/test_methods/test_unpin_chat_message.py
@@ -3,18 +3,9 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUnpinChatMessage:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(UnpinChatMessage, ok=True, result=True)
-
-        response: bool = await UnpinChatMessage(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "unpinChatMessage"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(UnpinChatMessage, ok=True, result=True)
 
         response: bool = await bot.unpin_chat_message(chat_id=-42)
-        request: Request = bot.get_request()
-        assert request.method == "unpinChatMessage"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_api/test_methods/test_upload_sticker_file.py b/tests/test_api/test_methods/test_upload_sticker_file.py
index 7a6bded9..fda4c4d0 100644
--- a/tests/test_api/test_methods/test_upload_sticker_file.py
+++ b/tests/test_api/test_methods/test_upload_sticker_file.py
@@ -5,20 +5,6 @@ from tests.mocked_bot import MockedBot
 
 
 class TestUploadStickerFile:
-    async def test_method(self, bot: MockedBot):
-        prepare_result = bot.add_result_for(
-            UploadStickerFile, ok=True, result=File(file_id="file id", file_unique_id="file id")
-        )
-
-        response: File = await UploadStickerFile(
-            user_id=42,
-            sticker=BufferedInputFile(b"", "file.png"),
-            sticker_format=StickerFormat.STATIC,
-        )
-        request: Request = bot.get_request()
-        assert request.method == "uploadStickerFile"
-        assert response == prepare_result.result
-
     async def test_bot_method(self, bot: MockedBot):
         prepare_result = bot.add_result_for(
             UploadStickerFile, ok=True, result=File(file_id="file id", file_unique_id="file id")
@@ -29,6 +15,5 @@ class TestUploadStickerFile:
             sticker=BufferedInputFile(b"", "file.png"),
             sticker_format=StickerFormat.STATIC,
         )
-        request: Request = bot.get_request()
-        assert request.method == "uploadStickerFile"
+        request = bot.get_request()
         assert response == prepare_result.result
diff --git a/tests/test_dispatcher/test_dispatcher.py b/tests/test_dispatcher/test_dispatcher.py
index 509bff35..4fb2b113 100644
--- a/tests/test_dispatcher/test_dispatcher.py
+++ b/tests/test_dispatcher/test_dispatcher.py
@@ -14,7 +14,7 @@ from aiogram import Bot
 from aiogram.dispatcher.dispatcher import Dispatcher
 from aiogram.dispatcher.event.bases import UNHANDLED, SkipHandler
 from aiogram.dispatcher.router import Router
-from aiogram.methods import GetMe, GetUpdates, Request, SendMessage
+from aiogram.methods import GetMe, GetUpdates, Request, SendMessage, TelegramMethod
 from aiogram.types import (
     CallbackQuery,
     Chat,
@@ -775,9 +775,7 @@ class TestDispatcher:
         dispatcher.message.register(simple_message_handler)
 
         response = await dispatcher.feed_webhook_update(bot, RAW_UPDATE, _timeout=0.3)
-        assert isinstance(response, Request)
-        assert response.method == "sendMessage"
-        assert response.data["text"] == "ok"
+        assert isinstance(response, TelegramMethod)
 
     async def test_feed_webhook_update_slow_process(self, bot: MockedBot, recwarn):
         warnings.simplefilter("always")
diff --git a/tests/test_webhook/test_aiohtt_server.py b/tests/test_webhook/test_aiohtt_server.py
index 8bd2cf2d..5be8f43e 100644
--- a/tests/test_webhook/test_aiohtt_server.py
+++ b/tests/test_webhook/test_aiohtt_server.py
@@ -102,7 +102,8 @@ class TestSimpleRequestHandler:
             result[part.name] = value.decode()
         assert result["method"] == "sendDocument"
         assert result["caption"] == "PASS"
-        assert result["document"] == "test"
+        assert result["document"].startswith("attach://")
+        assert result[result["document"][9:]]
 
     async def test_reply_into_webhook_text(self, bot: MockedBot, aiohttp_client):
         app = Application()