diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
deleted file mode 100644
index 97331b9..0000000
--- a/tests/integration/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
-#
-# Copyright 2008-2021 Neongecko.com Inc. | All Rights Reserved
-#
-# Notice of License - Duplicating this Notice of License near the start of any file containing
-# a derivative of this software is a condition of license for this software.
-# Friendly Licensing:
-# No charge, open source royalty free use of the Neon AI software source and object is offered for
-# educational users, noncommercial enthusiasts, Public Benefit Corporations (and LLCs) and
-# Social Purpose Corporations (and LLCs). Developers can contact developers@neon.ai
-# For commercial licensing, distribution of derivative works or redistribution please contact licenses@neon.ai
-# Distributed on an "AS IS” basis without warranties or conditions of any kind, either express or implied.
-# Trademarks of Neongecko: Neon AI(TM), Neon Assist (TM), Neon Communicator(TM), Klat(TM)
-# Authors: Guy Daniels, Daniel McKnight, Regina Bloomstine, Elon Gasper, Richard Leeds
-#
-# Specialized conversational reconveyance options from Conversation Processing Intelligence Corp.
-# US Patents 2008-2021: US7424516, US20140161250, US20140177813, US8638908, US8068604, US8553852, US10530923, US10530924
-# China Patent: CN102017585  -  Europe Patent: EU2156652  -  Patents Pending
diff --git a/tests/chatbot_objects.py b/tests/integration/chatbot_objects.py
similarity index 100%
rename from tests/chatbot_objects.py
rename to tests/integration/chatbot_objects.py
diff --git a/tests/integration/chatbot_core_tests.py b/tests/integration/test_chatbot_core.py
similarity index 98%
rename from tests/integration/chatbot_core_tests.py
rename to tests/integration/test_chatbot_core.py
index baabf2e..b15a9ce 100644
--- a/tests/integration/chatbot_core_tests.py
+++ b/tests/integration/test_chatbot_core.py
@@ -26,14 +26,14 @@
 
 from chatbot_core.utils.enum import ConversationControls, ConversationState
 from chatbot_core.utils.bot_utils import clean_up_bot
-from ..chatbot_objects import *
+from .chatbot_objects import *
 
 
 SERVER = "0.0.0.0"
 
 
 @pytest.mark.timeout(timeout=300, method='signal')
-class ChatbotCoreTests(unittest.TestCase):
+class TestChatbotCore(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls) -> None:
@@ -192,7 +192,7 @@ def test_15_histories_length(self):
 
     @pytest.mark.timeout(30)
     def test_messagebus_connection(self):
-        from chatbot_core.utils import init_message_bus
+        from chatbot_core.utils.bot_utils import init_message_bus
         from threading import Thread
         from mycroft_bus_client import MessageBusClient
 
diff --git a/tests/units/__init__.py b/tests/units/__init__.py
deleted file mode 100644
index 97331b9..0000000
--- a/tests/units/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
-#
-# Copyright 2008-2021 Neongecko.com Inc. | All Rights Reserved
-#
-# Notice of License - Duplicating this Notice of License near the start of any file containing
-# a derivative of this software is a condition of license for this software.
-# Friendly Licensing:
-# No charge, open source royalty free use of the Neon AI software source and object is offered for
-# educational users, noncommercial enthusiasts, Public Benefit Corporations (and LLCs) and
-# Social Purpose Corporations (and LLCs). Developers can contact developers@neon.ai
-# For commercial licensing, distribution of derivative works or redistribution please contact licenses@neon.ai
-# Distributed on an "AS IS” basis without warranties or conditions of any kind, either express or implied.
-# Trademarks of Neongecko: Neon AI(TM), Neon Assist (TM), Neon Communicator(TM), Klat(TM)
-# Authors: Guy Daniels, Daniel McKnight, Regina Bloomstine, Elon Gasper, Richard Leeds
-#
-# Specialized conversational reconveyance options from Conversation Processing Intelligence Corp.
-# US Patents 2008-2021: US7424516, US20140161250, US20140177813, US8638908, US8068604, US8553852, US10530923, US10530924
-# China Patent: CN102017585  -  Europe Patent: EU2156652  -  Patents Pending
diff --git a/tests/units/base_class_tests.py b/tests/units/test_base_classes.py
similarity index 100%
rename from tests/units/base_class_tests.py
rename to tests/units/test_base_classes.py
diff --git a/tests/units/init_tests.py b/tests/units/test_init.py
similarity index 100%
rename from tests/units/init_tests.py
rename to tests/units/test_init.py
diff --git a/tests/units/utils_tests.py b/tests/units/test_utils.py
similarity index 100%
rename from tests/units/utils_tests.py
rename to tests/units/test_utils.py