Index: tst_pre_treatment_disposables/test.py
===================================================================
diff -u -rbf9e892d9c9505efbebcf7eceb714a1a9143d2f3 -r3002a441527d3a164aa29ee0546201bd1c8c3198
--- tst_pre_treatment_disposables/test.py	(.../test.py)	(revision bf9e892d9c9505efbebcf7eceb714a1a9143d2f3)
+++ tst_pre_treatment_disposables/test.py	(.../test.py)	(revision 3002a441527d3a164aa29ee0546201bd1c8c3198)
@@ -31,10 +31,10 @@
 CARTRIDGE_CONNECTION = 2
 HEPARIN_SYRINGE = 3
 SALINE_BAG = 4
-NUM_OF_CARTRIDGE_INSTALLATION_SCREENS = 4
-NUM_OF_CARTRIDGE_CONNECTION_SCREENS = 5
-NUM_OF_HEPARIN_SYRINGE_SCREENS = 1
-NUM_OF_SALINE_BAG_SCREENS = 2
+NUM_OF_CARTRIDGE_INSTALLATION_SCREENS = 5
+NUM_OF_CARTRIDGE_CONNECTION_SCREENS = 6
+NUM_OF_HEPARIN_SYRINGE_SCREENS = 2
+NUM_OF_SALINE_BAG_SCREENS = 3
 CARTRIDGE_INSTALLATION_TEXT = "Open the front panel door."
 CARTRIDGE_CONNECTION_TEXT = "Connect the cartridge blood lines to the dialyzer."
 HEPARIN_SYRINGE_TEXT = "Fill a syringe with heparin and connect the cartridge heparin tubing line. \nInsert syringe into infusion pump housing."
@@ -232,7 +232,7 @@
         @param condition - (bool) True/False
     """
     test.startSection("Verifying the availability 'CONFIRM' button verify the status of the same")
-    if object.exists(names.o_confirm_button_text):
+    if object.exists(names.o_next_button_text):
         test.compare(str(waitForObjectExists(names.o_confirm_button_text).text), config.CONFIRM_BUTTON_TEXT,"'CONFIRM' button text should be {}".format(config.CONFIRM_BUTTON_TEXT))
         if condition:
             test.compare(waitForObjectExists(names.o_confirm_button_text).enabled , condition, "'CONFIRM' button should be enabled")
@@ -370,13 +370,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()
 
@@ -387,7 +395,7 @@
     test.startSection("verification of heparin stop time values")     
     test.compare(waitForObject(names.o_PreTreatmentCreate_heparinStopTime_SliderCreateTreatment).label, config.HEPARIN_STOP_TIME, "Parameter should be -> "+str(config.HEPARIN_STOP_TIME))
     test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinStopTimeSlider_Slider, 230, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_stop_time"], config.HEPARIN_STOP_TIME)
-   
+        
     test.endSection()
     
     test.startSection("verification of saline bolus values")     
@@ -514,7 +522,7 @@
     slider_buffer = slider_parameter[1]
     width_buffer = slider_parameter[2]
     slider_width = ((value - minimum_slider_value)/slider_buffer) * width_buffer
-    utils.waitForGUI(0.3)
+    utils.waitForGUI(0.2)
     mouseClick(findObject(slider_object), float(slider_width) , 3, Qt.LeftButton)
     test.compare(waitForObjectExists(slider_object).value, value, str(parameter)+" slider value should set to"+str(value))     
 
@@ -528,7 +536,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()
     # navigation for pre-treatment screens