diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 6e8741dae494a8c577f5cd116b863bb3481d5bfb..60d15ef9d65127e1c20e376a012645e3e73c2145 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -36,7 +36,6 @@ from common.tests.MockServicerImpl_Context import MockServicerImpl_Context
 from common.tools.service.GenericGrpcService import GenericGrpcService
 from common.tools.timestamp.Converters import timestamp_utcnow_to_float #, timestamp_string_to_float
 from context.client.ContextClient import ContextClient
-from context.service.ContextService import ContextService
 from device.client.DeviceClient import DeviceClient
 from device.service.DeviceService import DeviceService
 from device.service.driver_api.DriverFactory import DriverFactory
@@ -78,8 +77,8 @@ METRICSDB_TABLE = os.environ.get('METRICSDB_TABLE')
 
 LOGGER = logging.getLogger(__name__)
 
-class MockService_Dependencies(GenericGrpcService):
-    # Mock Service implementing Context and Device to simplify unitary tests of Monitoring
+class MockContextService(GenericGrpcService):
+    # Mock Service implementing Context to simplify unitary tests of Monitoring
 
     def __init__(self, bind_port: Union[str, int]) -> None:
         super().__init__(bind_port, LOCAL_HOST, enable_health_servicer=False, cls_name='MockService')
@@ -95,20 +94,20 @@ class MockService_Dependencies(GenericGrpcService):
 
 @pytest.fixture(scope='session')
 def context_service():
-    _service = MockService_Dependencies(MOCKSERVICE_PORT)
+    _service = MockContextService(MOCKSERVICE_PORT)
     _service.configure_env_vars()
     _service.start()
     yield _service
     _service.stop()
 
 @pytest.fixture(scope='session')
-def context_client(context_service : ContextService): # pylint: disable=redefined-outer-name,unused-argument
+def context_client(context_service : MockContextService): # pylint: disable=redefined-outer-name,unused-argument
     _client = ContextClient()
     yield _client
     _client.close()
 
 @pytest.fixture(scope='session')
-def device_service(context_service : ContextService): # pylint: disable=redefined-outer-name,unused-argument
+def device_service(context_service : MockContextService): # pylint: disable=redefined-outer-name,unused-argument
     LOGGER.info('Initializing DeviceService...')
     driver_factory = DriverFactory(DRIVERS)
     driver_instance_cache = DriverInstanceCache(driver_factory)
@@ -131,7 +130,7 @@ def device_client(device_service : DeviceService): # pylint: disable=redefined-o
 # This fixture will be requested by test cases and last during testing session
 @pytest.fixture(scope='session')
 def monitoring_service(
-        context_service : ContextService,  # pylint: disable=redefined-outer-name,unused-argument
+        context_service : MockContextService,  # pylint: disable=redefined-outer-name,unused-argument
         device_service : DeviceService     # pylint: disable=redefined-outer-name,unused-argument
     ):
     LOGGER.info('Initializing MonitoringService...')