Index: tst_main_treatment_vitals/test.py
===================================================================
diff -u -rb5ae573270dd867a63306074307207bc33502769 -r65b2d48f2644addc4edfa1800282c4a6324cae23
--- tst_main_treatment_vitals/test.py	(.../test.py)	(revision b5ae573270dd867a63306074307207bc33502769)
+++ tst_main_treatment_vitals/test.py	(.../test.py)	(revision 65b2d48f2644addc4edfa1800282c4a6324cae23)
@@ -18,7 +18,7 @@
 from configuration import config, utility
 from dialin.ui import utils
 from dialin.ui.hd_simulator import HDSimulator
-from dialin.common.hd_defs import  PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates
+from dialin.common.hd_defs import  PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates 
 from time import strftime
 from dialin.ui.utils import waitForGUI
 
@@ -655,12 +655,12 @@
     utils.waitForGUI(1)
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value)
     utils.waitForGUI(1)
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = 1, uf_state= 0, saline_state=0, heparin_state= 0,
-                                               rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0,
-                                               treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0)
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = 2, uf_state= 0, saline_state=0, heparin_state= 0,
-                                               rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0,
-                                               treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value,
+                                               rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value,
+                                               treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value,
+                                               rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value,
+                                               treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value)
     mouseClick(waitForObject(names.o_vitals_close_btn))
     utils.waitForGUI(1)
     verify_vitals_pop_up_is_opened_automatically_after_an_interval(interval=5)
@@ -675,12 +675,12 @@
     """
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value)
     utils.waitForGUI(1)
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
-                                      rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
-                                      treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
-                                      rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
-                                      treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value,
+                                               rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value,
+                                               treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value,
+                                               rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value,
+                                               treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value)
     
 def set_parameter_type(text):
     """
@@ -800,3 +800,4 @@
     verify_interval_for_bpm()
     
     utils.tstDone()
+