Index: suite_leahi/shared/scripts/configuration/config.py
===================================================================
diff -u -rb29968830a0ad7bfb6b1711404ece8e3f6b656eb -rf26ea87587e4b5be8fb20c83c3e824a19cf9cc04
--- suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision b29968830a0ad7bfb6b1711404ece8e3f6b656eb)
+++ suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision f26ea87587e4b5be8fb20c83c3e824a19cf9cc04)
@@ -65,10 +65,11 @@
 ALARM_REJECT_NOTIFICATION_TEMPLATE = "No Active Alarm List [{}]"
 
 #Create Rx
-ACID_CONCENTRATE            = ["1.0 K, 2.50 Ca, 1 Mg","2.0 K, 2.50 Ca, 1 Mg","3.0 K, 2.50 Ca, 1 Mg"]
+#Create Rx
+ACID_CONCENTRATE            = ["1.0 K, 2.50 Ca","2.0 K, 2.50 Ca","3.0 K, 2.50 Ca"]
 DIALYZER_TYPE               = ["Diacap Pro 13H","Diacap Pro 16H", "Diacap Pro 19H", "Optiflux F160NRe", "Optiflux F180NRe", "Optiflux F200NRe","Optiflux F250NRe"]
 VITALS                      = ["OFF","5","10","15","20","30","60"]
-BICARBONATE                 = ["Sodium Bicarbonate"]
+BICARBONATE                 = ["650 g","720 g","760 g", "900 g", "1100 g","1250 g"]
 
 #Heparin
 heparin_off    = { "Heparin Type"    :"OFF",
Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -rb29968830a0ad7bfb6b1711404ece8e3f6b656eb -rf26ea87587e4b5be8fb20c83c3e824a19cf9cc04
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision b29968830a0ad7bfb6b1711404ece8e3f6b656eb)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision f26ea87587e4b5be8fb20c83c3e824a19cf9cc04)
@@ -89,7 +89,7 @@
     target_value = target_value
  
     # Wait for all objects
-    parent_obj = squish.waitForObjectExists(obj)
+    parent_obj = squish.waitForObject(obj)
     # change range as per your screen count
     
     left_arrow = findObjectById(parent_obj, "_leftArrow")
Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r7e1fc4c4a21e642c1bf7e36dc83120fe58347b47 -rf26ea87587e4b5be8fb20c83c3e824a19cf9cc04
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 7e1fc4c4a21e642c1bf7e36dc83120fe58347b47)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision f26ea87587e4b5be8fb20c83c3e824a19cf9cc04)
@@ -240,7 +240,7 @@
 o_independentConductivityReadingContainer2_LabelUnitContainer   = {"container": o_Overlay,                                                                                                                              "objectName": "_independentConductivityReadingContainer2",                              "type": "LabelUnitContainer"                                                                }
 o_dialsateTemperatureContainer_LabelUnitContainer               = {"container": o_Overlay,                                                                                                                              "objectName": "_dialsateTemperatureContainer",                                          "type": "LabelUnitContainer"                                                                }
 o_actualRORejectionPercentageContainer_LabelUnitContainer       = {"container": o_Overlay,                                                                                                                              "objectName": "_actualRORejectionPercentageContainer",                                  "type": "LabelUnitContainer"                                                                }
+o_createHDTreatment_TouchRect                                   = {"container": o_standByScreen_MainHome,                                               "id": "_createHDTreatment",                                                                                                                             "type": "TouchRect",                                                  "unnamed": 1           }
 
 
 
-
Index: suite_leahi/tst_water_dialysate_blood_sampling/test.py
===================================================================
diff -u -r7e1fc4c4a21e642c1bf7e36dc83120fe58347b47 -rf26ea87587e4b5be8fb20c83c3e824a19cf9cc04
--- suite_leahi/tst_water_dialysate_blood_sampling/test.py	(.../test.py)	(revision 7e1fc4c4a21e642c1bf7e36dc83120fe58347b47)
+++ suite_leahi/tst_water_dialysate_blood_sampling/test.py	(.../test.py)	(revision f26ea87587e4b5be8fb20c83c3e824a19cf9cc04)
@@ -45,7 +45,6 @@
     mouseClick(waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry))
     waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd"
     utility.select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2)
-    utility.set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.0)
     test.endSection()
     
 def water_sample_tab():
@@ -107,15 +106,19 @@
 
     # handle sent messages from UI 
     if can_interface is not None:
-        channel_id = CAN.DenaliChannels.ui_to_td_ch_id
+        channel_id = CAN.CanChannels.ui_to_td_ch_id
         message_id = MsgIds.MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST.value
         can_interface.register_receiving_publication_function(channel_id,
                                                                message_id,
                                                                handle_water_sample_request)
 
     test.startSection("Verify the water sample, dialysate and Blood sampling ")
     td.td_operation_mode(TDOpModes.MODE_STAN.value)
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect)) 
+    hemodialysis        = waitForObject(names.o_createHDTreatment_TouchRect)
+    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)
     set_acid_concentrate()