diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index d53033b..add4b27 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -71,16 +71,19 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     hk_content = []
     validity_buffer = bytearray()
     hk_header = [
-        "Init Err", "Init Raw Mag X [nT]", "Init Raw Mag Y [nT]", "Init Raw Mag Z [nT]", "Init Cal Mag X [nT]",
-         "Init Cal Mag Y [nT]", "Init Cal Mag Z [nT]", "Init Coil X Current [mA]", "Init Coil Y Current [mA]",
-         "Init Coil Z Current [mA]", "Init Coil X Temperature [°C]", "Init Coil Y Temperature [°C]",
-         "Init Coil Z Temperature [°C]", "Err", "Raw Mag X [nT]", "Raw Mag Y [nT]", "Raw Mag Z [nT]",
-         "Cal Mag X [nT]", "Cal Mag Y [nT]", "Cal Mag Z [nT]", "Coil X Current [mA]", "Coil Y Current [mA]",
-         "Coil Z Current [mA]", "Coil X Temperature [°C]", "Coil Y Temperature [°C]", "Coil Z Temperature [°C]",
-         "Fina Err", "Fina Raw Mag X [nT]", "Fina Raw Mag Y [nT]", "Fina Raw Mag Z [nT]", "Fina Cal Mag X [nT]",
-         "Fina Cal Mag Y [nT]", "Fina Cal Mag Z [nT]", "Fina Coil X Current [mA]", "Fina Coil Y Current [mA]",
-         "Fina Coil Z Current [mA]", "Fina Coil X Temperature [°C]", "Fina Coil Y Temperature [°C]",
-         "Fina Coil Z Temperature [°C]"
+        "Init Err", "Init Raw Mag X [nT]", "Init Raw Mag Y [nT]", "Init Raw Mag Z [nT]",
+        "Init Cal Mag X [nT]", "Init Cal Mag Y [nT]", "Init Cal Mag Z [nT]",
+        "Init Coil X Current [mA]", "Init Coil Y Current [mA]", "Init Coil Z Current [mA]",
+        "Init Coil X Temperature [°C]", "Init Coil Y Temperature [°C]",
+        "Init Coil Z Temperature [°C]", "Err", "Raw Mag X [nT]", "Raw Mag Y [nT]", "Raw Mag Z [nT]",
+        "Cal Mag X [nT]", "Cal Mag Y [nT]", "Cal Mag Z [nT]", "Coil X Current [mA]",
+        "Coil Y Current [mA]", "Coil Z Current [mA]",
+        "Coil X Temperature [°C]", "Coil Y Temperature [°C]", "Coil Z Temperature [°C]",
+        "Fina Err", "Fina Raw Mag X [nT]", "Fina Raw Mag Y [nT]", "Fina Raw Mag Z [nT]",
+        "Fina Cal Mag X [nT]", "Fina Cal Mag Y [nT]", "Fina Cal Mag Z [nT]",
+        "Fina Coil X Current [mA]", "Fina Coil Y Current [mA]", "Fina Coil Z Current [mA]",
+        "Fina Coil X Temperature [°C]", "Fina Coil Y Temperature [°C]",
+        "Fina Coil Z Temperature [°C]"
     ]
     # INIT step (no coil actuation)
     init_err = hk_data[0]
@@ -130,12 +133,14 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     hk_content = [
         init_err, init_raw_mag_x, init_raw_mag_y, init_raw_mag_z, init_cal_mag_x, init_cal_mag_y,
         init_cal_mag_z, init_coil_x_current, init_coil_y_current, init_coil_z_current,
-        init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err, raw_mag_x,
-        init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z, coil_x_current, coil_y_current,
-        coil_z_current, coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err, fina_raw_mag_x,
-        fina_raw_mag_y, fina_raw_mag_z, fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z, fina_coil_x_current,
-        fina_coil_y_current, fina_coil_z_current, fina_coil_x_temperature, fina_coil_y_temperature,
-        fina_coil_z_temperature
+        init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err,
+        raw_mag_x, init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z,
+        coil_x_current, coil_y_current, coil_z_current,
+        coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err,
+        fina_raw_mag_x, fina_raw_mag_y, fina_raw_mag_z,
+        fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z,
+        fina_coil_x_current, fina_coil_y_current, fina_coil_z_current,
+        fina_coil_x_temperature, fina_coil_y_temperature, fina_coil_z_temperature
     ]
 
     return hk_header, hk_content, validity_buffer, len(hk_header)