diff --git a/gui/test/users/test_obmc_gui_manage_user.robot b/gui/test/users/test_obmc_gui_manage_user.robot
index 894b95d..63d0240 100644
--- a/gui/test/users/test_obmc_gui_manage_user.robot
+++ b/gui/test/users/test_obmc_gui_manage_user.robot
@@ -5,9 +5,8 @@
 
 Resource        ../../lib/resource.robot
 
-Suite Setup     Launch Browser And Login OpenBMC GUI
-Suite Teardown  Close Browser
 Test Setup      Test Setup Execution
+Test Teardown   Close Browser
 
 
 *** Variables ***
@@ -41,11 +40,10 @@
                               ...     Delete=/div[5]/button[2]
 
 
-
 *** Test Cases ***
 
 Verify Existence Of All Section In User Page
-    [Documentation]  Verify existence of all sections in user page..
+    [Documentation]  Verify existence of all sections in user page.
     [Tags]  Verify_Existence_Of_All_Section_In_User_Page
 
     Page should contain  User account properties
@@ -83,31 +81,34 @@
     Page Should Contain Element  ${xpath_edit_button}
     Page Should Contain Element  ${xpath_delete_button}
 
+
 Verify Error When Duplicate User Is Created
     [Documentation]  Verify error when duplicate user is created.
     [Tags]  Verify_Error_When_Duplicate_User_Is_Created
-    [Setup]  Delete Given Users
+    [Setup]  Run Keywords  Test Setup Execution  AND  Delete Given Users
 
     Add Or Modify User  root  &{user_password}[root]  action=add_dup
 
+
 Delete User And Verify
     [Documentation]  Delete user and verify.
     [Tags]  Delete_User_And_Verify
-    [Setup]  Delete Given Users
+    [Setup]  Run Keywords  Test Setup Execution  AND  Delete Given Users
 
     Add Or Modify User  testUser1  &{user_password}[testUser1]
     Delete Given Users  delete_user=testUser1
     Page Should Not Contain  testUser1
 
+
 Verify Invalid Password Error
     [Documentation]  Verify the error message when user logs in with invalid password.
     [Tags]  Verify_Invalid_Password_Error
-    [Setup]  Delete Given Users
-    [Teardown]  Login OpenBMC GUI
+    [Setup]  Run Keywords  Test Setup Execution  AND  Delete Given Users
 
     LogOut OpenBMC GUI
     Login And Verify Message  root  &{user_invalid_password}[root]  Invalid username or password
 
+
 Edit And Verify User Property
     [Documentation]  Edit and verify the user property.
     [Tags]  Edit_And_Verify_User_Property
@@ -119,11 +120,13 @@
     ${user_role}=  Get User Property Value  testUser1  Role
     Should Be Equal  ${user_role}  Callback
 
+
 *** Keywords ***
 
 Test Setup Execution
-   [Documentation]  Do test case setup tasks.
+    [Documentation]  Do test case setup tasks.
 
+    Launch Browser And Login OpenBMC GUI
     Click Button  ${xpath_select_users}
     Sleep  2s
     Wait Until Page Contains Element  ${xpath_select_manage_users}
@@ -201,13 +204,13 @@
    \    Run Keyword And Return If  '${user}' == '${username}'  Get Text  ${xpath_property}
 
 Login And Verify Message
-   [Documentation]  Verifies the error message displayed on screen while logging in.
-   [Arguments]  ${username}  ${password}  ${msg}
+    [Documentation]  Verifies the error message displayed on screen while logging in.
+    [Arguments]  ${username}  ${password}  ${msg}
 
-   # Description of argument(s):
-   # username  BMC Username.
-   # password  BMC Password.
-   # msg       Message which is expected to be found on login page after login attempt.
+    # Description of argument(s):
+    # username  BMC Username.
+    # password  BMC Password.
+    # msg       Message which is expected to be found on login page after login attempt.
 
     Input Text  ${xpath_textbox_username}  ${username}
     Input Password  ${xpath_textbox_password}  ${password}
@@ -221,7 +224,7 @@
    # Description of argument(s):
    # username   BMC Username.
    # password   BMC Password.
-   # user_role  The user role to be assigned ("administrator", "user", "operator", "callback").
+   # user_role  The user role to be assigned ("Administrator", "User", "Operator", "Callback").
 
    # Maximum user limit is 15. Hence iterating only 15 times.
    :FOR  ${row_num}  IN RANGE  1  ${max_num_users+1}