diff --git a/src/telemetry_frontend/tests/Messages.py b/src/telemetry_frontend/tests/Messages.py
index 86c8698347248b36d7820642c10d8e907b137166..d323aa7fd0169deb97e3eb8b7d99987473d16fbf 100644
--- a/src/telemetry_frontend/tests/Messages.py
+++ b/src/telemetry_frontend/tests/Messages.py
@@ -15,12 +15,12 @@
 from common.proto import telemetry_frontend_pb2
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 
-def create_collector_id(coll_id_str):
+def create_collector_id(coll_id_str : str):
     _collector_id                   = telemetry_frontend_pb2.CollectorId()
     _collector_id.collector_id.uuid = str(coll_id_str)
     return _collector_id
 
-def create_collector_request(coll_id_str):
+def create_collector_request(coll_id_str :  str):
     _create_collector_request                                = telemetry_frontend_pb2.Collector()
     _create_collector_request.collector_id.collector_id.uuid = str(coll_id_str)
     _create_collector_request.kpi_id.kpi_id.uuid             = 'KPIid' + str(coll_id_str)
@@ -29,15 +29,16 @@ def create_collector_request(coll_id_str):
     return _create_collector_request
 
 def create_collector_request_a():
-    _create_collector_request_a                    = telemetry_frontend_pb2.Collector()
-    _create_collector_request_a.kpi_id.kpi_id.uuid = "-1"
+    _create_collector_request_a                                = telemetry_frontend_pb2.Collector()
+    _create_collector_request_a.collector_id.collector_id.uuid = "-1"
     return _create_collector_request_a
 
 def create_collector_request_b(str_kpi_id, coll_duration_s, coll_interval_s):
-    _create_collector_request_b                    = telemetry_frontend_pb2.Collector()
-    _create_collector_request_b.kpi_id.kpi_id.uuid = str_kpi_id
-    _create_collector_request_b.duration_s         = coll_duration_s
-    _create_collector_request_b.interval_s         = coll_interval_s
+    _create_collector_request_b                                = telemetry_frontend_pb2.Collector()
+    _create_collector_request_b.collector_id.collector_id.uuid = '-1'
+    _create_collector_request_b.kpi_id.kpi_id.uuid             = str_kpi_id
+    _create_collector_request_b.duration_s                     = coll_duration_s
+    _create_collector_request_b.interval_s                     = coll_interval_s
     return _create_collector_request_b
 
 def create_collector_filter():