Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r86eb87067a913ab8f1fbaefaedc93cf00907b55c -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 86eb87067a913ab8f1fbaefaedc93cf00907b55c)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a)
@@ -335,46 +335,63 @@
     test.startSection("Pre treatment parameters")
     navigation.navigation_pageIndicator_step(config.CREATERX)
     squish.mouseClick(squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry))
-    squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd"
-    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)
-    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)
+    squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="Patient ID"
+    parent_obj             = squish.waitForObject(names.o_PreTreatmentCreate_leftColumn_Column)
+    blood_flow_rate        = findObjectById(parent_obj, "_bloodFlowRate")
+    set_value_based_on_target(blood_flow_rate, 70)
+    dialysate_flow_rate    = findObjectById(parent_obj, "_dialysateFlowRate")
+    set_value_based_on_target(dialysate_flow_rate, 50)
+    duration               = findObjectById(parent_obj,"_duration")
+    set_value_based_on_target(duration, 60)
+    right_obj              = squish.waitForObject(names.o_PreTreatmentCreate_rightColumn_Column)
+    ultrafiltration_volume = findObjectById(right_obj,"_ufVolume")
+    set_value_based_on_target(ultrafiltration_volume,0.20)
+    heparin_rx             = findObjectById(right_obj,"_heparinRx")
+    heparin_right_arrow    = findObjectById(heparin_rx, "_rightArrow")
+    squish.mouseClick(heparin_right_arrow)
+    heparin_obj            = squish.waitForObject(names.o_LabelUnitValueAdjuster_LabelUnitValueAdjuster)
+    heparin_bolus          = findObjectById(heparin_obj,"_heparinBolusVolume")
+    set_value_based_on_target(heparin_bolus, 0.2)
+    set_value_based_on_target(names.o_heparinDispensingRate_LabelUnitValueAdjuster,0.3)
+    set_value_based_on_target(names.o_heparinDeliveryDuration_LabelUnitValueAdjuster, 60)
+    squish.mouseClick(squish.waitForObject(names.o_confirmButton_ConfirmButton))
     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)
-    set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,1)
     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))
-    td.td_Treatment_Parameters_Validation(  vAccepted                                    = 1,
-                                            vBloodFlowRateRejectReason                   = 0,
-                                            vDialysateFlowRateRejectReason               = 0,
-                                            vTreatmentDurationRejectReason               = 0,
-                                            vSalineBolusVolumeRejectReason               = 0,
-                                            vHeparinStopTimeRejectReason                 = 0,
-                                            vHeparinTypeRejectReason                     = 0,
-                                            vAcidConcentrateRejectReason                 = 0,
-                                            vBicarbonateConcentrateRejectReason          = 0,
-                                            vDialyzerTypeRejectReason                    = 0,
-                                            vBloodPressureMeasureIntervalRejectReason    = 0,
-                                            vRinsebackFlowRateRejectReason               = 0,
-                                            vRinsebackVolumeRejectReason                 = 0,
-                                            vArterialPressureLimitWindowRejectReason     = 0,
-                                            vVenousPressureLimitWindowRejectReason       = 0,
-                                            vVenousPressureLimitAsymtrcRejectReason      = 0,
-                                            vTransmembranePressureLimitWindowRejectReason  = 0,
-                                            vDialysateTempRejectReason                   = 0,
-                                            vHeparinDispensingRateRejectReason           = 0,
-                                            vHeparinBolusVolumeRejectReason              = 0
-                                            )
-    confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000)
-    squish.mouseClick(confirm)
+    Nextbutton            = setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT)
+    squish.mouseClick(squish.waitForObject(Nextbutton))
+    set_value_based_on_target(names.o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster, 139)
+    set_value_based_on_target(names.o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster, 35)
+    set_value_based_on_target(names.o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster,300)
+    set_value_based_on_target(names.o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster,310)
+    confirm_button          = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton)
+    squish.mouseClick(confirm_button)
+    td.td_Treatment_Parameters_Validation(  vAccepted                                            = 1,
+                                            vTreatmentModalityRejectReason                       = 1,    
+                                            vHDFTreatmentModeRejectReason                        = 0,     
+                                            vBloodFlowRateRejectReason                           = 0,                  
+                                            vDialysateFlowRateRejectReason                       = 0,     
+                                            vTreatmentDurationRejectReason                       = 0,     
+                                            vHeparinDeliveryDurationRejectReason                 = 0,     
+                                            vHeparinTypeRejectReason                             = 0,     
+                                            vDryBicarbCartSizeRejectReason                       = 0,     
+                                            vSodiumRejectReason                                  = 0,     
+                                            vBicarbonateRejectReason                             = 0,     
+                                            vDialyzerTypeRejectReason                            = 0,     
+                                            vFluidBolusVolumeRejectReason                        = 0,     
+                                            vBloodPressureMeasureIntervalRejecteason             = 0,     
+                                            vRinsebackVolumeRejectReason                         = 0,     
+                                            vHepatitusBStatusRejectReason                        = 0,     
+                                            vAcidConcentrateIndextRejectReason                   = 0,
+                                            vSubstitutionFluidVolumeRejecteason                  = 0,     
+                                            vHeparinBolusVolumeRejectReason                      = 0,     
+                                            vHeparinDispensingRateRejecteason                    = 0,     
+                                            vDialysateTempRejectReason                           = 0,     
+                                            vAcidConcentrateConversionFactorRejectReason         = 0,    
+                                            vUFPreWeightRejectReason                             = 0,
+                                            vUFEstimatedTargetWeightRejectReason                 = 0,
+                                            vUFVolumeRejectReason                                = 0
+                                           )
     test.endSection()
 
 def findAllObjectsById(parent, target_id):