Index: tst_main_treatment_vitals/test.py
===================================================================
diff -u -r2650a9f3f8ca6571294f6ce322327b62fc832ab9 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249
--- tst_main_treatment_vitals/test.py	(.../test.py)	(revision 2650a9f3f8ca6571294f6ce322327b62fc832ab9)
+++ tst_main_treatment_vitals/test.py	(.../test.py)	(revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249)
@@ -18,7 +18,7 @@
 from configuration import application_init as application_init
 from dialin.ui import utils
 from dialin.ui.hd_simulator import HDSimulator
-from dialin.common.hd_defs import  PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates 
+from dialin.common.hd_defs import  PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates, BloodLeakZeroingStates 
 from time import strftime
 # from dialin.ui.utils import waitForGUI
 
@@ -669,13 +669,30 @@
     """
     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= UFStates.UF_PAUSED_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_PAUSED_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_BLOOD_PRIME_STATE.value, 
+                                               uf_state= UFStates.UF_PAUSED_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,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
     
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, 
+                                               uf_state= UFStates.UF_PAUSED_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,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
+    
 def set_parameter_type(text):
     """
     Method to set object property based on text
@@ -783,9 +800,17 @@
     startApplication(config.AUT_NAME)
     
     hd_simulator.cmd_send_power_on_self_test_version_request()
-    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_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,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
     
     hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration=0, max_treatment_duration=480,
                                         min_uf_volume=0.01, max_uf_volume=8.00,