diff --git a/.gitignore b/.gitignore
index 8b3cba2..72302f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ storage.db
 storage.json
 *.dca
 .eggs/
+.cache/
 
 # Documentation stuff
 docs/api/
diff --git a/setup.py b/setup.py
index 7d6cc57..bee0a7b 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@ setup(
     install_requires=requirements,
     extras_require=extras_require,
     test_suite='tests',
+    tests_require=['pytest', 'pytest-benchmark'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: MIT License',
diff --git a/tests/api/__init__.py b/tests/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_reason.py b/tests/api/reason.py
similarity index 100%
rename from tests/test_reason.py
rename to tests/api/reason.py
diff --git a/tests/bot/__init__.py b/tests/bot/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_bot.py b/tests/bot/bot.py
similarity index 100%
rename from tests/test_bot.py
rename to tests/bot/bot.py
diff --git a/tests/gateway/__init__.py b/tests/gateway/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/gateway/events.py b/tests/gateway/events.py
new file mode 100644
index 0000000..2714a5a
--- /dev/null
+++ b/tests/gateway/events.py
@@ -0,0 +1,20 @@
+from disco.gateway.events import GatewayEvent, Resumed
+
+
+def create_resumed_payload():
+    return GatewayEvent.from_dispatch(None, {
+        't': 'RESUMED',
+        'd': {
+            '_trace': ['test', '1', '2', '3'],
+        }
+    })
+
+
+def test_from_dispatch():
+    event = create_resumed_payload()
+    assert isinstance(event, Resumed)
+    assert event.trace == ['test', '1', '2', '3']
+
+
+def test_event_creation(benchmark):
+    benchmark(create_resumed_payload)
diff --git a/tests/test_imports.py b/tests/imports.py
similarity index 100%
rename from tests/test_imports.py
rename to tests/imports.py
diff --git a/tests/types/__init__.py b/tests/types/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_channel.py b/tests/types/channel.py
similarity index 78%
rename from tests/test_channel.py
rename to tests/types/channel.py
index 56d5227..88695ea 100644
--- a/tests/test_channel.py
+++ b/tests/types/channel.py
@@ -4,7 +4,7 @@ from disco.types.channel import Channel, ChannelType
 
 
 class TestChannel(TestCase):
-    def test_nsfw_channel(self):
+    def test_deprecated_nsfw_channel(self):
         channel = Channel(
             name='nsfw-testing',
             type=ChannelType.GUILD_TEXT)
@@ -19,3 +19,7 @@ class TestChannel(TestCase):
             name='nsfw_testing',
             type=ChannelType.GUILD_TEXT)
         self.assertFalse(channel.is_nsfw)
+
+    def test_nsfw_channel(self):
+        channel = Channel(name='test', nsfw=True, type=ChannelType.GUILD_TEXT)
+        assert channel.is_nsfw
diff --git a/tests/test_embeds.py b/tests/types/embeds.py
similarity index 100%
rename from tests/test_embeds.py
rename to tests/types/embeds.py
diff --git a/tests/test_types.py b/tests/types/types.py
similarity index 100%
rename from tests/test_types.py
rename to tests/types/types.py
diff --git a/tests/test_user.py b/tests/types/user.py
similarity index 100%
rename from tests/test_user.py
rename to tests/types/user.py
diff --git a/tests/util/__init__.py b/tests/util/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_util_limiter.py b/tests/util/limiter.py
similarity index 100%
rename from tests/test_util_limiter.py
rename to tests/util/limiter.py
diff --git a/tests/utils.py b/tests/utils.py
index c0c615e..74f9766 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,5 +1,3 @@
-import time
-import contextlib
 from disco.api.client import APIClient
 
 
@@ -15,24 +13,3 @@ class TestAPIClient(APIClient):
     def __init__(self):
         self.client = None
         self.http = CallContainer()
-
-
-def bench(times, func):
-    main_start = time.time()
-
-    worst = None
-    best = None
-
-    for _ in range(times):
-        start = time.time()
-        func()
-        dur = time.time() - start
-
-        if not worst or dur > worst:
-            worst = dur
-
-        if not best or dur < best:
-            best = dur
-
-    main_dur = time.time() - main_start
-    return main_dur, worst, best
diff --git a/tests/voice/__init__.py b/tests/voice/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/tests_voice_queue.py b/tests/voice/queue.py
similarity index 100%
rename from tests/tests_voice_queue.py
rename to tests/voice/queue.py