diff --git a/tests/freedomfi_one_tests.py b/tests/freedomfi_one_tests.py
index b167e9b..048ba08 100644
--- a/tests/freedomfi_one_tests.py
+++ b/tests/freedomfi_one_tests.py
@@ -681,7 +681,7 @@
         status.set_magma_device_cfg(n1, device_config)
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=True),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=True),
@@ -709,7 +709,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=True),
             call.set_parameter(param_name='MME status', value=False),
             call.set_parameter(param_name='Opstate', value=True),
@@ -722,7 +722,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=False),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=True),
@@ -735,7 +735,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=True),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=False),
@@ -748,7 +748,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=False),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=True),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=True),
@@ -761,7 +761,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=False),
+            call.set_parameter(param_name='gps_status', value=False),
             call.set_parameter(param_name='PTP status', value=False),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=True),
@@ -774,7 +774,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=True),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=True),
@@ -787,7 +787,7 @@
         device_config = Mock()
         expected = [
             call.set_parameter(param_name='RF TX status', value=True),
-            call.set_parameter(param_name='GPS status', value=True),
+            call.set_parameter(param_name='gps_status', value=True),
             call.set_parameter(param_name='PTP status', value=True),
             call.set_parameter(param_name='MME status', value=True),
             call.set_parameter(param_name='Opstate', value=True),
diff --git a/tests/test_utils/enb_acs_builder.py b/tests/test_utils/enb_acs_builder.py
index 7497528..bf16948 100644
--- a/tests/test_utils/enb_acs_builder.py
+++ b/tests/test_utils/enb_acs_builder.py
@@ -66,7 +66,7 @@
             mconfig = EnodebConfigBuilder.get_mconfig(device)
         if not service_config:
             service_config = EnodebConfigBuilder.get_service_config()
-        with mock.patch('magma.common.service.MagmaService') as MockService:
+        with mock.patch('common.service.MagmaService') as MockService:
             MockService.config = service_config
             MockService.mconfig = mconfig
             MockService.loop = event_loop
@@ -77,7 +77,7 @@
         event_loop = asyncio.get_event_loop()
         mconfig = EnodebConfigBuilder.get_multi_enb_mconfig()
         service_config = EnodebConfigBuilder.get_service_config()
-        with mock.patch('magma.common.service.MagmaService') as MockService:
+        with mock.patch('common.service.MagmaService') as MockService:
             MockService.config = service_config
             MockService.mconfig = mconfig
             MockService.loop = event_loop
diff --git a/tests/test_utils/mock_functions.py b/tests/test_utils/mock_functions.py
index ec8f20c..262a9ca 100644
--- a/tests/test_utils/mock_functions.py
+++ b/tests/test_utils/mock_functions.py
@@ -6,10 +6,10 @@
 from typing import Any
 
 GET_IP_FROM_IF_PATH = \
-    'magma.enodebd.device_config.configuration_init.get_ip_from_if'
+    'device_config.configuration_init.get_ip_from_if'
 
 LOAD_SERVICE_MCONFIG_PATH = \
-    'magma.enodebd.device_config.configuration_init.load_service_mconfig_as_json'
+    'device_config.configuration_init.load_service_mconfig_as_json'
 
 
 def mock_get_ip_from_if(