diff --git a/obsw_tmtc_client.py b/obsw_tmtc_client.py
index 66f3bd13662acd3f714ee337ea5caac8a34cc253..3827b487b6ebe4263b79003738f738418b59f7d2 100644
--- a/obsw_tmtc_client.py
+++ b/obsw_tmtc_client.py
@@ -194,6 +194,7 @@ class TmTcHandler:
                 com_interface=communication_interface, tmtc_printer=tmtc_printer,
                 tc_queue=all_tc_queue, tm_listener=tm_listener)
             sender_and_receiver.send_queue_tc_and_receive_tm_sequentially()
+            LOGGER.info("SequentialSenderReceiver: Exporting output to log file.")
             tmtc_printer.print_file_buffer_list_to_file("log/tmtc_log.txt", True)
 
         elif self.mode == g.ModeList.UnitTest:
diff --git a/sendreceive/obsw_sequential_sender_receiver.py b/sendreceive/obsw_sequential_sender_receiver.py
index b56e627d2155838b46d91966d2f65d741db39b13..782c41a08023ebe3b9dc8629660a4d633795c4a6 100644
--- a/sendreceive/obsw_sequential_sender_receiver.py
+++ b/sendreceive/obsw_sequential_sender_receiver.py
@@ -66,9 +66,7 @@ class SequentialCommandSenderReceiver(CommandSenderReceiver):
                 self._tm_listener.event_mode_op_finished.set()
                 self.__mode_op_finished = True
         LOGGER.info("SequentialSenderReceiver: All replies received!")
-        if g.G_PRINT_TO_FILE:
-            LOGGER.info("SequentialSenderReceiver: Exporting output to log file.")
-            self._tmtc_printer.print_file_buffer_list_to_file("log/tmtc_log.txt", True)
+
 
     def __perform_next_tc_send(self):
         if self._tm_listener.event_reply_received.is_set():
diff --git a/tc/obsw_pus_tc_packer.py b/tc/obsw_pus_tc_packer.py
index cd40e705cdadc56253a626698a71a646eb0b433c..9650005c2efc31e0e0aacdb42accb7c63616a62b 100644
--- a/tc/obsw_pus_tc_packer.py
+++ b/tc/obsw_pus_tc_packer.py
@@ -57,6 +57,22 @@ def service_test_select(service: Union[int, str], service_queue: TcQueueT) -> Tc
         print("Invalid Service !")
         exit()
 
+# TODO: a way to select certain services would be nice (by passing a dict or array maybe)
+def create_total_tc_queue() -> TcQueueT:
+    if not os.path.exists("log"):
+        os.mkdir("log")
+    tc_queue = deque()
+    tc_queue = pack_service2_test_into(tc_queue)
+    tc_queue = pack_service3_test_into(tc_queue)
+    tc_queue = pack_service5_test_into(tc_queue)
+    tc_queue = pack_service8_test_into(tc_queue)
+    tc_queue = pack_service9_test_into(tc_queue)
+    tc_queue = pack_service17_test_into(tc_queue)
+    tc_queue = pack_service200_test_into(tc_queue)
+    tc_queue = pack_dummy_device_test_into(tc_queue)
+    object_id = g.GPS0_ObjectId
+    tc_queue = pack_gps_test_into(object_id, tc_queue)
+    return tc_queue
 
 def pack_service5_test_into(tc_queue: TcQueueT) -> TcQueueT:
     tc_queue.appendleft(("print", "Testing Service 5"))
@@ -197,20 +213,3 @@ def pack_error_testing_into(tc_queue: TcQueueT) -> TcQueueT:
     command = PusTelecommand(service=17, subservice=130, ssc=2020)
     tc_queue.appendleft(command.pack_command_tuple())
     return tc_queue
-
-
-def create_total_tc_queue() -> TcQueueT:
-    if not os.path.exists("log"):
-        os.mkdir("log")
-    tc_queue = deque()
-    tc_queue = pack_service2_test_into(tc_queue)
-    tc_queue = pack_service3_test_into(tc_queue)
-    tc_queue = pack_service5_test_into(tc_queue)
-    tc_queue = pack_service8_test_into(tc_queue)
-    tc_queue = pack_service9_test_into(tc_queue)
-    tc_queue = pack_service17_test_into(tc_queue)
-    tc_queue = pack_service200_test_into(tc_queue)
-    tc_queue = pack_dummy_device_test_into(tc_queue)
-    object_id = g.GPS0_ObjectId
-    tc_queue = pack_gps_test_into(object_id, tc_queue)
-    return tc_queue