Index: suite_leahi/tst_patient_vitals/test.py
===================================================================
diff -u -r30aa33698b5c5b0559841590c4bf0e87f9ccf820 -r773bdca9f28d573177bb59389312e1a24b2f138c
--- suite_leahi/tst_patient_vitals/test.py	(.../test.py)	(revision 30aa33698b5c5b0559841590c4bf0e87f9ccf820)
+++ suite_leahi/tst_patient_vitals/test.py	(.../test.py)	(revision 773bdca9f28d573177bb59389312e1a24b2f138c)
@@ -427,15 +427,18 @@
     test.endSection()   
     
     test.startSection("Verify the vitals interval popup")
-    mouseClick(waitForObject(names.o_treatmentHome_editButton_IconButton))
+    parent_obj  = waitForObject(names.o_treatmentHome_treatmentVitals_TreatmentVitals)
+    edit_button = utility.findObjectById(parent_obj,"_editButton")
+    mouseClick(waitForObject(edit_button))
     #check the title text in the popup
     vitals_titleText = waitForObjectExists(names.o_vitals_Interval_TitleText).text
-    test.compare("Vitals Interval", vitals_titleText, "Vitals Interval popup text should be ->"+str("Vitals Interval"))
+    test.compare("Vitals Settings", vitals_titleText, "Vitals Interval popup text should be ->"+str("Vitals Interval"))
     parent_obj = waitForObject(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom)
     vitals_interval = utility.findObjectById(parent_obj, "_rightArrow")
     mouseClick(vitals_interval)
     # set_value_based_on_target_patientvitals(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom, 5)
     mouseClick(waitForObject(names.o_confirm_button))
+    mouseClick(waitForObject(names.o_vitals_close_btn))
     test.endSection()
     
     test.startSection("Verify the vitals data send automatically populate on popup")
@@ -458,13 +461,18 @@
     test.endSection()
     
     test.startSection("Check the vitals in main treatment screen")
-    mouseClick(waitForObject(names.o_treatmentHome_editButton_IconButton))
+    parent_obj  = waitForObject(names.o_treatmentHome_treatmentVitals_TreatmentVitals)
+    edit_button = utility.findObjectById(parent_obj,"_editButton")
+    mouseClick(waitForObject(edit_button))
     set_value_based_on_target_patientvitals(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom, 30)
     mouseClick(waitForObject(names.o_confirm_button,1000))
+    mouseClick(waitForObject(names.o_vitals_close_btn))
     validate_time_interval(names.o_vitalCountdown_Text,30)
-    mouseClick(waitForObject(names.o_treatmentHome_editButton_IconButton))
+  
+    mouseClick(waitForObject(edit_button))
     set_value_based_on_target_patientvitals(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom, 5)
     mouseClick(waitForObject(names.o_confirm_button,1000))
+    mouseClick(waitForObject(names.o_vitals_close_btn))
     validate_time_interval(names.o_vitalCountdown_Text,5)
     
     test.endSection()