diff --git a/gui/gui_test/server_config/test_obmc_gui_network_settings.robot b/gui/gui_test/server_config/test_obmc_gui_network_settings.robot
index 45916ed..74f7f6b 100644
--- a/gui/gui_test/server_config/test_obmc_gui_network_settings.robot
+++ b/gui/gui_test/server_config/test_obmc_gui_network_settings.robot
@@ -89,6 +89,7 @@
     [Documentation]  Verify default gateway text input allowed from "network
     ...  settings".
     [Tags]  Verify_Default_Gateway_Editable
+    [Teardown]  Click Element  ${xpath_refresh_button}
 
     Wait Until Page Contains Element  ${xpath_default_gateway_input}
     Input Text  ${xpath_default_gateway_input}  10.6.6.7
@@ -98,14 +99,16 @@
     [Documentation]  Verify MAC address text input allowed from "network
     ...  settings".
     [Tags]  Verify_MAC_Address_Editable
+    [Teardown]  Click Element  ${xpath_refresh_button}
 
-    Wait Until Page Contains Element  ${xpath_mac_address_input}
+    Wait Until Element Is Enabled  ${xpath_mac_address_input}
     Input Text  ${xpath_mac_address_input}  AA:E2:84:14:28:79
 
 
 Verify Static IP Address Editable
     [Documentation]  Verify static IP address is editable.
     [Tags]  Verify_Static_IP_Address_Editable
+    [Teardown]  Click Element  ${xpath_refresh_button}
 
     ${exists}=  Run Keyword And Return Status  Wait Until Page Contains Element  ${xpath_static_input_ip0}
     Run Keyword If  '${exists}' == '${False}'
@@ -200,7 +203,8 @@
     [Tags]  Configure_And_Verify_Invalid_DNS_Server
     [Template]  Add DNS Server And Verify
     [Setup]  DNS Test Setup Execution
-    [Teardown]  DNS Test Teardown Execution
+    [Teardown]  Run Keywords  Click Element  ${xpath_refresh_button}
+    ...  AND  DNS Test Teardown Execution
 
     # invalid_ address      expected_status
     ${string_value}         Invalid format
@@ -223,6 +227,7 @@
 Configure Invalid Network Address And Verify
     [Documentation]  Configure invalid network address And verify.
     [Arguments]  ${locator}  ${invalid_address}  ${expected_error}=Invalid format
+    [Teardown]  Click Element  ${xpath_refresh_button}
 
     # Description of the argument(s):
     # locator            Xpath to identify an HTML element on a web page.
@@ -239,7 +244,7 @@
 
 Add DNS Server And Verify
     [Documentation]  Add DNS server on BMC and verify it via BMC CLI.
-    [Arguments]  ${static_name_servers}   ${expected_status}= Valid format
+    [Arguments]  ${static_name_servers}   ${expected_status}=Valid format
 
     # Description of the argument(s):
     # static_name_servers  A list of static name server IPs to be