Index: dialin/common/hd_defs.py
===================================================================
diff -u -r4c196bf0092414737023812b5bda5defab3f5ba4 -rb2b3c36835640c7009f8b5268e2f8b99290617a8
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 4c196bf0092414737023812b5bda5defab3f5ba4)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision b2b3c36835640c7009f8b5268e2f8b99290617a8)
@@ -127,6 +127,23 @@
 
 
 @unique
+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
 class PreTreatmentPrimeStates(DialinEnum):
     HD_PRIME_START_STATE = 0
     HD_PRIME_WAIT_FOR_USER_START_STATE = 1
Index: dialin/hd/fans.py
===================================================================
diff -u -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 -rb2b3c36835640c7009f8b5268e2f8b99290617a8
--- dialin/hd/fans.py	(.../fans.py)	(revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309)
+++ dialin/hd/fans.py	(.../fans.py)	(revision b2b3c36835640c7009f8b5268e2f8b99290617a8)
@@ -56,7 +56,7 @@
         self.duty_cycle = 0.0
         self.target_rpm = 0.0
         self.inlet_1_rpm = 0.0
-        self.rpm_alarm_time_offset = 0
+        self.rpm_alarm_time = 0
 
         self.remove = 0
 
@@ -84,7 +84,15 @@
         """
         return self.target_rpm
 
-    @publish(['duty_cycle', 'target_rpm', 'inlet_1_rpm', 'rpm_alarm_time_offset', 'remove'])
+    def get_hd_fans_time_left_to_rpm_alarm(self):
+        """
+        Gets the fans time left to RPM alarm
+
+        @return: Fans time left to RPM alarm
+        """
+        return self.rpm_alarm_time
+
+    @publish(['duty_cycle', 'target_rpm', 'inlet_1_rpm', 'rpm_alarm_time'])
     def _handler_fans_sync(self, message):
         """
         Handles published thermistors message.
@@ -98,7 +106,7 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
         self.inlet_1_rpm = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.rpm_alarm_time_offset = struct.unpack('i', bytearray(
+        self.rpm_alarm_time = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
         self.remove = struct.unpack('i', bytearray(