Index: dialin/common/hd_defs.py
===================================================================
diff -u -r9376870ba45b37ed3c0c8e09c061bfcba26d4087 -r2a3b3f15da3808276c9b3b7247e2d5ff6acf3321
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 9376870ba45b37ed3c0c8e09c061bfcba26d4087)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 2a3b3f15da3808276c9b3b7247e2d5ff6acf3321)
@@ -7,8 +7,8 @@
 #
 # @file    hd_defs.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      09-Mar-2022
+# @author  (last)      Dara Navaei
+# @date    (last)      13-May-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  04-Dec-2020
 #
@@ -113,17 +113,20 @@
 
 
 @unique
-class PreTreatmentDrySelfTestStates(DialinEnum):
-    DRY_SELF_TESTS_START_STATE = 0
-    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 1
-    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE = 2
-    DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE = 3
-    DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE = 4
-    DRY_SELF_TESTS_PRESSURE_SENSORS_STATE = 5
-    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 6
-    DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 7
-    DRY_SELF_TESTS_STOPPED_STATE = 8
-    DRY_SELF_TESTS_COMPLETE_STATE = 9
+class PreTreatmentWetSelfTesStates(DialinEnum):
+    WET_SELF_TESTS_START_STATE = 0
+    WET_SELF_TESTS_SETUP_STATE = 1
+    WET_SELF_TESTS_BUBBLES_STATE = 2
+    WET_SELF_TESTS_PRIME_CHECK_STATE = 3
+    WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE = 4
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE = 5
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE = 6
+    WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE = 7
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE = 8
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE = 9
+    WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE = 10
+    WET_SELF_TESTS_STOPPED_STATE = 11
+    WET_SELF_TESTS_COMPLETE_STATE = 12
 
 
 @unique
Index: dialin/hd/alarms.py
===================================================================
diff -u -rc034b74d1d2ec9469e89bb7e6d4cdac5e20f2124 -r2a3b3f15da3808276c9b3b7247e2d5ff6acf3321
--- dialin/hd/alarms.py	(.../alarms.py)	(revision c034b74d1d2ec9469e89bb7e6d4cdac5e20f2124)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 2a3b3f15da3808276c9b3b7247e2d5ff6acf3321)
@@ -7,8 +7,8 @@
 #
 # @file    alarms.py
 #
-# @author  (last)      Dara Navaei
-# @date    (last)      22-Feb-2022
+# @author  (last)      Sean Nash
+# @date    (last)      31-Mar-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -89,7 +89,7 @@
                                                                        self._handler_alarm_information_sync)
 
         # composite alarm status based on latest HD alarm status broadcast message
-        self.alarms_state = 0
+        self.alarms_priority_state = 0
         self.alarm_top = 0
         self.alarms_silence_expires_in = 0
         self.alarms_escalates_in = 0