Index: HDDefs.h
===================================================================
diff -u -r25469667abdf600e0a8b6580ca37d36f595d4a5d -r04bc7e8932551ccbfbe1b41d525146c8941d7c1c
--- HDDefs.h	(.../HDDefs.h)	(revision 25469667abdf600e0a8b6580ca37d36f595d4a5d)
+++ HDDefs.h	(.../HDDefs.h)	(revision 04bc7e8932551ccbfbe1b41d525146c8941d7c1c)
@@ -8,7 +8,7 @@
 * @file    HDDefs.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      09-Mar-2022
+* @date    (last)      23-Mar-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -54,18 +54,18 @@
     POST_STATE_START = 0,                               ///< Start initialize & POST mode state
     POST_STATE_FW_INTEGRITY,                            ///< Run firmware integrity test state
     POST_STATE_AC,                                      ///< Check HD has AC power - power off if not
-    POST_STATE_WATCHDOG,                                ///< Run watchdog test state
+    POST_STATE_WATCHDOG,                                ///< Run watchdog test state
     POST_STATE_SAFETY_SHUTDOWN,                         ///< Run safety shutdown test state
-    POST_STATE_RTC,                                     ///< Run RTC test state
-    POST_STATE_NVDATAMGMT,                              ///< Run NV Data Mgmt. test state
-    POST_STATE_BLOOD_FLOW,                              ///< Run blood flow test state
+    POST_STATE_RTC,                                     ///< Run RTC test state
+    POST_STATE_NVDATAMGMT,                              ///< Run NV Data Mgmt. test state
+    POST_STATE_BLOOD_FLOW,                              ///< Run blood flow test state
     POST_STATE_DIALYSATE_INLET_FLOW,                    ///< Run dialysate inlet flow test state
     POST_STATE_DIALYSATE_OUTLET_FLOW,                   ///< Run dialysate outlet flow test state
-    POST_STATE_BLOOD_LEAK,                              ///< Run blood leak sensor test state
+    POST_STATE_BLOOD_LEAK,                              ///< Run blood leak sensor test state
     POST_STATE_VALVES,                                  ///< Run valves test state
     POST_STATE_SYRINGE_PUMP,                            ///< Run syringe pump test state
     POST_STATE_PRES_OCCL,                               ///< Run pressure occlusion state
-    POST_STATE_ALARM_AUDIO,                             ///< Run alarm audio test state
+    POST_STATE_ALARM_AUDIO,                             ///< Run alarm audio test state
     POST_STATE_ALARM_LAMP,                              ///< Run alarm lamp test state
     POST_STATE_ACCELEROMETER,                           ///< Run Accelerometer test state
     POST_STATE_TEMPERATURES,                            ///< Run temperatures POST state
@@ -74,8 +74,8 @@
     POST_STATE_UI_POST,                                 ///< Check whether UI passed its POST tests
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
     POST_STATE_FPGA,                                    ///< Run FPGA test state
-    POST_STATE_COMPLETED,                               ///< POST self-tests completed state
-    POST_STATE_FAILED,                                  ///< POST self-tests failed state
+    POST_STATE_COMPLETED,                               ///< POST self-tests completed state
+    POST_STATE_FAILED,                                  ///< POST self-tests failed state
     NUM_OF_POST_STATES                                  ///< Number of initialize & POST mode states
 };
 typedef enum HD_POST_States HD_POST_STATE_T;            ///< Type for HD POST states enumeration
@@ -225,10 +225,7 @@
 {
     NO_CART_SELF_TESTS_START_STATE = 0,                     ///< No cartridge self-tests starting state
     NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,           ///< Wait for door to be closed before running self-tests
-    NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE,             ///< No cartridge occlusion sensors self-test state
-    NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE,             ///< No cartridge blood flow meter self-test state
-    NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE,         ///< No cartridge dialysate flow meter self-test state
-    NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE,             ///< No cartridge board temperature self-test state
+    NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE,               ///< No cartridge pressure sensors self-test state
     NO_CART_SELF_TESTS_HOME_VALVES_STATE,                   ///< No cartridge home valves state
     NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE,             ///< No cartridge home syringe pump state
     NO_CART_SELF_TESTS_PUMPS_STATE,                         ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state