diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py
index f15cb5ec2c1d14ed95731cd37e54cb714b29e8b7..5530c720cffa3e386d6a2ce806b988e872321672 100644
--- a/src/monitoring/tests/Messages.py
+++ b/src/monitoring/tests/Messages.py
@@ -55,6 +55,17 @@ def create_kpi_request_c():
     _create_kpi_request.connection_id.connection_uuid.uuid = 'CON3'  # pylint: disable=maybe-no-member
     return _create_kpi_request
 
+def create_kpi_request_d():
+    _create_kpi_request                                = monitoring_pb2.KpiDescriptor()
+    _create_kpi_request.kpi_description                = 'KPI Description Test'
+    _create_kpi_request.kpi_sample_type                = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED
+    _create_kpi_request.device_id.device_uuid.uuid     = 'DEV4'     # pylint: disable=maybe-no-member
+    _create_kpi_request.service_id.service_uuid.uuid   = 'SERV4'    # pylint: disable=maybe-no-member
+    _create_kpi_request.slice_id.slice_uuid.uuid       = 'SLC4'  # pylint: disable=maybe-no-member
+    _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END4'     # pylint: disable=maybe-no-member
+    _create_kpi_request.connection_id.connection_uuid.uuid = 'CON4'  # pylint: disable=maybe-no-member
+    return _create_kpi_request
+
 def monitor_kpi_request(kpi_uuid, monitoring_window_s, sampling_rate_s):
     _monitor_kpi_request                     = monitoring_pb2.MonitorKpiRequest()
     _monitor_kpi_request.kpi_id.kpi_id.uuid  = kpi_uuid   # pylint: disable=maybe-no-member
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 4f0508ce535f57e855443c77dbfaec2334b7afad..d892b98b8814ff3a23165fd6f893e8d136dba1e4 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -47,7 +47,7 @@ from monitoring.service.EventTools import EventsDeviceCollector
 from monitoring.service.MetricsDBTools import MetricsDB
 from monitoring.service.MonitoringService import MonitoringService
 #from monitoring.service.SubscriptionManager import SubscriptionManager
-from monitoring.tests.Messages import create_kpi_request, include_kpi_request, monitor_kpi_request, \
+from monitoring.tests.Messages import create_kpi_request, create_kpi_request_d, include_kpi_request, monitor_kpi_request, \
     create_kpi_request_c, kpi_query, subs_descriptor, alarm_descriptor, alarm_subscription #, create_kpi_request_b
 from monitoring.tests.Objects import DEVICE_DEV1, DEVICE_DEV1_CONNECT_RULES, DEVICE_DEV1_UUID
 
@@ -100,6 +100,7 @@ def context_service():
     yield _service
 
     LOGGER.info('Terminating MockContextService...')
+    _service.context_servicer.msg_broker.terminate()
     _service.stop()
 
     LOGGER.info('Terminated MockContextService...')
@@ -400,7 +401,8 @@ def test_delete_alarm(monitoring_client): # pylint: disable=redefined-outer-name
 # Test case that makes use of client fixture to test server's GetStreamKpi method
 def test_get_stream_kpi(monitoring_client): # pylint: disable=redefined-outer-name
     LOGGER.warning('test_getstream_kpi begin')
-    response = monitoring_client.GetStreamKpi(monitoring_pb2.Kpi())
+    _kpi_id = monitoring_client.SetKpi(create_kpi_request_d())
+    response = monitoring_client.GetStreamKpi(_kpi_id)
     LOGGER.debug(str(response))
     assert isinstance(response, _MultiThreadedRendezvous)