diff --git a/test/backwards_compat/test_ocp.py b/test/backwards_compat/test_ocp.py
index faf389a9c124..e83ca373717b 100644
--- a/test/backwards_compat/test_ocp.py
+++ b/test/backwards_compat/test_ocp.py
@@ -17,7 +17,7 @@
 # from mycroft.configuration import Configuration
 from mycroft.skills.intent_service import IntentService
 from mycroft.skills.skill_loader import SkillLoader
-from ovos_utils.messagebus import FakeBus
+from ovos_utils.fakebus import FakeBus
 
 # Patch Configuration in the audioservice module to ensure its patched
 from ovos_config.config import Configuration
diff --git a/test/end2end/minicroft.py b/test/end2end/minicroft.py
index 118c21d346d6..23eacd74a8f2 100644
--- a/test/end2end/minicroft.py
+++ b/test/end2end/minicroft.py
@@ -6,7 +6,7 @@
 from ovos_core.skill_manager import SkillManager
 from ovos_plugin_manager.skills import find_skill_plugins
 from ovos_utils.log import LOG
-from ovos_utils.messagebus import FakeBus
+from ovos_utils.fakebus import FakeBus
 from ovos_utils.process_utils import ProcessState
 from ovos_workshop.skills.fallback import FallbackSkill
 
diff --git a/test/integrationtests/common_query/test_continuous_dialog.py b/test/integrationtests/common_query/test_continuous_dialog.py
index 96862b486a6a..b8d25ba2b4e5 100644
--- a/test/integrationtests/common_query/test_continuous_dialog.py
+++ b/test/integrationtests/common_query/test_continuous_dialog.py
@@ -2,7 +2,7 @@
 import unittest
 
 from ovos_tskill_fakewiki import FakeWikiSkill
-from ovos_utils.messagebus import FakeBus, Message
+from ovos_utils.fakebus import FakeBus, FakeMessage as Message
 
 
 class TestDialog(unittest.TestCase):
diff --git a/test/integrationtests/common_query/test_skill.py b/test/integrationtests/common_query/test_skill.py
index fcd8a7e0921e..bd3f81fa5b8f 100644
--- a/test/integrationtests/common_query/test_skill.py
+++ b/test/integrationtests/common_query/test_skill.py
@@ -1,7 +1,7 @@
 import json
 import unittest
 
-from ovos_utils.messagebus import FakeBus
+from ovos_utils.fakebus import FakeBus
 from ovos_tskill_fakewiki import FakeWikiSkill
 from ovos_workshop.skills.common_query_skill import CommonQuerySkill
 
diff --git a/test/integrationtests/test_workshop.py b/test/integrationtests/test_workshop.py
index 27bdc9be6dae..af20b99f298d 100644
--- a/test/integrationtests/test_workshop.py
+++ b/test/integrationtests/test_workshop.py
@@ -4,7 +4,7 @@
 from time import sleep
 from ovos_workshop.skill_launcher import SkillLoader
 from ovos_workshop.skills.ovos import OVOSSkill
-from ovos_utils.messagebus import FakeBus, Message
+from ovos_utils.fakebus import FakeBus, FakeMessage as Message
 
 # tests taken from ovos_workshop
 
diff --git a/test/unittests/test_skill_manager.py b/test/unittests/test_skill_manager.py
index ba9882c9917e..921d92ab392c 100644
--- a/test/unittests/test_skill_manager.py
+++ b/test/unittests/test_skill_manager.py
@@ -57,7 +57,6 @@ def mock_config():
     config = deepcopy(LocalConf(DEFAULT_CONFIG))
     config['skills']['priority_skills'] = ['foobar']
     config['data_dir'] = str(tempfile.mkdtemp())
-    config['server']['metrics'] = False
     config['enclosure'] = {}
     return config
 
@@ -71,8 +70,6 @@ def setUp(self):
         self.temp_dir = Path(temp_dir)
         self.message_bus_mock = MessageBusMock()
         self._mock_log()
-        self._mock_skill_updater()
-        self._mock_skill_settings_downloader()
         self.skill_manager = SkillManager(self.message_bus_mock)
         self._mock_skill_loader_instance()
 
@@ -84,22 +81,6 @@ def _mock_log(self):
     def tearDown(self):
         rmtree(str(self.temp_dir))
 
-    def _mock_skill_settings_downloader(self):
-        settings_download_patch = patch(
-            self.mock_package + 'SkillSettingsDownloader',
-            spec=True
-        )
-        self.addCleanup(settings_download_patch.stop)
-        self.settings_download_mock = settings_download_patch.start()
-
-    def _mock_skill_updater(self):
-        skill_updater_patch = patch(
-            self.mock_package + 'SkillUpdater',
-            spec=True
-        )
-        self.addCleanup(skill_updater_patch.stop)
-        self.skill_updater_mock = skill_updater_patch.start()
-
     def _mock_skill_loader_instance(self):
         self.skill_dir = self.temp_dir.joinpath('test_skill')
         self.skill_loader_mock = Mock(spec=SkillLoader)
diff --git a/test/unittests/xformers.py b/test/unittests/xformers.py
index 3f248e77e6da..0292e775dccc 100644
--- a/test/unittests/xformers.py
+++ b/test/unittests/xformers.py
@@ -5,7 +5,7 @@
 from ovos_core.transformers import UtteranceTransformersService
 from ovos_plugin_manager.templates.transformers import UtteranceTransformer
 
-from ovos_utils.messagebus import FakeBus
+from ovos_utils.fakebus import FakeBus
 
 
 class MockTransformer(UtteranceTransformer):