diff --git a/tc/obsw_tc_service23.py b/tc/obsw_tc_service23.py
index e9718d873706c780d942aca1037a2bfe22de3159..c5773c9306f36889c100f6721fbe7da4a2166fd1 100644
--- a/tc/obsw_tc_service23.py
+++ b/tc/obsw_tc_service23.py
@@ -190,6 +190,18 @@ def generate_print_sd_card_packet(
     return PusTelecommand(service=23, subservice=133, ssc=ssc, app_data=app_data)
 
 
+def generate_clear_sd_card_packet(
+        ssc: int, object_id: bytearray = g.SD_CARD_HANDLER_ID) -> PusTelecommand:
+    app_data = bytearray(object_id)
+    return PusTelecommand(service=23, subservice=181, ssc=ssc, app_data=app_data)
+
+
+def generate_format_sd_card_packet(
+        ssc: int, object_id: bytearray = g.SD_CARD_HANDLER_ID) -> PusTelecommand:
+    app_data = bytearray(object_id)
+    return PusTelecommand(service=23, subservice=182, ssc=ssc, app_data=app_data)
+
+
 def generate_create_file_srv23_1_packet(
         filename: str, repository_path: str, ssc: int, max_size_of_app_data: int,
         initial_data: bytearray = bytearray([]),
@@ -314,23 +326,37 @@ def pack_service23_test_into(tc_queue: Deque) -> Deque:
     # sd_handler_id = g.SD_CARD_HANDLER_ID
     tc_queue.appendleft(("print", "Testing Service 23"))
 
+    tc_queue.append(("print", "Formatting file system"))
+    command = generate_format_sd_card_packet(ssc=2390)
+    tc_queue.appendleft(command.pack_command_tuple())
+
+    tc_queue.append(("print", "Create directory 'test'"))
+    command = generate_mkdir_srv23_9_packet(directory_name="test", repository_path="/", ssc=2300)
+    tc_queue.appendleft(command.pack_command_tuple())
+    tc_queue.append(("print", "Create subdirectory 'subdir' in 'test'"))
+    command = generate_mkdir_srv23_9_packet(repository_path="test", ssc=2301,
+                                            directory_name="subdir")
+    tc_queue.appendleft(command.pack_command_tuple())
+
+    tc_queue.appendleft(("print", "Create test.bin"))
+    command = generate_create_file_srv23_1_packet(
+         filename="test.bin", repository_path="test/subdir", ssc=2302,
+         initial_data=bytearray([0x01, 0x00, 0x01, 0x00]),
+         max_size_of_app_data=1024)
+    tc_queue.appendleft(command.pack_command_tuple())
+
     tc_queue.appendleft(("print", "Printing file structure."))
     command = generate_print_sd_card_packet(ssc=2300)
     tc_queue.appendleft(command.pack_command_tuple())
-    # tc_queue.append(("print", "Create directory 'test'"))
-    # command = generate_mkdir_srv23_9_packet(directory_name="test", repository_path="/", ssc=2300)
-    # tc_queue.appendleft(command.pack_command_tuple())
-    # tc_queue.append(("print", "Create subdirectory 'subdir' in 'test'"))
-    # command = generate_mkdir_srv23_9_packet(repository_path="test", ssc=2301,
-    #                                         directory_name="subdir")
-    # tc_queue.appendleft(command.pack_command_tuple())
-    #
-    # tc_queue.appendleft(("print", "Create test.bin"))
-    # command = generate_create_file_srv23_1_packet(
-    #      filename="test.bin", repository_path="test/subdir", ssc=2302,
-    #      initial_data=bytearray([0x01, 0x00, 0x01, 0x00]),
-    #      max_size_of_app_data=1024)
-    # tc_queue.appendleft(command.pack_command_tuple())
+
+    tc_queue.appendleft(("print", "Clearing SD card"))
+    command = generate_clear_sd_card_packet(ssc=2301)
+    tc_queue.appendleft(command.pack_command_tuple())
+
+    tc_queue.appendleft(("print", "Printing file structure"))
+    command = generate_print_sd_card_packet(ssc=2302)
+    tc_queue.appendleft(command.pack_command_tuple())
+
     # tc_queue.appendleft(("print", "Read data of test.bin"))
     # command = generate_read_file_srv23_129_packet("test/subdir", "test.bin", ssc=2303)
     # tc_queue.appendleft(command.pack_command_tuple())