Index: suite_leahi/tst_service_institutional/test.py
===================================================================
diff -u -re71b29e10fac2e872849aa1e7a1796f4ae383cea -r38ffd49d6364e5d840795e1df6b4f312d57816e6
--- suite_leahi/tst_service_institutional/test.py	(.../test.py)	(revision e71b29e10fac2e872849aa1e7a1796f4ae383cea)
+++ suite_leahi/tst_service_institutional/test.py	(.../test.py)	(revision 38ffd49d6364e5d840795e1df6b4f312d57816e6)
@@ -704,35 +704,34 @@
     main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000)
     mouseClick(utility.findChildByText(main_menu_container, config.PRESCRIPTIONS))
     mouseClick(utility.findChildByText(main_menu_container, config.TREATMENT))
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) 
     td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value)
     td_simulator.td_blood_set_auto_load_response(vRejectionReason = 0)
     navigation.navigation_pageIndicator_step(config.CREATERX)
-    mouseClick(waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry, 2000))
-    waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry, 2000).text ="1234"
-    mouseClick(waitForObjectExists(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 2000))
-    parent_obj = waitForObjectExists(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 2000)
-    default_value = utility.findObjectById(parent_obj, "_text")
+    mouseClick(utility.get_object_from_names(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry))
+    utility.get_object_from_names(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry, 3000).text ="1234"
+    parent_obj = waitForObject(names.o_PreTreatmentCreate_leftColumn_Column, 3000)
+    blood_flow_rate = utility.findObjectById(parent_obj, "_bloodFlowRate")
+    blood_flow_rate_value = utility.findObjectById(blood_flow_rate, "_valueAdjuster")
+    mouseClick(blood_flow_rate_value)    
+    default_value = utility.findObjectById(blood_flow_rate_value, "_text")
     test.compare(
         str(default_value.text), 
         str(INSTITUTIONAL_CONFIGURATIONS_BLOOD_FLOW_CUSTOM_VALUES[BLOOD_FLOW_RATE_DEF]), 
         "Comparison of Default Blood Flow Value",
     )
-    utility.set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 100)
-    left_arrow = findObject(names.o_PreTreatmentCreate_leftArrow_IconButton)
+    utility.set_value_based_on_target(blood_flow_rate, 100)
+    left_arrow = utility.findObjectById(blood_flow_rate, "_leftArrow")
     if not left_arrow.enabled:
-        parent_obj = waitForObjectExists(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 2000)
-        minimum_value = utility.findObjectById(parent_obj, "_text")
+        minimum_value = utility.findObjectById(blood_flow_rate_value, "_text")
         test.compare(
             str(minimum_value.text), 
             str(INSTITUTIONAL_CONFIGURATIONS_BLOOD_FLOW_CUSTOM_VALUES[BLOOD_FLOW_RATE_MIN]), 
             "Comparison of Minimum Blood Flow Value",
         )
-    utility.set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 200)
-    right_arrow = findObject(names.o_PreTreatmentCreate_rightArrow_IconButton)
+    utility.set_value_based_on_target(blood_flow_rate, 200)
+    right_arrow = utility.findObjectById(blood_flow_rate, "_rightArrow")
     if not right_arrow.enabled:
-        parent_obj = waitForObject(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 2000)
-        maxmum_value = utility.findObjectById(parent_obj, "_text")
+        maxmum_value = utility.findObjectById(blood_flow_rate_value, "_text")
         test.compare(
             str(maxmum_value.text), 
             str(INSTITUTIONAL_CONFIGURATIONS_BLOOD_FLOW_CUSTOM_VALUES[BLOOD_FLOW_RATE_MAX]),