Index: tst_end_treatment/test.py
===================================================================
diff -u -r7509f73c732db5baebb989bd9e9bd6a3faeec0bc -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249
--- tst_end_treatment/test.py	(.../test.py)	(revision 7509f73c732db5baebb989bd9e9bd6a3faeec0bc)
+++ tst_end_treatment/test.py	(.../test.py)	(revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249)
@@ -21,7 +21,7 @@
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
 from configuration import utility
-from dialin.common.hd_defs import  TreatmentStates, TreatmentEndStates
+from dialin.common.hd_defs import  TreatmentStates, TreatmentEndStates, BloodLeakZeroingStates
 
 hd_simulator = HDSimulator()
        
@@ -30,9 +30,17 @@
          Method to verify End treatment Treatment Complete state screens
     """
     test.startSection("Verifying End treatment Treatment Complete state screens")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_END_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_END_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)
     
     test.compare(str(waitForObject(names.o_end_treatment_complete_state).text),config.END_TREATMENT_COMPLETE_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_STATE_TEXT))
     test.compare(str(waitForObjectExists(names.o_start_rinseback_button_text).text), config.RINSEBACK_BUTTON_TEXT, "Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT))
@@ -46,9 +54,17 @@
          Method to verify End treatment Treatment Paused state screens
     """    
     test.startSection("Verifying End treatment Treatment Paused state screens")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_END_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=TreatmentEndStates.TREATMENT_END_PAUSED_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_END_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=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, 
+                                               treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, 
+                                               dialysis_state=TreatmentStates.TREATMENT_START_STATE.value,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value)
     
     test.compare(str(waitForObject(names.o_end_treatment_complete_paused_state).text), config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT))
     test.endSection()