diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index de44cda..4e6e041 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -21,8 +21,8 @@
 @{OPERATOR}       operator_user           TestPwd123
 @{ReadOnly}       readonly_user           TestPwd123
 @{NoAccess}       noaccess_user           TestPwd123
-&{USERS}          Administrator=${ADMIN}  Operator=${OPERATOR}  ReadOnly=${ReadOnly}
-...               NoAccess=${NoAccess}
+# Removing Operator, need to add it back once support is given.
+&{USERS}          Administrator=${ADMIN}  ReadOnly=${ReadOnly}
 ${VMI_BASE_URI}   /ibm/v1/
 
 
@@ -37,13 +37,13 @@
     ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}  ${True}       ${True}    ${HTTP_OK}
 
     # Send CSR request from operator user.
-    operator_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # operator_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Send CSR request from ReadOnly user.
     readonly_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Send CSR request from NoAccess user.
-    noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
 
 Get Root Certificate Using Different Privilege Users Role
@@ -56,13 +56,13 @@
     admin_user     TestPwd123  ${True}       ${True}    ${HTTP_OK}
 
     # Request root certificate from operator user.
-    operator_user  TestPwd123  ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # operator_user  TestPwd123  ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Request root certificate from ReadOnly user.
     readonly_user  TestPwd123  ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Request root certificate from NoAccess user.
-    noaccess_user  TestPwd123  ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # noaccess_user  TestPwd123  ${False}      ${True}    ${HTTP_FORBIDDEN}
 
 
 Send CSR Request When VMI Is Off And Verify
@@ -76,30 +76,32 @@
     ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}  ${True}       ${True}    ${HTTP_SERVICE_UNAVAILABLE}   60
 
     # Send CSR request from operator user.
-    operator_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # operator_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Send CSR request from ReadOnly user.
     readonly_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Send CSR request from NoAccess user.
-    noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+
 
 Get Corrupted CSR Request Signed By VMI And Verify
     [Documentation]  Send corrupted CSR for signing and expect an error.
     [Tags]  Get_Corrupted_CSR_Request_Signed_By_VMI_And_Verify
     [Template]  Get Certificate Signed By VMI
 
-    # username           password             force_create  valid_csr   valid_status_code        read_timeout
-    ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}  ${True}       ${False}    ${HTTP_SERVICE_UNAVAILABLE}    60
+    # username           password             force_create  valid_csr   valid_status_code    read_timeout
+    ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}  ${True}       ${False}    ${HTTP_BAD_REQUEST}  60
 
     # Send CSR request from operator user.
-    operator_user        TestPwd123           ${False}      ${False}    ${HTTP_FORBIDDEN}
+    # operator_user        TestPwd123           ${False}      ${False}    ${HTTP_FORBIDDEN}
 
     # Send CSR request from ReadOnly user.
     readonly_user        TestPwd123           ${False}      ${False}    ${HTTP_FORBIDDEN}
 
     # Send CSR request from NoAccess user.
-    noaccess_user        TestPwd123           ${False}      ${False}    ${HTTP_FORBIDDEN}
+    # noaccess_user        TestPwd123           ${False}      ${False}    ${HTTP_FORBIDDEN}
+
 
 Get Root Certificate When VMI Is Off And Verify
     [Documentation]  Get root certificate when vmi is off and verify.
@@ -112,32 +114,33 @@
     ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}  ${True}       ${True}    ${HTTP_OK}
 
     # Request root certificate from operator user.
-    operator_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # operator_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Request root certificate from ReadOnly user.
     readonly_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Request root certificate from NoAccess user.
-    noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
 
 Get Root Certificate After BMC Reboot And Verify
     [Documentation]  Get root certificate after bmc reboot and verify.
     [Tags]  Get_Root_Certificate_After_BMC_Reboot_And_Verify
-    [Setup]  Run Keywords  OBMC Reboot (off)  AND  Redfish Power On
+    [Setup]  Run Keywords  OBMC Reboot (off)  stack_mode=skip  AND  Redfish Power On
     [Template]  Get Root Certificate
 
     # username            password             force_create  valid_csr  valid_status_code
     ${OPENBMC_USERNAME}   ${OPENBMC_PASSWORD}  ${True}       ${True}    ${HTTP_OK}
 
     # Request root certificate from operator user.
-    operator_user         TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # operator_user         TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Request root certificate from ReadOnly user.
     readonly_user         TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
     # Request root certificate from NoAccess user.
-    noaccess_user         TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+    # noaccess_user         TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
+
 
 Get Concurrent Root Certificate Requests From Multiple Admin Users
     [Documentation]  Get multiple concurrent root certificate requests from multiple admins
@@ -153,6 +156,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Concurrent CSR Requests From Multiple Admin Users
     [Documentation]  Get multiple concurrent csr requests from multiple admins and verify no errors.
     [Tags]  Get_Concurrent_CSR_Requests_From_Multiple_Admin_Users
@@ -167,19 +171,23 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Concurrent Corrupted CSR Requests From Multiple Admin Users
     [Documentation]  Get multiple concurrent corrupted csr requests from multiple admins and verify no errors.
     [Tags]  Get_Concurrent_Corrupted_CSR_Requests_From_Multiple_Admin_Users
 
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
+*** Comment ***
+
 Get Concurrent Root Certificate Request From Operator Users
     [Documentation]  Get multiple concurrent root certificate from non admin users and verify no errors.
     [Tags]  Get_Concurrent_Root_Certificate_Request_From_Operator_Users
@@ -193,6 +201,9 @@
         ...  msg=One or more operations has failed.
     END
 
+
+*** Test Cases ***
+
 Get Concurrent Root Certificate Request From Admin And Non Admin Users
     [Documentation]  Get multiple concurrent root certificate from admin and non admin users
     ...  and verify no errors.
@@ -201,12 +212,14 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Root Certificate ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Root Certificate operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         ...  Get Root Certificate readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
+*** Comment ***
+
 Get Concurrent Root Certificate Request From Different Non Admin Users
     [Documentation]  Get multiple concurrent root certificate from different non admin users
     ...  and verify no errors.
@@ -221,6 +234,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Concurrent CSR Request From Operator Users
     [Documentation]  Get multiple concurrent csr request from non admin users and verify no errors.
     [Tags]  Get_Concurrent_CSR_Request_From_Operator_Users
@@ -234,6 +248,9 @@
         ...  msg=One or more operations has failed.
     END
 
+
+*** Test Cases ***
+
 Get Root Certificate And Send CSR Request Concurrently And Verify
     [Documentation]  Get root certificate and send csr request concurrently and
     ...  verify gets root and signed certificate.
@@ -247,6 +264,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Concurrent Root Certificate And Send CSR Request And Verify
     [Documentation]  Get concurrent root certificate and send csr request
     ...  and verify gets root certificate and signed certificate.
@@ -261,6 +279,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Root Certificate And Send Multiple CSR Requests Concurrently And Verify
     [Documentation]  Get root certificate and send multiple csr requests concurrently and
     ...  verify gets root certificate and signed certificates.
@@ -277,6 +296,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Root Certificate And Send Multiple Corrupted CSR Requests Concurrently And Verify
     [Documentation]  Get root certificate and send multiple corrupted csr requests concurrently and
     ...  verify gets root certificate and error for corrupted csr requests.
@@ -285,13 +305,14 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Root Certificate ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Send Concurrent CSR Request And Corrupted CSR Request And Verify
     [Documentation]  Send concurrent csr request and corrupted csr request
     ...  and verify gets certificate for valid csr and error for corrupted csr.
@@ -301,12 +322,13 @@
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Get Root Certificate Send CSR And Corrupted CSR Request Concurrently And Verify
     [Documentation]  Get root certificate send csr and corrupted csr requests concurrently and
     ...  verify gets root certificate and certificate for valid csr and error for corrupted csr.
@@ -316,12 +338,13 @@
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
         ...  Get Root Certificate ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Send Concurrent CSR Request From Admin And Non Admin Users And Verify
     [Documentation]  Send concurrent csr requests from admin and non-admin users and verify
     ...  admin gets certificate and non-admin gets error.
@@ -330,12 +353,14 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         ...  Get Certificate Signed By VMI readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
+*** Comment ***
+
 Send Concurrent CSR Request From Non Admin Users And Verify
     [Documentation]  Send concurrent csr request from non admin users
     ...  and verify gets error.
@@ -350,6 +375,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Get Root Certificate And Send Corrupted CSR From Admin CSR Request From Operator Concurrently
     [Documentation]  Get root certificate and send corrupted csr request from admin and
     ...  csr from operator concurrently and verify gets root certificate and errors for corrupted
@@ -359,13 +385,14 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Root Certificate ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Get Root Certificate From Operator And Send Corrupted CSR Request And CSR Request From Admin Concurrently
     [Documentation]  Get root certificate from operator and send corrupted csr request
     ...  and csr from admin and verify errors for operator and corrupted csr and signed certificate
@@ -375,8 +402,8 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Root Certificate operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
@@ -398,6 +425,7 @@
         ...  msg=One or more operations has failed.
     END
 
+
 Send CSR Request From Admin And Operator And Corrupted CSR From Admin Concurrently And Verify
     [Documentation]  Send csr request from admin and operator and corrupted
     ...  csr request from admin and verify gets signed certificate for valid csr for admin
@@ -408,11 +436,12 @@
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
         ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Send Corrupted CSR Requests From Admin And Operator And CSR Request From Admin Concurrently And Verify
     [Documentation]  Send corrupted csr request from admin and operator and csr request
     ...  from admin concurrently and verify errors for corrupted csr and gets signed certificate
@@ -421,13 +450,14 @@
 
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${False} ${HTTP_FORBIDDEN}
         ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Send Corrupted CSR Requests From Admin And Operator User Concurrently And Verify
     [Documentation]  Send corrupted csr requests from admin and operator and
     ...  verify gets error.
@@ -435,13 +465,16 @@
 
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${False} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
+*** Test Cases ***
+
 Get Root Certificate From Admin And Send CSR Requests From Non Admin Concurrently And Verify
     [Documentation]  Get root certificate from admin and csr requests from
     ...  non admin users concurrently and verify gets root certificate for admin and
@@ -451,12 +484,12 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Root Certificate ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         ...  Get Certificate Signed By VMI readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Get Root Certificate And Send CSR Requests From Non Admin Users Concurrently And Verify
     [Documentation]  Get root certificate and send csr requests from non admin
     ...  users and verify gets errors.
@@ -464,14 +497,13 @@
 
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
-        ...  Get Root Certificate operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         ...  Get Root Certificate readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         ...  Get Certificate Signed By VMI readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
-        ...  Get Certificate Signed By VMI noaccess_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Send Corrupted CSR Request From Admin And CSR Requests From Non Admin Concurrently And Verify
     [Documentation]  Send corrupted csr request from admin and csr request from non admin
     ...  users concurrently and verify gets errors.
@@ -479,13 +511,13 @@
 
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
-        ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         ...  Get Certificate Signed By VMI readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 Send CSR Request And Corrupted CSR Requests From Non Admin Users Concurrently And Verify
     [Documentation]  Send csr and corrupted csr request from non admin users
     ...  and verify gets errors.
@@ -493,14 +525,15 @@
 
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
-        ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${False} ${HTTP_FORBIDDEN}
         ...  Get Certificate Signed By VMI readonly_user TestPwd123 ${True} ${False} ${HTTP_FORBIDDEN}
-        ...  Get Certificate Signed By VMI noaccess_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         ...  Get Certificate Signed By VMI readonly_user TestPwd123 ${True} ${True} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
+*** Comment ***
+
 Get Root Certificate And Send CSR Requests From Admin And Operator Concurrently And Verify
     [Documentation]  Get root certificate from admin and send csr requests
     ...  from admin and operator concurrently and verify gets root certificate
@@ -526,12 +559,13 @@
     FOR  ${i}  IN RANGE  ${5}
         ${dict}=  Execute Process Multi Keyword  ${5}
         ...  Get Root Certificate ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${True} ${HTTP_OK}
-        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_INTERNAL_SERVER_ERROR}
+        ...  Get Certificate Signed By VMI ${OPENBMC_USERNAME} ${OPENBMC_PASSWORD} ${True} ${False} ${HTTP_BAD_REQUEST}
         ...  Get Certificate Signed By VMI operator_user TestPwd123 ${True} ${False} ${HTTP_FORBIDDEN}
         Dictionary Should Not Contain Value  ${dict}  False
         ...  msg=One or more operations has failed.
     END
 
+
 *** Keywords ***
 
 Generate CSR String