Index: dialin/hd/pretreatment.py
===================================================================
diff -u -re6c27d820ba1e0dc880f2242a8b11103aa4d3807 -r830aaa0f158ae58f42d9e53c3fde886de6683608
--- dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision e6c27d820ba1e0dc880f2242a8b11103aa4d3807)
+++ dialin/hd/pretreatment.py	(.../pretreatment.py)	(revision 830aaa0f158ae58f42d9e53c3fde886de6683608)
@@ -216,6 +216,14 @@
         """
         return self.prime_time_countdown
 
+    def get_wet_self_test_state(self):
+        """
+        Gets the pre-treatment wet self test state
+
+        @return: The pre-treatment wet self test state
+        """
+        return self.pre_treatment_wet_self_test_state
+
     @publish([
         "pre_treatment_submode",
         "pre_treatment_sample_water_state",
@@ -237,21 +245,21 @@
         @return: none
         """
 
-        pt_submode = struct.unpack('i', bytearray(
+        self.pre_treatment_submode = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        pt_sw_state = struct.unpack('i', bytearray(
+        self.pre_treatment_sample_water_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        pt_consumable_st_state = struct.unpack('i', bytearray(
+        self.pre_treatment_consumable_self_test_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        pt_no_cart_st_state = struct.unpack('i', bytearray(
+        self.pre_treatment_no_cart_self_test_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
         self.pre_treatment_installation_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        pt_dry_st_state = struct.unpack('i', bytearray(
+        self.pre_treatment_dry_self_test_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        pt_prime_state = struct.unpack('i', bytearray(
+        self.pre_treatment_prime_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        pt_recirc_state = struct.unpack('i', bytearray(
+        self.pre_treatment_recirc_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
         self.pre_treatment_patient_connection_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
@@ -261,39 +269,6 @@
         self.pre_treatment_reservoir_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0]
 
-        self.pre_treatment_submode = 'Unknown SubMode'
-        if PreTreatmentSubModes.has_value(pt_submode):
-            self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).name
-
-        self.pre_treatment_sample_water_state = 'Unknown State'
-        if PreTreatmentSampleWaterStates.has_value(pt_sw_state):
-            self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).name
-
-        self.pre_treatment_consumable_self_test_state = 'Unknown State'
-        if PreTreatmentConsumableSelfTestStates.has_value(pt_consumable_st_state):
-            self.pre_treatment_consumable_self_test_state = PreTreatmentConsumableSelfTestStates(
-                pt_consumable_st_state).name
-
-        self.pre_treatment_no_cart_self_test_state = 'Unknown State'
-        if PreTreatmentNoCartSelfTestStates.has_value(pt_no_cart_st_state):
-            self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).name
-
-        self.pre_treatment_dry_self_test_state = 'Unknown State'
-        if PreTreatmentDrySelfTestsStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestsStates(pt_dry_st_state).name
-
-        self.pre_treatment_dry_self_test_state = 'Unknown State'
-        if PreTreatmentDrySelfTestsStates.has_value(pt_dry_st_state):
-            self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestsStates(pt_dry_st_state).name
-
-        self.pre_treatment_prime_state = 'Unknown State'
-        if PreTreatmentPrimeStates.has_value(pt_prime_state):
-            self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).name
-
-        self.pre_treatment_recirc_state = 'Unknown State'
-        if PreTreatmentRecircStates.has_value(pt_recirc_state):
-            self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).name
-
     @publish([
         "no_cart_self_test_timeout",
         "no_cart_self_test_time_countdown"
@@ -305,7 +280,6 @@
         @param message: published no cartridge self-test progress data message
         @return: None
         """
-
         self.no_cart_self_test_timeout = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
         self.no_cart_self_test_time_countdown = struct.unpack('i', bytearray(