Index: tst_instructions_poc/test.py
===================================================================
diff -u -r4800083679383c87221a7e55ad35f84b40ffb386 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249
--- tst_instructions_poc/test.py	(.../test.py)	(revision 4800083679383c87221a7e55ad35f84b40ffb386)
+++ tst_instructions_poc/test.py	(.../test.py)	(revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249)
@@ -19,7 +19,7 @@
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
 from configuration import utility
-from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates,  PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,TreatmentRinsebackStates,PreTreatmentRecircStates,TreatmentBloodPrimeStates,TreatmentEndStates,TreatmentStopStates,TreatmentDialysisStates,HDInitStates
+from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates,  PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,TreatmentRinsebackStates,PreTreatmentRecircStates,TreatmentBloodPrimeStates,TreatmentEndStates,TreatmentStopStates,TreatmentDialysisStates,HDInitStates, BloodLeakZeroingStates
 from dialin.hd.reservoirs import HDReservoirStates
 from dialin.ui.utils import waitForGUI
 
@@ -517,19 +517,35 @@
     instructionRightArrow   = rightarrow_obj_names.pop(first_index)
 
     test.startSection("Navigating to End Treatment Rinseback Setup screen")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_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 = TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value,
-                                               treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_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 = TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, 
+                                               recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, 
+                                               blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value,
+                                               treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, 
+                                               treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, 
+                                               dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
     verify_instruction_and_image("Rinseback Setup", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow)
     test.endSection()
       
     # advance the title and arrow name  
     instructionScreenObject = text_obj_names.pop(first_index)  
     instructionRightArrow   = rightarrow_obj_names.pop(first_index)
     test.startSection("Navigating to End Treatment Rinseback Complete screen")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_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 = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value,
-                                               treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_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 = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, 
+                                               recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, 
+                                               blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value,
+                                               treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, 
+                                               treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, 
+                                               dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
    
      
     verify_instruction_and_image("Rinseback Complete", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow)
@@ -559,9 +575,17 @@
     instructionScreenObject = text_obj_names.pop(first_index)  
     instructionRightArrow   = rightarrow_obj_names.pop(first_index)
     test.startSection("Navigating to End Treatment Recirculate screen")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_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 = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value,
-                                               treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value)
+    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_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 = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, 
+                                               recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, 
+                                               blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value,
+                                               treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, 
+                                               treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, 
+                                               dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
     verify_instruction_and_image("Recirculate Disconnect", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow)
     test.endSection()
     #TODO :-  Disinfect verification