Index: tst_treatment_blood_dialysateflow_rate/test.py
===================================================================
diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249
--- tst_treatment_blood_dialysateflow_rate/test.py	(.../test.py)	(revision 2e73714b63ae5fd2ef8b5acca5043e136454feff)
+++ tst_treatment_blood_dialysateflow_rate/test.py	(.../test.py)	(revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249)
@@ -14,20 +14,21 @@
 
 import names
 from dialin.ui import utils
+from dialin.common.hd_defs import BloodLeakZeroingStates
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
 
 
 BLOOD_DIALYSATE_FLOW_TESTING_OPTION = {
-    "OPTION_1" : [0, 0, 0, 0, 0, 0, 0, 0, 'None'],
+    "OPTION_1" : [0, 0, 0, 0, 0, 0, 0, 0,0, 'None'],
     "OPTION_2" : [100, 1, 1, 1, 1, 1, 1, 1, 1, 'blood'],
-    "OPTION_3" : [125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 125, 'blood'],
-    "OPTION_4" : [550, 24, 32, 425, 85, 18, 36,  45,'blood'],
-    "OPTION_5" : [80, 12, 12, 12, 12, 12, 12, 12, 'blood'],
-    "OPTION_6" : [100, 0, 0, 0, 0, 0, 0, 0, 'dialysate'],
-    "OPTION_7" : [180, 1, 1, 1, 1, 1, 1, 1, 'dialysate'],
-    "OPTION_8" : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145,  'blood'],
-    "OPTION_9" : [250, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145, 'dialysate'],
+    "OPTION_3" : [125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 125, 125, 'blood'],
+    "OPTION_4" : [550, 24, 32, 425, 85, 18, 36,  45,550,'blood'],
+    "OPTION_5" : [80, 12, 12, 12, 12, 12, 12, 12, 80,'blood'],
+    "OPTION_6" : [100, 0, 0, 0, 0, 0, 0, 0,100, 'dialysate'],
+    "OPTION_7" : [180, 1, 1, 1, 1, 1, 1, 1,180, 'dialysate'],
+    "OPTION_8" : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145,220,  'blood'],
+    "OPTION_9" : [250, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145,250, 'dialysate'],
     }
  
 DUMMY_INTIGER = 12             #This value is used for arguments which is not part of verification
@@ -207,16 +208,19 @@
     pwm = blood_dialysate_control_list[6]
     rot_count = blood_dialysate_control_list[7]
     flow_type = blood_dialysate_control_list[8]
+    prescribed_flow = blood_dialysate_control_list[9]
     
     # Integration team needs to determine if the new parameters for flow rate commands are needed for verification.                                      
     if flow_type == config.BLOOD_FLOW_TEXT:
         hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt, measured_flow, rot_speed, mot_speed, mc_speed,
-                                          mc_current, pwm, rot_count,0,0)
+                                          mc_current, pwm, rot_count, prescribed_flow)
+        utils.waitForGUI(0.5)
         test.compare(str(waitForObjectExists(names.o_treatment_blood_flow_rate).label), str(flow_set_pt))
     
     elif flow_type == config.DIALYSATE_FLOW_TEXT:
         hd_simulator.cmd_set_treatment_dialysate_flow_rate(flow_set_pt, measured_flow,
-                                          rot_speed, mot_speed, mc_speed, mc_current, pwm,0,0,0)
+                                          rot_speed, mot_speed, mc_speed, mc_current, pwm, 0,0,0)
+        utils.waitForGUI(0.5)
         test.compare(str(waitForObjectExists(names.o_treatment_dialysate_flow_rate).label), str(flow_set_pt))
         
     else :
@@ -234,9 +238,17 @@
     utils.waitForGUI(1)
     
     #navigate to In-treatment section
-    hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state=1, heparin_state= 0,
-                                      rinseback_state= 0, recirculate_state= 0, blood_prime_state= 2,
-                                      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=1, 
+                                               heparin_state= 0,
+                                               rinseback_state= 0, 
+                                               recirculate_state= 0, 
+                                               blood_prime_state= 2,
+                                               treatment_end_state=0, 
+                                               treatment_stop_state= 0, 
+                                               dialysis_state=0,
+                                               bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) 
     utils.waitForGUI(1)  #delay for fetching effect
     
     test_blood_flow_rate_and_dialysate(BLOOD_DIALYSATE_FLOW_TESTING_OPTION["OPTION_1"])