diff --git a/eive_tmtc/tmtc/acs/imtq.py b/eive_tmtc/tmtc/acs/imtq.py
index c0caf24..9ca9eb5 100644
--- a/eive_tmtc/tmtc/acs/imtq.py
+++ b/eive_tmtc/tmtc/acs/imtq.py
@@ -61,6 +61,7 @@ class ImtqSetId:
     NEGATIVE_Y_TEST = 13
     POSITIVE_Z_TEST = 14
     NEGATIVE_Z_TEST = 15
+    SELF_TEST_SET = 16
 
 
 class ImtqActionId:
@@ -307,7 +308,7 @@ ENG_HK_HEADERS = [
 
 
 def handle_imtq_hk(printer: FsfwTmTcPrinter, hk_data: bytes, set_id: int):
-    if (set_id >= ImtqSetId.POSITIVE_X_TEST) and (set_id <= ImtqSetId.NEGATIVE_Z_TEST):
+    if set_id == ImtqSetId.SELF_TEST_SET:
         return handle_self_test_data(printer, hk_data)
     elif set_id == ImtqSetId.ENG_HK_NO_TORQUE:
         _LOGGER.info("Found engineering HK without torque")
diff --git a/eive_tmtc/tmtc/power/power.py b/eive_tmtc/tmtc/power/power.py
index 7430f34..c748b00 100644
--- a/eive_tmtc/tmtc/power/power.py
+++ b/eive_tmtc/tmtc/power/power.py
@@ -45,7 +45,7 @@ class SetId(enum.IntEnum):
     SWITCHER_SET = 0
 
 
-class PcduSetIds:
+class PcduSetIds(enum.IntEnum):
     SWITCHER_SET = 0