diff --git a/src/kpi_manager/tests/test_unitary.py b/src/kpi_manager/tests/test_unitary.py
index b45346d063df69e543f06f6cc2d6aea6dbfa45b4..adc8863414a6471a6a3592d3cffeed31c19164cc 100755
--- a/src/kpi_manager/tests/test_unitary.py
+++ b/src/kpi_manager/tests/test_unitary.py
@@ -33,7 +33,7 @@ from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Topology import json_topology, json_topology_id
 # from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, SubsDescriptor, SubsList, AlarmID, \
 #     AlarmDescriptor, AlarmList, KpiDescriptorList, SubsResponse, AlarmResponse, RawKpiTable #, Kpi, KpiList
-from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 from common.tools.service.GenericGrpcService import GenericGrpcService
 from context.client.ContextClient import ContextClient
 
@@ -43,7 +43,7 @@ from device.service.driver_api.DriverInstanceCache import DriverInstanceCache
 from device.service.DeviceService import DeviceService
 from device.client.DeviceClient import DeviceClient
 
-from kpi_manager.tests.test_messages import create_kpi_request, create_kpi_request_b, create_kpi_request_c, create_kpi_request_d
+from kpi_manager.tests.test_messages import create_kpi_request, create_kpi_request_b, create_kpi_request_c, create_kpi_request_d, create_kpi_filter_request
 # from monitoring.service.MonitoringService import MonitoringService
 from kpi_manager.service.KpiManagerService import KpiManagerService
 # from monitoring.client.MonitoringClient import MonitoringClient
@@ -256,7 +256,7 @@ def test_set_kpi(kpi_manager_client): # pylint: disable=redefined-outer-name
     # make call to server
     LOGGER.warning('test_create_kpi requesting')
     for i in range(3):
-        response = kpi_manager_client.SetKpi(create_kpi_request(str(i+1)))
+        response = kpi_manager_client.SetKpiDescriptor(create_kpi_request(str(i+1)))
         LOGGER.debug(str(response))
         assert isinstance(response, KpiId)
 
@@ -264,14 +264,14 @@ def test_set_kpi(kpi_manager_client): # pylint: disable=redefined-outer-name
 def test_delete_kpi(kpi_manager_client): # pylint: disable=redefined-outer-name
     # make call to server
     LOGGER.warning('delete_kpi requesting')
-    response = kpi_manager_client.SetKpi(create_kpi_request('4'))
-    response = kpi_manager_client.DeleteKpi(response)
+    response = kpi_manager_client.SetKpiDescriptor(create_kpi_request('4'))
+    response = kpi_manager_client.DeleteKpiDescriptor(response)
     LOGGER.debug(str(response))
     assert isinstance(response, Empty)
 
 # Test case that makes use of client fixture to test server's GetKpiDescriptor method
-def test_get_kpi_descriptor_list(kpi_manager_client): # pylint: disable=redefined-outer-name
-    LOGGER.warning('test_getkpidescritor_kpi begin')
-    response = kpi_manager_client.GetKpiDescriptorList(Empty())
+def test_select_kpi_descriptor(kpi_manager_client): # pylint: disable=redefined-outer-name
+    LOGGER.warning('test_selectkpidescritor begin')
+    response = kpi_manager_client.SelectKpiDescriptor(create_kpi_filter_request())
     LOGGER.debug(str(response))
     assert isinstance(response, KpiDescriptorList)