Index: tst_ui_alarms_dialog/test.py
===================================================================
diff -u -reb47b728e03c07a2ecb47a858983bfbbc9ad657e -r12616c1433e07f9fad99a5a5cf5243cf5b38d7a5
--- tst_ui_alarms_dialog/test.py	(.../test.py)	(revision eb47b728e03c07a2ecb47a858983bfbbc9ad657e)
+++ tst_ui_alarms_dialog/test.py	(.../test.py)	(revision 12616c1433e07f9fad99a5a5cf5243cf5b38d7a5)
@@ -151,20 +151,22 @@
                  vButtons == config.ALARM_BUTTONS_END_RESUME_RINSEBACK , 
                  "Button visible [End]")
     
-    obj = waitForObjectExists(names.o_alarm_button_ok) 
+    obj = waitForObjectExists(names.o_ok_button_mouse_area) 
     if obj.visible : mouseClick(obj)
+    utils.waitForGUI(0.5)
         
-    obj = waitForObjectExists(names.o_alarm_button_resume) 
+    obj = waitForObjectExists(names.o_resume_button_mouse_Area) 
     if obj.visible : mouseClick(obj)
-
-    obj = waitForObjectExists(names.o_alarm_button_rinseback) 
+    utils.waitForGUI(0.5)
+    
+    obj = waitForObjectExists(names.o_rinseback_mouse_area) 
     if obj.visible : mouseClick(obj)
+    utils.waitForGUI(0.5)
     
-    obj = waitForObjectExists(names.o_alarm_button_end) 
+    obj = waitForObjectExists(names.o_end_button_mouse_area) 
     if obj.visible : mouseClick(obj)
+    utils.waitForGUI(0.5)
     
-    utils.waitForGUI(1)
-    
     alarm.cmd_alarm_condition_cleared(alarm_id = 1)
 
 def test_all_buttons():
@@ -174,15 +176,15 @@
     @output N/A
     """
     
-    obj = waitForObjectExists(names.o_alarm_button_resume) 
+    obj = waitForObjectExists(names.o_resume_mouse_Area) 
     if  obj.visible : mouseClick(obj)
     test.compare(waitForObjectExists(names.o_alarm_button_resume    ).visible, True ,"Button visible [Resume]")
         
-    obj = waitForObjectExists(names.o_alarm_button_rinseback) 
+    obj = waitForObjectExists(names.o_rinseback_button_mouse_area) 
     if obj.visible : mouseClick(obj)
     test.compare(waitForObjectExists(names.o_alarm_button_rinseback ).visible, True ,"Button visible [RINSEBACK]")
         
-    obj = waitForObjectExists(names.o_alarm_button_end) 
+    obj = waitForObjectExists(names.o_end_mouse_area) 
     if obj.visible : mouseClick(obj)
     test.compare(waitForObjectExists(names.o_alarm_button_end       ).visible, True ,"Button visible [End]")