diff --git a/obsw_tmtc_client.py b/obsw_tmtc_client.py
index ffb6269c473653ec6a25f2863ada22a9eeb74f01..d97dc3586a4c4345c9312a4803f0d644d7077a85 100755
--- a/obsw_tmtc_client.py
+++ b/obsw_tmtc_client.py
@@ -188,7 +188,7 @@ class TmTcHandler:
                 tm_listener=self.tm_listener, tc_queue=service_queue)
             sender_and_receiver.send_queue_tc_and_receive_tm_sequentially()
             self.command_received = True
-            self.mode = g.ModeList.PromptMode
+            self.mode = g.ModeList.ListenerMode
 
         elif self.mode == g.ModeList.SoftwareTestMode:
             all_tc_queue = create_total_tc_queue()
@@ -205,7 +205,7 @@ class TmTcHandler:
             # mode
             perform_binary_upload()
             self.command_received = True
-            self.mode = g.ModeList.PromptMode
+            self.mode = g.ModeList.ListenerMode
 
         elif self.mode == g.ModeList.UnitTest:
             # Set up test suite and run it with runner. Verbosity specifies detail level
diff --git a/tc/obsw_tc_service3.py b/tc/obsw_tc_service3.py
index 89fe0d2c1b18471ef78f401f15d722bc98a5c07a..6af2753d435f059619a91cab8ee621ff5f406732 100644
--- a/tc/obsw_tc_service3.py
+++ b/tc/obsw_tc_service3.py
@@ -28,23 +28,29 @@ number_of_parameters = struct.pack('>B', 5)
 def pack_service3_test_into(tc_queue: Deque) -> Deque:
     tc_queue.appendleft(("print", "Testing Service 3"))
     # Predefined packet testing
-    # pack_predefined_tests(tc_queue)
+    pack_test_device_test(tc_queue)
     pack_custom_tests(tc_queue)
 
     tc_queue.appendleft(("export", "log/tmtc_log_service3.txt"))
     return tc_queue
 
 
+def pack_test_device_test(tc_queue):
+    pass
+
+
 def pack_custom_tests(tc_queue: Deque):
-    # deleting pre-defined test entry
     tc_queue.appendleft(("print", "Testing Service 3: "))
+
     tc_queue.appendleft(("print", "Generate one Thermal Sensor packet: "))
     command = PusTelecommand(service=3, subservice=27, ssc=3100, app_data=sid_thermalsensor)
     tc_queue.appendleft(command.pack_command_tuple())
-    # tc_queue.appendleft(("print", "Enabling periodic Thermal Sensor packet generation: "))
-    # command = PusTelecommand(service=3, subservice=5, ssc=3101, app_data=sid_thermalsensor)
-    # tc_queue.appendleft(command.pack_command_tuple())
-    #
+
+    tc_queue.appendleft(("print", "Enabling periodic Thermal Sensor packet generation: "))
+    command = PusTelecommand(service=3, subservice=5, ssc=3101, app_data=sid_thermalsensor)
+    tc_queue.appendleft(command.pack_command_tuple())
+
+    tc_queue.appendleft(("wait", 5))
     # new_interval = 1.0
     # interval_app_data = sid_thermalsensor + make_interval(new_interval)
     # tc_queue.appendleft(("print", "Setting interval to one second: "))