diff --git a/tests/music/test_lastfm.py b/tests/music/test_lastfm.py
new file mode 100644
index 0000000..0c51aa9
--- /dev/null
+++ b/tests/music/test_lastfm.py
@@ -0,0 +1,2 @@
+def test_now_playing():
+    pass
diff --git a/tests/music/test_spotify.py b/tests/music/test_spotify.py
new file mode 100644
index 0000000..7a0aad7
--- /dev/null
+++ b/tests/music/test_spotify.py
@@ -0,0 +1,2 @@
+def test_search():
+    pass
diff --git a/tests/music/tests_musicbrainz.py b/tests/music/tests_musicbrainz.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/music/tests_spotify.py b/tests/music/tests_spotify.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/test_db.py b/tests/test_db.py
new file mode 100644
index 0000000..ceb06f9
--- /dev/null
+++ b/tests/test_db.py
@@ -0,0 +1,2 @@
+def test_create_tables():
+    pass
diff --git a/tests/test_logger.py b/tests/test_logger.py
new file mode 100644
index 0000000..5971d81
--- /dev/null
+++ b/tests/test_logger.py
@@ -0,0 +1,14 @@
+def test_log_command():
+    pass
+
+
+def test_log_inline():
+    pass
+
+
+def test_log_url_processing():
+    pass
+
+
+def test_db_operation():
+    pass
diff --git a/tests/test_music_bucket_bot.py b/tests/test_music_bucket_bot.py
new file mode 100644
index 0000000..bc2f96d
--- /dev/null
+++ b/tests/test_music_bucket_bot.py
@@ -0,0 +1,24 @@
+class TestCommands:
+    def test_handle_save_link(self):
+        pass
+
+    def test_handle_music_command(self):
+        pass
+
+    def test_handle_music_from_beginning_command(self):
+        pass
+
+    def test_handle_recommendations_command(self):
+        pass
+
+    def test_handle_now_playing_command(self):
+        pass
+
+    def test_handle_lastfmset_command(self):
+        pass
+
+    def test_handle_stats_command(self):
+        pass
+
+    def test_handle_search(self):
+        pass
diff --git a/tests/music/tests_lastfm.py b/tests/test_responser.py
similarity index 100%
rename from tests/music/tests_lastfm.py
rename to tests/test_responser.py
diff --git a/tests/tests_db.py b/tests/tests_db.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/tests_logger.py b/tests/tests_logger.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/tests_music_bucket_bot.py b/tests/tests_music_bucket_bot.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/tests_responser.py b/tests/tests_responser.py
deleted file mode 100644
index e69de29..0000000