diff --git a/adapter-managers/element-call-authentication.py b/adapter-managers/element-call-authentication.py
index ee26eed..bb08d20 100644
--- a/adapter-managers/element-call-authentication.py
+++ b/adapter-managers/element-call-authentication.py
@@ -1,5 +1,4 @@
 # Adapter tool to provide a very specific acceptance flow for an element call adapter.
-from datetime import datetime
 from quart import Quart, request
 app = Quart(__name__)
 
diff --git a/adapter-managers/element-call-behaviour.py b/adapter-managers/element-call-behaviour.py
index 7529b56..d4c5d6e 100644
--- a/adapter-managers/element-call-behaviour.py
+++ b/adapter-managers/element-call-behaviour.py
@@ -1,5 +1,4 @@
 # Adapter tool to provide a very specific acceptance flow for an element call adapter.
-from datetime import datetime
 from quart import Quart, request
 app = Quart(__name__)
 
diff --git a/adapter-managers/element-call-browser.py b/adapter-managers/element-call-browser.py
index e5ad59a..f515997 100644
--- a/adapter-managers/element-call-browser.py
+++ b/adapter-managers/element-call-browser.py
@@ -1,5 +1,4 @@
 # Adapter tool to provide a very specific acceptance flow for an element call adapter.
-from datetime import datetime
 from quart import Quart, request
 app = Quart(__name__)
 
diff --git a/trafficlight/sample-tests/chat/__init__.py b/trafficlight/sample_tests/chat/__init__.py
similarity index 100%
rename from trafficlight/sample-tests/chat/__init__.py
rename to trafficlight/sample_tests/chat/__init__.py
diff --git a/trafficlight/sample-tests/chat/dehydrated_device_test.py b/trafficlight/sample_tests/chat/dehydrated_device_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/dehydrated_device_test.py
rename to trafficlight/sample_tests/chat/dehydrated_device_test.py
diff --git a/trafficlight/sample-tests/chat/invited_user_decrypt_prejoin_messages_more_clients_testsuite.py b/trafficlight/sample_tests/chat/invited_user_decrypt_prejoin_messages_more_clients_testsuite.py
similarity index 100%
rename from trafficlight/sample-tests/chat/invited_user_decrypt_prejoin_messages_more_clients_testsuite.py
rename to trafficlight/sample_tests/chat/invited_user_decrypt_prejoin_messages_more_clients_testsuite.py
diff --git a/trafficlight/sample-tests/chat/invited_user_decrypt_prejoin_messages_test.py b/trafficlight/sample_tests/chat/invited_user_decrypt_prejoin_messages_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/invited_user_decrypt_prejoin_messages_test.py
rename to trafficlight/sample_tests/chat/invited_user_decrypt_prejoin_messages_test.py
diff --git a/trafficlight/sample-tests/chat/key_restore_marks_session_as_verified_test.py b/trafficlight/sample_tests/chat/key_restore_marks_session_as_verified_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/key_restore_marks_session_as_verified_test.py
rename to trafficlight/sample_tests/chat/key_restore_marks_session_as_verified_test.py
diff --git a/trafficlight/sample-tests/chat/message_decryption_after_storage_cleared_test.py b/trafficlight/sample_tests/chat/message_decryption_after_storage_cleared_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/message_decryption_after_storage_cleared_test.py
rename to trafficlight/sample_tests/chat/message_decryption_after_storage_cleared_test.py
diff --git a/trafficlight/sample-tests/chat/message_decryption_when_own_hs_offline_test.py b/trafficlight/sample_tests/chat/message_decryption_when_own_hs_offline_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/message_decryption_when_own_hs_offline_test.py
rename to trafficlight/sample_tests/chat/message_decryption_when_own_hs_offline_test.py
diff --git a/trafficlight/sample-tests/chat/message_warning_test.py b/trafficlight/sample_tests/chat/message_warning_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/message_warning_test.py
rename to trafficlight/sample_tests/chat/message_warning_test.py
diff --git a/trafficlight/sample-tests/chat/multiple_homeservers_test.py b/trafficlight/sample_tests/chat/multiple_homeservers_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/multiple_homeservers_test.py
rename to trafficlight/sample_tests/chat/multiple_homeservers_test.py
diff --git a/trafficlight/sample-tests/chat/retry_sendToDevice_test.py b/trafficlight/sample_tests/chat/retry_sendToDevice_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/retry_sendToDevice_test.py
rename to trafficlight/sample_tests/chat/retry_sendToDevice_test.py
diff --git a/trafficlight/sample-tests/chat/send_messages_and_demo_matrix_nio_test.py b/trafficlight/sample_tests/chat/send_messages_and_demo_matrix_nio_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/send_messages_and_demo_matrix_nio_test.py
rename to trafficlight/sample_tests/chat/send_messages_and_demo_matrix_nio_test.py
diff --git a/trafficlight/sample-tests/chat/test_verification_when_todevice_message_out_of_order_test.py b/trafficlight/sample_tests/chat/test_verification_when_todevice_message_out_of_order_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/test_verification_when_todevice_message_out_of_order_test.py
rename to trafficlight/sample_tests/chat/test_verification_when_todevice_message_out_of_order_test.py
diff --git a/trafficlight/sample-tests/chat/verify_client_multiple_device_test.py b/trafficlight/sample_tests/chat/verify_client_multiple_device_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/verify_client_multiple_device_test.py
rename to trafficlight/sample_tests/chat/verify_client_multiple_device_test.py
diff --git a/trafficlight/sample-tests/chat/verify_client_test.py b/trafficlight/sample_tests/chat/verify_client_test.py
similarity index 100%
rename from trafficlight/sample-tests/chat/verify_client_test.py
rename to trafficlight/sample_tests/chat/verify_client_test.py
diff --git a/trafficlight/sample-tests/hydrogen_actions_demo.py b/trafficlight/sample_tests/hydrogen_actions_demo.py
similarity index 100%
rename from trafficlight/sample-tests/hydrogen_actions_demo.py
rename to trafficlight/sample_tests/hydrogen_actions_demo.py
diff --git a/trafficlight/sample-tests/immediate_exit_sample.py b/trafficlight/sample_tests/immediate_exit_sample.py
similarity index 100%
rename from trafficlight/sample-tests/immediate_exit_sample.py
rename to trafficlight/sample_tests/immediate_exit_sample.py
diff --git a/trafficlight/sample-tests/video/__init__.py b/trafficlight/sample_tests/video/__init__.py
similarity index 100%
rename from trafficlight/sample-tests/video/__init__.py
rename to trafficlight/sample_tests/video/__init__.py
diff --git a/trafficlight/sample-tests/video/ec_basic_example.py b/trafficlight/sample_tests/video/ec_basic_example.py
similarity index 100%
rename from trafficlight/sample-tests/video/ec_basic_example.py
rename to trafficlight/sample_tests/video/ec_basic_example.py
diff --git a/trafficlight/sample-tests/video/handle_invite_base.py b/trafficlight/sample_tests/video/handle_invite_base.py
similarity index 100%
rename from trafficlight/sample-tests/video/handle_invite_base.py
rename to trafficlight/sample_tests/video/handle_invite_base.py
diff --git a/trafficlight/sample-tests/video/handle_invite_links_one_guest_test.py b/trafficlight/sample_tests/video/handle_invite_links_one_guest_test.py
similarity index 88%
rename from trafficlight/sample-tests/video/handle_invite_links_one_guest_test.py
rename to trafficlight/sample_tests/video/handle_invite_links_one_guest_test.py
index 61776fa..cf75ea9 100644
--- a/trafficlight/sample-tests/video/handle_invite_links_one_guest_test.py
+++ b/trafficlight/sample_tests/video/handle_invite_links_one_guest_test.py
@@ -1,7 +1,7 @@
 from trafficlight.client_types import ElementCall
 from trafficlight.internals.client import ElementCallClient
 from trafficlight.internals.test import Test
-from trafficlight.tests.video.handle_invite_base import InviteLinksMixin
+from trafficlight.sample_tests.video.handle_invite_base import InviteLinksMixin
 
 
 class OneRegisteredInviteLinksTest(Test, InviteLinksMixin):
diff --git a/trafficlight/sample-tests/video/handle_invite_links_registered_test.py b/trafficlight/sample_tests/video/handle_invite_links_registered_test.py
similarity index 89%
rename from trafficlight/sample-tests/video/handle_invite_links_registered_test.py
rename to trafficlight/sample_tests/video/handle_invite_links_registered_test.py
index a10fe40..23c865b 100644
--- a/trafficlight/sample-tests/video/handle_invite_links_registered_test.py
+++ b/trafficlight/sample_tests/video/handle_invite_links_registered_test.py
@@ -1,7 +1,7 @@
 from trafficlight.client_types import ElementCall
 from trafficlight.internals.client import ElementCallClient
 from trafficlight.internals.test import Test
-from trafficlight.tests.video.handle_invite_base import InviteLinksMixin
+from trafficlight.sample_tests.video.handle_invite_base import InviteLinksMixin
 
 
 class TwoRegisteredInviteLinksTest(Test, InviteLinksMixin):
diff --git a/trafficlight/sample-tests/video/handle_invite_links_two_guests_test.py b/trafficlight/sample_tests/video/handle_invite_links_two_guests_test.py
similarity index 87%
rename from trafficlight/sample-tests/video/handle_invite_links_two_guests_test.py
rename to trafficlight/sample_tests/video/handle_invite_links_two_guests_test.py
index f575c41..4dc697d 100644
--- a/trafficlight/sample-tests/video/handle_invite_links_two_guests_test.py
+++ b/trafficlight/sample_tests/video/handle_invite_links_two_guests_test.py
@@ -1,7 +1,7 @@
 from trafficlight.client_types import ElementCall
 from trafficlight.internals.client import ElementCallClient
 from trafficlight.internals.test import Test
-from trafficlight.tests.video.handle_invite_base import InviteLinksMixin
+from trafficlight.sample_tests.video.handle_invite_base import InviteLinksMixin
 
 
 class TwoGuestsInviteLinksTest(Test, InviteLinksMixin):
diff --git a/trafficlight/sample-tests/video/join_call_recieve_video_test.py b/trafficlight/sample_tests/video/join_call_recieve_video_test.py
similarity index 100%
rename from trafficlight/sample-tests/video/join_call_recieve_video_test.py
rename to trafficlight/sample_tests/video/join_call_recieve_video_test.py
diff --git a/trafficlight/sample-tests/video/load_test_call_test.py b/trafficlight/sample_tests/video/load_test_call_test.py
similarity index 100%
rename from trafficlight/sample-tests/video/load_test_call_test.py
rename to trafficlight/sample_tests/video/load_test_call_test.py
diff --git a/trafficlight/sample-tests/video/three_user_spotlight.py b/trafficlight/sample_tests/video/three_user_spotlight.py
similarity index 100%
rename from trafficlight/sample-tests/video/three_user_spotlight.py
rename to trafficlight/sample_tests/video/three_user_spotlight.py
diff --git a/trafficlight/sample-tests/video/two_clients_one_terminated_rejoin_test.py b/trafficlight/sample_tests/video/two_clients_one_terminated_rejoin_test.py
similarity index 100%
rename from trafficlight/sample-tests/video/two_clients_one_terminated_rejoin_test.py
rename to trafficlight/sample_tests/video/two_clients_one_terminated_rejoin_test.py