Index: suite_leahi/tst_water_dialysate_blood_sampling/test.py
===================================================================
diff -u -rf26ea87587e4b5be8fb20c83c3e824a19cf9cc04 -r4045057acb2ebda3ca38376e140baa6c48b7231a
--- suite_leahi/tst_water_dialysate_blood_sampling/test.py	(.../test.py)	(revision f26ea87587e4b5be8fb20c83c3e824a19cf9cc04)
+++ suite_leahi/tst_water_dialysate_blood_sampling/test.py	(.../test.py)	(revision 4045057acb2ebda3ca38376e140baa6c48b7231a)
@@ -42,8 +42,8 @@
 def set_acid_concentrate():
     test.startSection("Set acid concentrate")
     navigation.navigation_pageIndicator_step(config.CREATERX)
-    mouseClick(waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry))
-    waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd"
+    mouseClick(waitForObject(names.o_PreTreatmentCreate_patientID_LabelUnitContainer))
+    waitForObject(names.o_PreTreatmentCreate_patientID_LabelUnitContainer).text ="abcd"
     utility.select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2)
     test.endSection()
     
@@ -52,6 +52,9 @@
     mouseClick(waitForObject(names.o_waterSample_IconButton))
     water_sample = waitForObject(names.o_menu_MainMenu)
     test.compare(water_sample.visible,True ,"Water sample dialog is visible")
+    td.td_water_sample(valve       = 0, 
+                       timeout     = 0   )
+    
     chlorine_level = waitForObject(names.o_Column)
     fail_chlorine = utility.findObjectById(chlorine_level, "_failContainer")
     mouseClick(waitForObject(fail_chlorine))
@@ -100,7 +103,7 @@
 
 def main():
     utils.tstStart(__file__)
-    startApplication(config.AUT_NAME)
+    startApplication(utility.aut("-q"))
     can_interface = td.can_interface
     global watersample
 
@@ -118,9 +121,10 @@
     hemodialysis_btn    = utility.findChildByText(hemodialysis, "Hemodialysis")
     mouseClick(hemodialysis_btn)
     td.td_Treatment_Parameters_CreateRx(vRejectionReason =0)
-    td.td_operation_mode(TDOpModes.MODE_PRET.value, 0)
     td.td_operation_mode(TDOpModes.MODE_PRET.value)
-    td.td_blood_set_auto_load_response(vRejectionReason = 0)
+    # Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
+    # mouseClick(waitForObject(Nextbutton))
+    # td.td_blood_set_auto_load_response(vRejectionReason = 0)
     set_acid_concentrate()
     water_sample_tab()
     dialysate_tab()