diff --git a/src/kpi_manager/tests/test_kpi_manager.py b/src/kpi_manager/tests/test_kpi_manager.py
index da149e3fed0e0abde9d54ae3da7fedfa3c778165..219fdadee9e2f4ca9ea9ac0be040043d4edfbdbe 100755
--- a/src/kpi_manager/tests/test_kpi_manager.py
+++ b/src/kpi_manager/tests/test_kpi_manager.py
@@ -93,13 +93,6 @@ def kpi_manager_client(kpi_manager_service : KpiManagerService): # pylint: disab
 # Prepare Environment, should be the first test
 ##################################################
 
-# # ERROR on this test --- 
-# def test_prepare_environment(
-#     context_client : ContextClient,                 # pylint: disable=redefined-outer-name,unused-argument
-# ):
-#     context_id = json_context_id(DEFAULT_CONTEXT_NAME)
-#     context_client.SetContext(Context(**json_context(DEFAULT_CONTEXT_NAME)))
-#     context_client.SetTopology(Topology(**json_topology(DEFAULT_TOPOLOGY_NAME, context_id=context_id)))
 
 ###########################
 # Tests Implementation of Kpi Manager
@@ -152,62 +145,3 @@ def test_set_list_of_KPIs(kpi_manager_client):
     # adding KPI
     for kpi in KPIs_TO_SEARCH:
        kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request_a(kpi))
-    
-
-# ---------- 2nd Iteration Tests -----------------
-# def test_SetKpiDescriptor(kpi_manager_client):
-#     LOGGER.info(" >>> test_SetKpiDescriptor: START <<< ")
-#     with open("kpi_manager/tests/KPI_configs.json", 'r') as file:
-#         data = json.load(file)
-#         _descriptors = data.get('KPIs', [])
-#     for _descritor_name in _descriptors:
-#         response = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request_a(_descritor_name))
-#         LOGGER.info("Response gRPC message object: {:}".format(response))
-#     assert isinstance(response, KpiId)
-
-# def test_GetKpiDescriptor(kpi_manager_client):
-#     LOGGER.info(" >>> test_GetKpiDescriptor: START <<< ")
-#     response = kpi_manager_client.GetKpiDescriptor(create_kpi_id_request())
-#     LOGGER.info("Response gRPC message object: {:}".format(response))
-#     assert isinstance(response, KpiDescriptor)
-
-# def test_DeleteKpiDescriptor(kpi_manager_client):
-#     LOGGER.info(" >>> test_DeleteKpiDescriptor: START <<< ")
-#     response = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request())
-#     del_response = kpi_manager_client.DeleteKpiDescriptor(response)
-#     kpi_manager_client.GetKpiDescriptor(response)
-#     LOGGER.info("Response of delete method gRPC message object: {:}".format(del_response))
-#     assert isinstance(del_response, Empty)
-
-# def test_SelectKpiDescriptor(kpi_manager_client):
-#     LOGGER.info(" >>> test_SelectKpiDescriptor: START <<< ")
-#     kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request_a())
-#     response = kpi_manager_client.SelectKpiDescriptor(create_kpi_filter_request_a())
-#     LOGGER.info("Response gRPC message object: {:}".format(response))
-#     assert isinstance(response, KpiDescriptorList)
-
-# ------------- INITIAL TESTs ----------------
-# Test case that makes use of client fixture to test server's CreateKpi method
-# 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.SetKpiDescriptor(create_kpi_request(str(i+1)))
-#         LOGGER.debug(str(response))
-#         assert isinstance(response, KpiId)
-
-# # Test case that makes use of client fixture to test server's DeleteKpi method
-# 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.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_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)
diff --git a/src/kpi_value_writer/tests/test_kpi_value_writer.py b/src/kpi_value_writer/tests/test_kpi_value_writer.py
index 40593af97cca754c94558c977b105c09d373073a..fce043d7fd6c9b5cbb9374d0b059cb1e2fa65a24 100755
--- a/src/kpi_value_writer/tests/test_kpi_value_writer.py
+++ b/src/kpi_value_writer/tests/test_kpi_value_writer.py
@@ -14,32 +14,12 @@
 
 import logging
 from kpi_value_writer.service.KpiValueWriter import KpiValueWriter
-from kpi_value_writer.tests.test_messages import create_kpi_id_request, create_kpi_descriptor_request
 
 from common.tools.kafka.Variables import KafkaTopic
-from common.proto.kpi_manager_pb2 import KpiDescriptor
-from kpi_manager.client.KpiManagerClient import KpiManagerClient
 
 
-LOGGER = logging.getLogger(__name__)
-
-# def test_GetKpiDescriptor():
-#     LOGGER.info(" >>> test_GetKpiDescriptor: START <<< ")
-#     kpi_manager_client = KpiManagerClient()
-#     # adding KPI
-#     LOGGER.info(" --->>> calling SetKpiDescriptor ")
-#     response_id = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request())
-#     # get KPI
-#     LOGGER.info(" --->>> calling GetKpiDescriptor with response ID")
-#     response = kpi_manager_client.GetKpiDescriptor(response_id)
-#     LOGGER.info("Response gRPC message object: {:}".format(response))
-    
-#     LOGGER.info(" --->>> calling GetKpiDescriptor with random ID")
-#     rand_response = kpi_manager_client.GetKpiDescriptor(create_kpi_id_request())
-#     LOGGER.info("Response gRPC message object: {:}".format(rand_response))
 
-#     LOGGER.info("\n------------------ TEST FINISHED ---------------------\n")
-#     assert isinstance(response, KpiDescriptor)
+LOGGER = logging.getLogger(__name__)
 
 # -------- Initial Test ----------------
 def test_validate_kafka_topics():
@@ -50,4 +30,3 @@ def test_validate_kafka_topics():
 def test_KafkaConsumer():
     LOGGER.debug(" --->>> test_kafka_consumer: START <<<--- ")
     KpiValueWriter.RunKafkaConsumer()
-