diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py
index a56207d9a74869ef625631f6a21762608ad59c14..23f4db017c6d5249651f7e4d3c65653a7f6fa614 100644
--- a/src/monitoring/tests/Messages.py
+++ b/src/monitoring/tests/Messages.py
@@ -17,54 +17,54 @@ from common.proto import monitoring_pb2
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 from common.tools.timestamp.Converters import timestamp_utcnow_to_float
 
-def kpi_id():
-    _kpi_id             = monitoring_pb2.KpiId()
-    _kpi_id.kpi_id.uuid = str(1)            # pylint: disable=maybe-no-member
-    return _kpi_id
-
-def create_kpi_request(kpi_id_str):
-    _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          = '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)
-    return _create_kpi_request
-
-def create_kpi_request_b():
-    _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     = '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                                = 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     = '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                                = 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 kpi_id():
+#     _kpi_id             = monitoring_pb2.KpiId()
+#     _kpi_id.kpi_id.uuid = str(1)            # pylint: disable=maybe-no-member
+#     return _kpi_id
+
+# def create_kpi_request(kpi_id_str):
+#     _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          = '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)
+#     return _create_kpi_request
+
+# def create_kpi_request_b():
+#     _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     = '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                                = 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     = '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                                = 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()
@@ -80,10 +80,10 @@ def include_kpi_request(kpi_id):
     _include_kpi_request.kpi_value.floatVal     = 500*random()       # pylint: disable=maybe-no-member
     return _include_kpi_request
 
-def kpi_descriptor_list():
-    _kpi_descriptor_list = monitoring_pb2.KpiDescriptorList()
+# def kpi_descriptor_list():
+#     _kpi_descriptor_list = monitoring_pb2.KpiDescriptorList()
 
-    return _kpi_descriptor_list
+#     return _kpi_descriptor_list
 
 def kpi_query(kpi_id_list):
     _kpi_query = monitoring_pb2.KpiQuery()