diff --git a/tests/test_op25_controller.py b/tests/test_op25_controller.py
index 2a43228..5fb7b5c 100644
--- a/tests/test_op25_controller.py
+++ b/tests/test_op25_controller.py
@@ -18,6 +18,13 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')
 # Since we cannot edit the source code, we mock the module here to allow tests to run.
 mock_models = types.ModuleType("models.models")
 
+class MockTerminalConfig(BaseModel):
+    pass
+
+class MockTalkgroupTag(BaseModel):
+    tagDec: int
+    tagName: str
+
 class MockDecodeMode:
     P25 = "P25"
     ANALOG = "ANALOG"
@@ -79,12 +86,6 @@ class MockMetadataStreamConfig(BaseModel):
 class MockMetadataConfig(BaseModel):
     streams: List[MockMetadataStreamConfig]
 
-class MockTerminalConfig(BaseModel):
-    pass
-
-class MockTalkgroupTag(BaseModel):
-    tagDec: int
-    tagName: str
 
 mock_models.ConfigGenerator = MockConfigGenerator
 mock_models.DecodeMode = MockDecodeMode