Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -rc7d96b722594bb29a7bbc3689715b90af6e3d616 -rb6aa1adafbc0b279e012c904ecde7774fb0000ea
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision c7d96b722594bb29a7bbc3689715b90af6e3d616)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision b6aa1adafbc0b279e012c904ecde7774fb0000ea)
@@ -136,14 +136,16 @@
     set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 60)
     set_value_based_on_target(names.o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, 75)
     set_value_based_on_target(names.o_PreTreatmentCreate_durationControl_ValueAdjuster, 75)
-    set_value_based_on_target(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, 0.4)
-    set_value_based_on_target(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, 0.5)
-    set_value_based_on_target(names.o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, 60)
+    heparinValue =navigation.get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="Feature Configurations", key ="HeparinSyringePump")
+    if heparinValue == "1":
+        set_value_based_on_target(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, 0.4)
+        set_value_based_on_target(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, 0.5)
+        set_value_based_on_target(names.o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, 60)
     select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2)
     set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.0)
     select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2)
     set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 200)
-    select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,config.VITALS,1)
+    set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,2.0)
     select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0)
     Validatebutton = setObjectText(obj = names.o_preTreatmentStack_Text, text =config.VALIDATE)
     squish.mouseClick(squish.waitForObject(Validatebutton))
@@ -167,10 +169,9 @@
                                             vDialysateTempRejectReason                   = 0,
                                             vHeparinDispensingRateRejectReason           = 0,
                                             vHeparinBolusVolumeRejectReason              = 0
-                                           )
-    
-    confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM )
-    squish.mouseClick(squish.waitForObject(confirmButton))
+                                            )
+    confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000)
+    squish.mouseClick(confirm)
     test.endSection()
     
 def findAllObjectsById(parent, target_id):
@@ -201,7 +202,7 @@
     """
  
     try:
-        value_field = waitForObject(value_field_obj,1000)
+        value_field = squish.waitForObject(value_field_obj,1000)
         test.log(f"Opening slider for {parameter}...")
         squish.mousePress(value_field, squish.Qt.LeftButton)
         value = value_field.value
@@ -214,17 +215,17 @@
         if not object.exists(slider_obj):
             test.fail(f"{parameter}: Slider did not appear.")
         
-        slider = waitForObject(slider_obj)
+        slider = squish.waitForObject(slider_obj)
         test.log(f"{parameter}: Slider appeared successfully.")
         squish.mousePress(slider,squish.Qt.LeftButton)
-        final_value = waitForObject(value_field_obj).value
+        final_value = squish.waitForObject(value_field_obj).value
         test.verify(final_value!= value, f"{parameter} slider adjusted correctly to {final_value}")
         squish.mouseRelease(slider, squish.Qt.LeftButton)
         
         if object.exists(slider_obj):
             test.log(f"Waiting for {parameter} slider to close...")
         
-            waitFor(lambda: not object.exists(slider_obj), 1000)
+            squish.waitFor(lambda: not object.exists(slider_obj), 1000)
     except LookupError as e:
         test.fail(f"{parameter}: LookupError - {e}")