diff --git a/gui/obmc_gui/data/resource_variables.py b/gui/obmc_gui/data/resource_variables.py
index c49d8a1..12ee7a7 100644
--- a/gui/obmc_gui/data/resource_variables.py
+++ b/gui/obmc_gui/data/resource_variables.py
@@ -13,6 +13,7 @@
     xpath_textbox_password = "//*[@id='password']"
     xpath_button_login = "//*[@id='login__submit']"
     xpath_button_logout = "//*[@id='header']/a"
+    xpath_yes_button = "//button[text()='Yes']"
     xpath_openbmc_url = "http://localhost:8080/#/login"
     xpath_openbmc_ip = "//*[@id='login__form']/input[1]"
     xpath_display_server_power_status = \
@@ -132,8 +133,6 @@
         "span"
     xpath_individual_event_delete = \
         "//*[@id='event__actions-bar']/div[2]/div[2]/button[1]"
-    xpath_individual_event_delete_yes = \
-        "//*[@id='event__actions-bar']/div[2]/div[1]/div[2]/button[1]"
     xpath_second_event_select = \
         "//*[@id='event-log__events']/log-event[2]/div/div[1]/div[2]/label/" +\
         "span"
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot b/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
index 35af16a..31a69d1 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
+++ b/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
@@ -182,7 +182,7 @@
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Run Keyword If  ${number_of_events} > 0
     ...  Common Event Log Click Element  ${xpath_individual_event_delete}
-    ...  ${xpath_individual_event_delete_yes}
+    ...  ${xpath_yes_button}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Should Be Equal  ${number_of_events}  0
     ...  msg=Failed to delete single error log entry.
@@ -201,7 +201,7 @@
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Run Keyword If  ${number_of_events} > 0
     ...  Double Event Log Click Element  ${xpath_individual_event_delete}
-    ...  ${xpath_individual_event_delete_yes}
+    ...  ${xpath_yes_button}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Should Be Equal  ${number_of_events}  0
     ...  msg=Failed to delete multiple error log entries.
@@ -218,7 +218,7 @@
     Page Should Contain Element  ${xpath_number_of_events}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Run Keyword If  ${number_of_events} > 0
-    ...  Common Event Log Click Element  ${xpath_individual_event_resolved}  0
+    ...  Common Event Log Click Element  ${xpath_individual_event_resolved}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Should Be Equal  ${number_of_events}  1
     ...  msg=Failed to mark single error log entry as resolved.
@@ -236,7 +236,7 @@
     Page Should Contain Element  ${xpath_number_of_events}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Run Keyword If  ${number_of_events} > 0
-    ...  Double Event Log Click Element  ${xpath_individual_event_resolved}  0
+    ...  Double Event Log Click Element  ${xpath_individual_event_resolved}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Should Be Equal  ${number_of_events}  2
     ...  msg=Failed to mark multiple error log entries as resolved.
@@ -253,7 +253,7 @@
     Page Should Contain Element  ${xpath_number_of_events}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Run Keyword If  ${number_of_events} > 0
-    ...  Common Event Log Click Element  ${xpath_individual_event_export}  0
+    ...  Common Event Log Click Element  ${xpath_individual_event_export}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Should Be Equal  ${number_of_events}  1
     ...  msg=Failed to export single error log entry.
@@ -271,7 +271,7 @@
     Page Should Contain Element  ${xpath_number_of_events}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Run Keyword If  ${number_of_events} > 0
-    ...  Double Event Log Click Element  ${xpath_individual_event_export}  0
+    ...  Double Event Log Click Element  ${xpath_individual_event_export}
     ${number_of_events}=  Get Text  ${xpath_number_of_events}
     Should Be Equal  ${number_of_events}  2
     ...  msg=Failed to export multiple error log entries.
@@ -280,7 +280,7 @@
 
 Common Event Log Click Element
    [Documentation]  Keep common click elements associated with event log.
-   [Arguments]  ${action_element}  ${action_click_confirmation}
+   [Arguments]  ${action_element}  ${action_click_confirmation}=${None}
 
     # Description of argument(s):
     # action_element             xpath value of the element to be actioned
@@ -292,14 +292,14 @@
     Page Should Contain Element  ${action_element}
     Click Element  ${action_element}
     Wait Until Page Does Not Contain Element  ${xpath_refresh_circle}
-    Run Keyword If  ${action_click_confirmation} <> 0
+    Run Keyword If  "${action_click_confirmation}" != "${None}"
     ...  Click Element  ${action_click_confirmation}
     Click Element  ${xpath_select_refresh_button}
     Run Key  Sleep \ 50s
 
 Double Event Log Click Element
    [Documentation]  Keep double click elements associated with event logs.
-   [Arguments]  ${action_element}  ${action_click_confirmation}
+   [Arguments]  ${action_element}  ${action_click_confirmation}=${None}
 
     # Description of argument(s):
     # action_element             xpath value of the element to be actioned