Index: tst_main_treatment_vitals/test.py
===================================================================
diff -u -r1cfccd279dba94f4d844e875964b50b91f4ac18d -rcd99a82bc00592c2cb11e87b8969c8625833fa99
--- tst_main_treatment_vitals/test.py	(.../test.py)	(revision 1cfccd279dba94f4d844e875964b50b91f4ac18d)
+++ tst_main_treatment_vitals/test.py	(.../test.py)	(revision cd99a82bc00592c2cb11e87b8969c8625833fa99)
@@ -20,6 +20,7 @@
 from dialin.ui.hd_simulator import HDSimulator
 from dialin.common.hd_defs import  PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates
 from time import strftime
+from dialin.ui.utils import waitForGUI
 
 hd_simulator = HDSimulator()
 
@@ -396,13 +397,26 @@
     
     test.startSection("verification of heparin dispensing rate values")   
     test.compare(waitForObject(names.o_PreTreatmentCreate_heparinDispensingRate_SliderCreateTreatment).label, config.HEPARIN_DISPENSING_RATE, "Parameter should be -> "+str(config.HEPARIN_DISPENSING_RATE))
-    test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinDispensingRateSlider_Slider, 0.0, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_dispensing_rate"], config.HEPARIN_DISPENSING_RATE)
+    utils.waitForGUI(1)
+    test.compare(waitForObject(names.o_PreTreatmentCreate_OFF_Text).text,"OFF", "Text should be -> "+"OFF")
+    mouseClick(names.o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch)
+    mouseClick(names.o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch)
+    utils.waitForGUI(1)
+    
+    test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinDispensingRateSlider_Slider, 0.2, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_dispensing_rate"], config.HEPARIN_DISPENSING_RATE)
       
     test.endSection()
     
     test.startSection("verification of heparin bolus volume values")    
     test.compare(waitForObject(names.o_PreTreatmentCreate_heparinBolusVolume_SliderCreateTreatment).label, config.HEPARIN_BOLUS_VOLUME, "Parameter should be -> "+str(config.HEPARIN_BOLUS_VOLUME))
-    test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinBolusVolumeSlider_Slider, 0.0, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_bolus_volume"], config.HEPARIN_BOLUS_VOLUME)
+    utils.waitForGUI(1)
+#     if (waitForObject(names.o_PreTreatmentCreate_Rectangle)).visible == true:
+    test.compare(waitForObject(names.o_PreTreatmentCreate_OFF_Text).text,"OFF", "Text should be -> "+"OFF")
+    mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch)
+    mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch)
+    utils.waitForGUI(1)
+
+    test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinBolusVolumeSlider_Slider, 0.2, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_bolus_volume"], config.HEPARIN_BOLUS_VOLUME)
     
     test.endSection()
 
@@ -624,7 +638,7 @@
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
     mouseClick(waitForObject(names.o_input_patient_id))
     type(waitForObject(names.o_input_patient_id), "abcd")
-    mouseClick(waitForObject(names.o_confirm_button))
+    mouseClick(waitForObject(names.o_continue_button))
     verify_create_custom_treatment_parameter()
     verify_request_continue_mode()
        
@@ -744,17 +758,17 @@
     hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                       rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                       treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)
-    
+      
     hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration=0, max_treatment_duration=480,
                                         min_uf_volume=0.0, max_uf_volume=8000.0,
                                         min_dialysate_flow_rate=100, max_dialysate_flow_rate=600) 
-    
-    verify_vitals_pop_up_automatic_close_functionality()
       
+    verify_vitals_pop_up_automatic_close_functionality()
+        
     utils.waitForGUI(1)
     open_vitals_pop_up()
     verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_120, dia_val=DIASTOLIC_PRESSSURE_80, heart_rate=HEART_RATE_VAL_101, save=True)
-      
+        
     utils.waitForGUI(1)
     open_vitals_pop_up()
     verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_120,input_field=names.o_pop_up_systolic_input_field, vital=config.SYSTOLIC_TEXT)
@@ -778,11 +792,11 @@
     verify_ranges_of_vital(vital_parameter=config.SYSTOLIC_TEXT)
     verify_ranges_of_vital(vital_parameter=config.DIASTOLIC_TEXT)
     verify_ranges_of_vital(vital_parameter=config.HEART_RATE_TITLE)
-   
+      
     verify_the_color_of_out_of_range(vital_parameter=config.SYSTOLIC_TEXT)
     verify_the_color_of_out_of_range(vital_parameter=config.DIASTOLIC_TEXT)
     verify_the_color_of_out_of_range(vital_parameter=config.HEART_RATE_TITLE)
-         
+          
     verify_interval_for_bpm()
     
     utils.tstDone()