Index: tst_ConfirmPrimingBegin/test.py
===================================================================
diff -u -r63891f4a0b2f174cd10bdd99eb7717158f6fa80b -rc15701755e407fff174072b9a5de3aee4e598b2f
--- tst_ConfirmPrimingBegin/test.py	(.../test.py)	(revision 63891f4a0b2f174cd10bdd99eb7717158f6fa80b)
+++ tst_ConfirmPrimingBegin/test.py	(.../test.py)	(revision c15701755e407fff174072b9a5de3aee4e598b2f)
@@ -101,16 +101,14 @@
         }
         
     test.compare(waitForObjectExists(selected_value_object).visible, True)
-    mouseClick(waitForObject(slider_object), -40, 0, Qt.LeftButton)
+    mouseClick(waitForObject(slider_object), 0, 0, Qt.LeftButton)
 
-    sleep(0.01)
-    test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(0, "mL"))
+    test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(0, "mL"))
     
     mouseClick(waitForObject(slider_object), waitForObjectExists(slider_object).width, 0, Qt.LeftButton)
-    sleep(0.01)
 
-    test.compare(waitForObjectExists(selected_value_object).visible, True)
-    test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(8, "mL"))
+    test.compare(waitForObject(selected_value_object).visible, True)
+    test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(8, "mL"))
 
 def main():
     utils.tstStart(__file__)
Index: tst_CreateTreatment/test.py
===================================================================
diff -u -rd98c5ca0c23aec102058af19bc136d37685177ab -rc15701755e407fff174072b9a5de3aee4e598b2f
--- tst_CreateTreatment/test.py	(.../test.py)	(revision d98c5ca0c23aec102058af19bc136d37685177ab)
+++ tst_CreateTreatment/test.py	(.../test.py)	(revision c15701755e407fff174072b9a5de3aee4e598b2f)
@@ -63,7 +63,7 @@
 
     mouseClick(waitForObject(names.o_create_treatment_button))
     sleep(0.1)
-    test.compare(waitForObjectExists(names.o_create_treatment_flickable).visible, True, "Create treatment page loads")
+    test.compare(waitForObject(names.o_create_treatment_flickable).visible, True, "Create treatment page loads")
 
 def test_parameters_exist():
     """
@@ -145,15 +145,14 @@
         slider_object = {"container": names.o_create_treatment_container, 
                                           "objectName": slider_object_name, 
                                           "type": "Slider" }
-        test.compare(waitForObjectExists(slider_object).visible, True, "Found " + slider_object_name)
+        test.compare(waitForObject(slider_object).visible, True, "Found " + slider_object_name)
         
-        mouseClick(waitForObject(slider_object), waitForObjectExists(slider_object).width / 2, 5, Qt.LeftButton)
-        sleep(0.1)
+        mouseClick(waitForObject(slider_object), waitForObject(slider_object).width / 2, 5, Qt.LeftButton)
         
         mouseDrag(waitForObject(slider_object), 
-                  waitForObjectExists(slider_object).width / 2, 
+                  waitForObject(slider_object).width / 2, 
                   0, 
-                  -35 - waitForObjectExists(slider_object).width / 2, 
+                  -waitForObject(slider_object).width / 2, 
                   0, 
                   Qt.NoModifier, 
                   Qt.LeftButton)
@@ -165,32 +164,28 @@
             "type": "Text"
         }
         
-        test.compare(waitForObjectExists(selected_value_object).visible, True)
-        sleep(0.01)
-        test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["min"], slider_info["units"]))
+        test.compare(waitForObject(selected_value_object).visible, True)
+        test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(slider_info["min"], slider_info["units"]))
+        mouseClick(waitForObject(slider_object), waitForObject(slider_object).width - 2, 0, Qt.LeftButton)
         
-        mouseClick(waitForObject(slider_object), waitForObjectExists(slider_object).width, 0, Qt.LeftButton)
-        sleep(0.01)
-        
         if "LimitsLow" in slider_name:
-            mouseClick(waitForObject(slider_object), -40, 0, Qt.LeftButton)
-            sleep(0.01)
-            test.compare(waitForObjectExists(selected_value_object).visible, True)
-            test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["min"], slider_info["units"]))
+            mouseClick(waitForObject(slider_object), 0, 0, Qt.LeftButton)
+            test.compare(waitForObject(selected_value_object).visible, True)
+            test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(slider_info["min"], slider_info["units"]))
         else:
-            test.compare(waitForObjectExists(selected_value_object).visible, True)
-            test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"]))
+            test.compare(waitForObject(selected_value_object).visible, True)
+            test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"]))
 
 
 def check_button_group(buttons, slider_ranges_key):
     for idx, btn in enumerate(buttons):
     
         mouseClick(waitForObject(btn), 
-                   waitForObjectExists(btn).width / 2, 
-                   waitForObjectExists(btn).height / 2,
+                   waitForObject(btn).width / 2, 
+                   waitForObject(btn).height / 2,
                    Qt.LeftButton)
         
-        test.compare(waitForObjectExists(btn).text.text, slider_ranges[slider_ranges_key][idx])
+        test.compare(waitForObject(btn).text.text, slider_ranges[slider_ranges_key][idx])
 
 def test_rects():
     """
@@ -266,24 +261,18 @@
     """
     flick(waitForObject(names.o_create_treatment_flickable), 0, 700)
     mouseClick(waitForObject(names.o_create_treatment_continue))
-    sleep(1)    
+    sleep(1)
     test.compare(waitForObjectExists(names.o_create_treatment_confirm).visible, True)
 
 def main():
     utils.tstStart(__file__)
     startApplication(names.AUT_NAME + " -q")   
     hd_simulator = HDSimulator()
-    sleep(1)
     test_load_create_treatment()
-    sleep(1)
     test_continue_failure(hd_simulator)
-
-    sleep(1)
     test_parameters_exist()
     test_sliders()
     test_rects()
-   
     test_continue_success(hd_simulator)
-    
     utils.tstDone()