diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index 9f007ae8601e2c8977aec5fb93884bef8f82ccc7..9c88ed31124f97151a010af8185afa23bf548c47 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -542,7 +542,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
         kpi_db = self.management_db.get_KPI(int(kpi_id))
         response = Kpi()
         if kpi_db is None:
-            LOGGER.info('GetInstantKpi error: KpiID({:s}): not found in database'.format(str(kpi_id)))
+            LOGGER.info('GetStreamKpi error: KpiID({:s}): not found in database'.format(str(kpi_id)))
             response.kpi_id.kpi_id.uuid = "NoID"
             return response
         else:
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 9eff2e5c9240bdc77fc3b31df3ce4b78cabd7bd1..e5e8d310d9f0752d0937b6a09666e224cbb018b4 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -381,17 +381,16 @@ def test_get_stream_kpi(monitoring_client): # pylint: disable=redefined-outer-na
     assert isinstance(response, _MultiThreadedRendezvous)
 
 # Test case that makes use of client fixture to test server's GetInstantKpi method
-# def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-name
-#     LOGGER.warning('test_getinstant_kpi begin')
-#     kpi_id = monitoring_client.SetKpi(KpiId())
-#     monitoring_client.IncludeKpi(include_kpi_request(kpi_id))
-#     sleep(0.3)
-#     response = monitoring_client.GetInstantKpi(kpi_id)
-#     LOGGER.debug(response)
-#     assert isinstance(response, Kpi)
-    # response = monitoring_client.GetInstantKpi(KpiId())
-    # LOGGER.debug(type(response))
-    # assert response.kpi_id.kpi_id.uuid == "NoID"
+def test_get_instant_kpi(monitoring_client): # pylint: disable=redefined-outer-name
+    LOGGER.warning('test_getinstant_kpi begin')
+    kpi_id = monitoring_client.SetKpi(KpiId())
+    monitoring_client.IncludeKpi(include_kpi_request(kpi_id))
+    sleep(0.3)
+    response = monitoring_client.GetInstantKpi(kpi_id)
+    LOGGER.debug(response)
+    assert isinstance(response, Kpi)
+
+
 def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefined-outer-name
     LOGGER.warning('test_managementdb_tools_insert_kpi begin')
     _create_kpi_request = create_kpi_request()
@@ -463,27 +462,27 @@ def test_managementdb_tools_insert_alarm(management_db):
     LOGGER.debug(_alarm_id)
     assert isinstance(_alarm_id,int)
 
-def test_metrics_db_tools_write_kpi(metrics_db): # pylint: disable=redefined-outer-name
+def test_metrics_db_tools(metrics_db): # pylint: disable=redefined-outer-name
     LOGGER.warning('test_metric_sdb_tools_write_kpi begin')
-
-    for i in range(200):
-        kpiSampleType = KpiSampleType.Name(KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED).upper().replace('KPISAMPLETYPE_', '')
-        kpiId = "3"
-        deviceId = 'DEV3'
-        endpointId = 'END3'
-        serviceId = 'SERV3'
-        sliceId = 'SLC3'
-        connectionId = 'CON3'
-        time_stamp = timestamp_utcnow_to_float()
-        kpi_value = 500*random()
-
-        metrics_db.write_KPI(time_stamp, kpiId, kpiSampleType, deviceId, endpointId, serviceId, sliceId, connectionId,
-                                  kpi_value)
+    _kpiId = "6"
+
+    for i in range(50):
+        _kpiSampleType = KpiSampleType.Name(KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED).upper().replace('KPISAMPLETYPE_', '')
+        _deviceId = 'DEV4'
+        _endpointId = 'END4'
+        _serviceId = 'SERV4'
+        _sliceId = 'SLC4'
+        _connectionId = 'CON4'
+        _time_stamp = timestamp_utcnow_to_float()
+        _kpi_value = 500*random()
+
+        metrics_db.write_KPI(_time_stamp, _kpiId, _kpiSampleType, _deviceId, _endpointId, _serviceId, _sliceId, _connectionId,
+                                  _kpi_value)
         sleep(0.05)
 
-def test_metrics_db_tools_read_kpi_points(metrics_db): # pylint: disable=redefined-outer-name
-    LOGGER.warning('test_metrics_db_tools_read_kpi_points begin')
-
+    _query = f"SELECT * FROM monitoring WHERE kpi_id ='{_kpiId}'"
+    _data = metrics_db.run_query(_query)
+    assert len(_data) >= 50
 
 def test_subscription_manager_create_subscription(management_db,metrics_db,subs_scheduler):
     LOGGER.warning('test_subscription_manager_create_subscription begin')