Index: shared/scripts/names.py
===================================================================
diff -u -r87ee9356d9ed8a0908be46622ddcced2cdc2d5a8 -r19462c9c0edce2ac5ed5130f5c81321684942a48
--- shared/scripts/names.py	(.../names.py)	(revision 87ee9356d9ed8a0908be46622ddcced2cdc2d5a8)
+++ shared/scripts/names.py	(.../names.py)	(revision 19462c9c0edce2ac5ed5130f5c81321684942a48)
@@ -462,7 +462,7 @@
 o_confirm_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "text": "Confirm Treatment", "type": "Text", "unnamed": 1, "visible": True}
 o_prescription_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "ConfirmTreatmentTable_prescription", "type": "Text", "visible": True}
 o_input_patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}
-o_confirm_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
+o_continue_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True}
 o_back_button_confirm_treatment = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
 
 o_headerRect_Rectangle = {"container": o_Overlay, "id": "_headerRect", "type": "Rectangle", "unnamed": 1, "visible": True}
@@ -632,6 +632,14 @@
 o_PreTreatmentBase_swipeview_SwipeView_3 = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
 o_skip_button = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True}
 
+o_PreTreatmentCreateStack_PreTreatmentCreateStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentCreateStack", "type": "PreTreatmentCreateStack", "visible": True}
+o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate", "visible": True}
+o_interval_obj = {"container":o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Rectangle", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_heparinDispensingRateSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateSwitch", "type": "Switch", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch = {"checkable": True, "container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeSwitch", "type": "Switch", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_OFF_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentCreate_OFF_Text_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "occurrence": 2, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
 #instructions for rinseback setup
 o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack", "visible": True}
 o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackInit", "type": "EndTreatmentRinsebackInit", "visible": True}
Index: tst_instructions_poc/test.py
===================================================================
diff -u -r20ef0b22dacadabdc0c496c3e7e73657e06ed3b1 -r19462c9c0edce2ac5ed5130f5c81321684942a48
--- tst_instructions_poc/test.py	(.../test.py)	(revision 20ef0b22dacadabdc0c496c3e7e73657e06ed3b1)
+++ tst_instructions_poc/test.py	(.../test.py)	(revision 19462c9c0edce2ac5ed5130f5c81321684942a48)
@@ -159,13 +159,21 @@
     
     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))
+    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.8, 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, 1.3, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_bolus_volume"], config.HEPARIN_BOLUS_VOLUME)
+    mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch)
+    mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch)
+    utils.waitForGUI(1)    
+    test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinBolusVolumeSlider_Slider, 1.4, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_bolus_volume"], config.HEPARIN_BOLUS_VOLUME)
     
     test.endSection()
 
@@ -333,7 +341,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()
     test.endSection()