diff --git a/tests/aaf/certservice/cert-service-test.robot b/tests/aaf/certservice/cert-service-test.robot
index aa2691a..daaa07c 100644
--- a/tests/aaf/certservice/cert-service-test.robot
+++ b/tests/aaf/certservice/cert-service-test.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation     Run healthcheck
+Documentation     AAF test case scenarios
 Library 	      RequestsLibrary
 Resource          ./resources/cert-service-keywords.robot
 
@@ -20,7 +20,7 @@
 
 AAF Cert Service API Send Valid CSR and Valid PK
     [Tags]      AAF-CERT-SERVICE
-    [Documentation]  Send request to /v1/certificate/test endpoint and expect 200
+    [Documentation]  Send request to ${CERT_PATH} endpoint and expect 200
     Send Get Request with Header And Validate Response  ${CERT_PATH}  ${VALID_CSR_FILE}  ${VALID_PK_FILE}  200
 
 AAF Cert Service API Send Valid CSR and Valid PK to Wrong Path
@@ -30,15 +30,15 @@
 
 AAF Cert Service API Send Request without Header
     [Tags]      AAF-CERT-SERVICE
-    [Documentation]  Send request to /v1/certificate/ endpoint and expect 400
+    [Documentation]  Send request without header to ${CERT_PATH} endpoint and expect 400
     Send Get Request And Validate Response  ${CERT_PATH}  400
 
 AAF Cert Service API Send Invalid CSR and Valid PK
     [Tags]      AAF-CERT-SERVICE
-    [Documentation]  Send request to /v1/certificate/test endpoint and expect 400
+    [Documentation]  Send request to ${CERT_PATH} endpoint and expect 400
     Send Get Request with Header And Validate Response  ${CERT_PATH}  ${INVALID_CSR_FILE}  ${VALID_PK_FILE}  400
 
 AAF Cert Service API Send Valid CSR and Invalid PK
     [Tags]      AAF-CERT-SERVICE
-    [Documentation]  Send request to /v1/certificate/test endpoint and expect 400
-    Send Get Request with Header And Validate Response  ${CERT_PATH}  ${VALID_CSR_FILE}  ${INVALID_PK_FILE}  400
\ No newline at end of file
+    [Documentation]  Send request to ${CERT_PATH} endpoint and expect 400
+    Send Get Request with Header And Validate Response  ${CERT_PATH}  ${VALID_CSR_FILE}  ${INVALID_PK_FILE}  400
diff --git a/tests/aaf/certservice/resources/cert-service-properties.robot b/tests/aaf/certservice/resources/cert-service-properties.robot
index e911133..1049695 100644
--- a/tests/aaf/certservice/resources/cert-service-properties.robot
+++ b/tests/aaf/certservice/resources/cert-service-properties.robot
@@ -1,7 +1,7 @@
 *** Variables ***
 
 ${AAFCERT_URL}                           http://%{AAFCERT_IP}:8080
-${CAName}                                test
+${CAName}                                TEST
 ${CERT_PATH}                             /v1/certificate/${CAName}
 ${VALID_CSR_FILE}                        %{WORKSPACE}/tests/aaf/certservice/assets/valid.csr
 ${VALID_PK_FILE}                         %{WORKSPACE}/tests/aaf/certservice/assets/valid.key