diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index 9aedb63..bc1bfb6 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -7,6 +7,7 @@
 Suite Setup     Launch Browser And Login GUI
 Suite Teardown  Close Browser
 
+Force Tags      GUI_Header
 
 *** Variables ***
 
diff --git a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
index a274e93..a2bf226 100644
--- a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
+++ b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
+Force Tags      Profile_Settings_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
index 31c70c3..1cb457d 100644
--- a/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_inventory_and_leds_sub_menu.robot
@@ -7,6 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Inventory_And_Leds_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
index 9d1b1a2..d55934e 100644
--- a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
@@ -6,6 +6,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Sensors_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot b/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
index 30f0ff0..973538d 100755
--- a/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
+++ b/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
@@ -9,6 +9,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Suite Teardown Execution
 
+Force Tags      Event_Logs_Sub_Menu
 
 *** Variables ***
 ${xpath_event_logs_heading}       //h1[text()="Event logs"]
diff --git a/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot b/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot
index ee05ff9..cae8335 100644
--- a/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot
+++ b/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Progress_Logs_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/notices_menu/test_notices_menu.robot b/gui/gui_test/notices_menu/test_notices_menu.robot
index b2f8424..6d6d0f4 100644
--- a/gui/gui_test/notices_menu/test_notices_menu.robot
+++ b/gui/gui_test/notices_menu/test_notices_menu.robot
@@ -7,6 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Notices_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
index 4013366..051c758 100644
--- a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
@@ -7,6 +7,8 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Firmware_Sub_Menu
+
 *** Variables ***
 
 ${xpath_firmware_heading}                //h1[text()="Firmware"]
diff --git a/gui/gui_test/operations_menu/test_host_console_sub_menu.robot b/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
index 89cc7e2..2184136 100644
--- a/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_host_console_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
+Force Tags      Host_Console_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
index 30fb470..041637f 100644
--- a/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_reboot_bmc_sub_menu.robot
@@ -9,6 +9,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
+Force Tags      Reboot_BMC_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
index 83fce6b..805ee88 100644
--- a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
@@ -8,6 +8,7 @@
 Test Setup      Run Keywords  Launch Browser And Login GUI  AND  Navigate to Server Power Operation Page
 Test Teardown   Close Browser
 
+Force Tags      Server_Power_Operations_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/overview_menu/test_overview_menu.robot b/gui/gui_test/overview_menu/test_overview_menu.robot
index 9d26a86..ab2bc30 100644
--- a/gui/gui_test/overview_menu/test_overview_menu.robot
+++ b/gui/gui_test/overview_menu/test_overview_menu.robot
@@ -13,6 +13,7 @@
 Suite Teardown  Run Keywords  Close Browser  AND  Redfish.Logout
 Test Setup      Test Setup Execution
 
+Force Tags      Overview_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
index d1755b5..f5f4512 100644
--- a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
@@ -9,6 +9,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
+Force Tags      Certificates_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
index b34329d..65971de 100644
--- a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      LDAP_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
index b579d81..546d8f7 100644
--- a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
+++ b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
@@ -8,6 +8,8 @@
 Suite Setup     Suite Setup Execution
 Test Teardown   FFDC On Test Case Fail
 
+Force Tags      Multiple_Interfaces
+
 *** Variables ***
 
 ${bmc_url}                     https://${OPENBMC_HOST}
diff --git a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
index e03b918..109a70f 100644
--- a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
@@ -10,6 +10,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
+Force Tags       Policies_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
index a054bb5..842813b 100644
--- a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
 
+Force Tags      Sessions_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
index c2e52f2..1ddb4c8 100644
--- a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Teardown  Suite Teardown Execution
 Test Setup      Test Setup Execution
 
+Force Tags      User_Management_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
index 38d08e4..7788951 100644
--- a/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_factory_reset_sub_menu.robot
@@ -7,6 +7,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Factory_Reset_Sub_Menu
 
 *** Variables ***
 
@@ -56,4 +57,4 @@
     Click Element  ${xpath_settings_menu}
     Click Element  ${xpath_factory_reset_sub_menu}
     Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  factory-reset
-
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/settings_menu/test_network_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
index a824b5a..a7e800b 100644
--- a/gui/gui_test/settings_menu/test_network_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_network_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
+Force Tags      Network_Sub_Menu
 
 *** Variables ***
 
diff --git a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
index 81d4661..56a9af2 100644
--- a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
@@ -8,6 +8,7 @@
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
+Force Tags       Power_Restore_Policy_Sub_Menu
 
 *** Variables ***