diff --git a/sendreceive/obsw_multiple_commands_sender_receiver.py b/sendreceive/obsw_multiple_commands_sender_receiver.py
index b40d1d6e0631f57d36522d8b2fc25e5690b18045..8531800d3531a5ee391a4c5a7a180eb234a6198a 100644
--- a/sendreceive/obsw_multiple_commands_sender_receiver.py
+++ b/sendreceive/obsw_multiple_commands_sender_receiver.py
@@ -54,7 +54,7 @@ class MultipleCommandSenderReceiver(SequentialCommandSenderReceiver):
             self._tm_listener.event_mode_change.set()
             # TC info queue is set in this function
             self.__send_all_queue()
-            self.wait_for_last_replies_listening(self._tm_timeout / 1.5)
+            self.wait_for_last_replies_listening(self._tm_timeout / 1.4)
             self.tm_packet_queue = self._tm_listener.retrieve_tm_packet_queue()
             self._tm_listener.clear_tm_packet_queue()
             self._tm_listener.event_mode_op_finished.set()
diff --git a/test/obsw_module_test.py b/test/obsw_module_test.py
index 4de55c031663a4d53fd7f15bf06eb9a60bef7dea..53bee92cde04f0a964c906295c11bbe3d93a2c32 100644
--- a/test/obsw_module_test.py
+++ b/test/obsw_module_test.py
@@ -124,11 +124,9 @@ class TestService(unittest.TestCase):
             LOGGER.info("Closing TMTC Handler")
         tm_info_queue = deque()
         while tm_packet_queue.__len__() != 0:
-            tm_packet = tm_packet_queue.pop()
-            # LOGGER.debug(tm_packet)
-            tm_info_queue.appendleft(tm_packet.pack_tm_information())
-        g.G_PP.pprint(tm_info_queue)
-        g.G_PP.pprint(tc_info_queue)
+            tm_packet_list = tm_packet_queue.pop()
+            for tm_packet in tm_packet_list:
+                tm_info_queue.appendleft(tm_packet.pack_tm_information())
         assertion_dict = self._analyse_tm_tc_info(tm_info_queue, tc_info_queue)
         return assertion_dict
 
@@ -181,14 +179,10 @@ class TestService(unittest.TestCase):
         this function looks whether the tc verification SSC matched
         a source sequence count of the sent TM
         """
-        LOGGER.debug(current_tm_info[TmDictionaryKeys.TC_SSC])
-        LOGGER.debug(self.tc_ssc_array)
         current_subservice = current_tm_info[TmDictionaryKeys.SUBSERVICE]
         for possible_index, search_index in enumerate(self.tc_ssc_array):
             if search_index == current_tm_info[TmDictionaryKeys.TC_SSC]:
-                LOGGER.debug("ssc fitting")
                 if current_subservice == 1:
-                    LOGGER.debug("subservice1detected")
                     self.tc_verified_start = self.tc_verified_start + 1
                 elif current_subservice == 5:
                     self.tc_verified_step = self.tc_verified_step + 1
@@ -219,13 +213,11 @@ class TestService(unittest.TestCase):
             current_tm_info = tm_info_queue.pop()
             # Tc verification scanning is generic and has been moved to the superclass
             if current_tm_info[TmDictionaryKeys.SERVICE] == 1:
-                LOGGER.debug("detected")
                 self.scan_for_respective_tc(current_tm_info)
             # Here, the desired event Id or RID can be specified
             if current_tm_info[TmDictionaryKeys.SERVICE] == 5:
                 if (current_tm_info[TmDictionaryKeys.EVENT_ID] == 8200 and
                         current_tm_info[TmDictionaryKeys.REPORTER_ID] == 0x51001700):
-
                     self.event_counter = self.event_counter + 1
             if current_tm_info[TmDictionaryKeys.SERVICE] == 17:
                 self.misc_counter = self.misc_counter + 1
diff --git a/test/obsw_pus_service_test.py b/test/obsw_pus_service_test.py
index f048f97ef867c6476226f055e3e1e096401edfed..9e5ab6c6c7f189ca1865c9eb0ac5a10421a33f07 100644
--- a/test/obsw_pus_service_test.py
+++ b/test/obsw_pus_service_test.py
@@ -13,7 +13,9 @@ from tc.obsw_pus_tc_base import PusTcInfoQueueT
 from tc.obsw_pus_tc_packer import pack_service17_test_into, pack_service5_test_into, \
     pack_service2_test_into, pack_service8_test_into
 import config.obsw_config as g
+from utility.obsw_logger import get_logger
 
+LOGGER = get_logger()
 
 class TestService2(TestService):
     """
@@ -69,11 +71,11 @@ class TestService5(TestService):
     @classmethod
     def setUpClass(cls: TestService):
         super().setUpClass()
-        print("Testing Service 5")
+        LOGGER.info("Testing Service 5")
         # Wait intervals after TC 1,2 and 3 with specified wait times
         # This is required because the OBSW tasks runs with fixed sequences
         cls.wait_intervals = [1, 2, 3, 4]
-        cls.wait_time = [0.5, 1.5, 0.5, 1.5]
+        cls.wait_time = [0.7, 1.5, 0.7, 1.5]
         pack_service5_test_into(cls.test_queue)
 
     def test_Service5(self):
@@ -102,7 +104,7 @@ class TestService8(TestService):
     @classmethod
     def setUpClass(cls: TestService):
         super().setUpClass()
-        print("Testing Service 8")
+        LOGGER.info("Testing Service 8")
         cls.wait_intervals = [1, 2, 3, 4]
         cls.wait_time = [1.5, 1.0, 1.0, 1.5]
         cls.data_reply_count = 0
@@ -150,9 +152,9 @@ class TestService17(TestService):
     @classmethod
     def setUpClass(cls: TestService):
         super().setUpClass()
-        print("Testing Service 17")
-        cls.wait_intervals = [2]
-        cls.wait_time = 2
+        LOGGER.info("Testing Service 17")
+        cls.wait_intervals = [2,3]
+        cls.wait_time = [2,1]
         cls.tm_timeout = g.G_TM_TIMEOUT
         pack_service17_test_into(cls.test_queue)
 
diff --git a/utility/obsw_tmtc_printer.py b/utility/obsw_tmtc_printer.py
index 9d8d23a7241a251399fcb98be8d7e09e168b4555..470b643403a4a3e10649ae38f41809a3c642a16b 100644
--- a/utility/obsw_tmtc_printer.py
+++ b/utility/obsw_tmtc_printer.py
@@ -61,7 +61,7 @@ class TmTcPrinter:
         :return:
         """
         print()
-        LOGGER.debug(packet.return_full_packet_string())
+        # LOGGER.debug(packet.return_full_packet_string())
         if self.display_mode == DisplayMode.SHORT:
             self.__handle_short_print(packet)
         else: