diff --git a/src/kpi_manager/tests/test_messages.py b/src/kpi_manager/tests/test_messages.py
index 589d6cb847def66aea28030f97cf09e914d32496..237a983bf3539e890db8705a8029bf70f4d0b70a 100755
--- a/src/kpi_manager/tests/test_messages.py
+++ b/src/kpi_manager/tests/test_messages.py
@@ -24,46 +24,67 @@ def create_kpi_request(kpi_id_str):
     _create_kpi_request                                     = kpi_manager_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          = 'DEV' + str(kpi_id_str)
+    _create_kpi_request.device_id.device_uuid.uuid          = 'DEV'  + str(kpi_id_str)
     _create_kpi_request.service_id.service_uuid.uuid        = 'SERV' + str(kpi_id_str)
-    _create_kpi_request.slice_id.slice_uuid.uuid            = 'SLC' + str(kpi_id_str)
-    _create_kpi_request.endpoint_id.endpoint_uuid.uuid      = 'END' + str(kpi_id_str)
-    _create_kpi_request.connection_id.connection_uuid.uuid  = 'CON' + str(kpi_id_str)
+    _create_kpi_request.slice_id.slice_uuid.uuid            = 'SLC'  + str(kpi_id_str)
+    _create_kpi_request.endpoint_id.endpoint_uuid.uuid      = 'END'  + str(kpi_id_str)
+    _create_kpi_request.connection_id.connection_uuid.uuid  = 'CON'  + str(kpi_id_str)
     return _create_kpi_request
 
 def create_kpi_request_b():
-    _create_kpi_request                                = kpi_manager_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     = 'DEV2'     # pylint: disable=maybe-no-member
-    _create_kpi_request.service_id.service_uuid.uuid   = 'SERV2'    # pylint: disable=maybe-no-member
-    _create_kpi_request.slice_id.slice_uuid.uuid       = 'SLC2'  # pylint: disable=maybe-no-member
-    _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END2'     # pylint: disable=maybe-no-member
+    _create_kpi_request                                    = kpi_manager_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         = 'DEV2'     # pylint: disable=maybe-no-member
+    _create_kpi_request.service_id.service_uuid.uuid       = 'SERV2'    # pylint: disable=maybe-no-member
+    _create_kpi_request.slice_id.slice_uuid.uuid           = 'SLC2'  # pylint: disable=maybe-no-member
+    _create_kpi_request.endpoint_id.endpoint_uuid.uuid     = 'END2'     # pylint: disable=maybe-no-member
     _create_kpi_request.connection_id.connection_uuid.uuid = 'CON2'  # pylint: disable=maybe-no-member
     return _create_kpi_request
 
 def create_kpi_request_c():
-    _create_kpi_request                                = kpi_manager_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     = 'DEV3'     # pylint: disable=maybe-no-member
-    _create_kpi_request.service_id.service_uuid.uuid   = 'SERV3'    # pylint: disable=maybe-no-member
-    _create_kpi_request.slice_id.slice_uuid.uuid       = 'SLC3'  # pylint: disable=maybe-no-member
-    _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END3'     # pylint: disable=maybe-no-member
+    _create_kpi_request                                    = kpi_manager_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         = 'DEV3'     # pylint: disable=maybe-no-member
+    _create_kpi_request.service_id.service_uuid.uuid       = 'SERV3'    # pylint: disable=maybe-no-member
+    _create_kpi_request.slice_id.slice_uuid.uuid           = 'SLC3'  # pylint: disable=maybe-no-member
+    _create_kpi_request.endpoint_id.endpoint_uuid.uuid     = 'END3'     # pylint: disable=maybe-no-member
     _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                                = kpi_manager_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                                    = kpi_manager_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 kpi_descriptor_list():
     _kpi_descriptor_list = kpi_manager_pb2.KpiDescriptorList()
-    return _kpi_descriptor_list
\ No newline at end of file
+    return _kpi_descriptor_list
+
+def create_kpi_filter_request():
+    _create_kpi_filter_request             = kpi_manager_pb2.KpiDescriptorFilter()
+    _create_kpi_filter_request.kpi_sample_type.append(KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED)  
+    new_device_id                          = _create_kpi_filter_request.device_id.add()
+    new_device_id.device_uuid.uuid         = 'DEV1'
+    new_service_id                         = _create_kpi_filter_request.service_id.add()
+    new_service_id.service_uuid.uuid       = 'SERV1'
+    new_slice_id                           = _create_kpi_filter_request.slice_id.add()
+    new_slice_id.slice_uuid.uuid           = 'SLC1'
+    new_endpoint_id                        = _create_kpi_filter_request.endpoint_id.add()
+    new_endpoint_id.endpoint_uuid.uuid     = 'END1'
+    new_connection_id                      = _create_kpi_filter_request.connection_id.add()
+    new_connection_id.connection_uuid.uuid = 'CON1'
+
+    # _create_kpi_filter_request.device_id.device_uuid.uuid.append('DEV1')        # pylint: disable=maybe-no-member
+    # _create_kpi_filter_request[0].service_id.service_uuid.uuid       = 'SERV1'     # pylint: disable=maybe-no-member
+    # _create_kpi_filter_request[0].slice_id.slice_uuid.uuid           = 'SLC1'      # pylint: disable=maybe-no-member
+    # _create_kpi_filter_request[0].endpoint_id.endpoint_uuid.uuid     = 'END1'      # pylint: disable=maybe-no-member
+    # _create_kpi_filter_request[0].connection_id.connection_uuid.uuid = 'CON1'      # pylint: disable=maybe-no-member
+    return _create_kpi_filter_request