diff --git a/MEC010p2/MEO/GRANT/Grant.robot b/MEC010p2/MEO/GRANT/Grant.robot
index b83ccff6741c2a7b3911f7cd719b546610b9de90..15f350f64e7e6bf462a6278fd5887cdc8c85ca08 100644
--- a/MEC010p2/MEO/GRANT/Grant.robot
+++ b/MEC010p2/MEO/GRANT/Grant.robot
@@ -9,7 +9,7 @@ Library     OperatingSystem
 
 
 *** Test Cases ***
-TP_MEC_MEC010p2_MEO_GRANT_001_OK
+TC_MEC_MEC010p2_MEO_GRANT_001_OK
     [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_OK
     ...  Check that MEO sends a synchronous grant response when a grant request is requested
     ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
@@ -22,7 +22,7 @@ TP_MEC_MEC010p2_MEO_GRANT_001_OK
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is   Grant
 
-TP_MEC_MEC010p2_MEO_GRANT_001_BR
+TC_MEC_MEC010p2_MEO_GRANT_001_BR
     [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_BR
     ...  Check that MEO responds with an error when it receives a malformed request when a new grant request is performed
     ...  ETSI GS MEC 010-2 2.2.1, clause 7.6.1.3.2
@@ -31,7 +31,7 @@ TP_MEC_MEC010p2_MEO_GRANT_001_BR
     Create a GRANT request    grantBadRequest
     Check HTTP Response Status Code Is    400
 
-TP_MEC_MEC010p2_MEO_GRANT_002_OK
+TC_MEC_MEC010p2_MEO_GRANT_002_OK
     [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_002_OK  
     ...  Check that MEO sends a synchronous grant response when a grant request is requested
     ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
@@ -40,22 +40,12 @@ TP_MEC_MEC010p2_MEO_GRANT_002_OK
     [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
     Create a GRANT request    grantRequest2
     Check HTTP Response Status Code Is    201
+    Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is   Grant
     
 
 
-#TP_MEC_MEC010p2_MEO_GRANT_002_BR TODO clarify TPs before implementing this
-#    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_002_BR
-#    ...  Check that MEO responds with an error when it receives a malformed request when a new grant request is performed
-#    ...  ETSI GS MEC 010-2 2.2.1, clause 7.6.1.3.2
-#    ...  ETSI GS MEC 010-2 2.2.1, Table 6.2.4.4.2-1 (Grant)
-#    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
-#    Create a GRANT request    grantBadRequest2
-#    Check HTTP Response Status Code Is    400
-
-
-
-TP_MEC_MEC010p2_MEO_GRANT_003_OK
+TC_MEC_MEC010p2_MEO_GRANT_003_OK
     [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_003_OK
     ...  Check that MEO sends an asynchronous grant response when a grant request is requested
     ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
@@ -67,17 +57,9 @@ TP_MEC_MEC010p2_MEO_GRANT_003_OK
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
 
-##TODO Fix numbering against success case
-TP_MEC_MEC010p2_MEO_GRANT_003_NF 
-    [Documentation]    TP_MEC_MEO_GRANT_003_NF
-    ...    Check that MEO responds with an error when it receives a request for returning a grant referred with a wrong ID
-    ...    ETSI GS MEC 010-2 2.2.1, clause 7.6.1.3.2
-    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
-    Get an individual grant    ${NOT_EXISTING_GRANT_ID}
-    Check HTTP Response Status Code Is    404
-    
 
-TP_MEC_MEC010p2_MEO_GRANT_004_OK
+
+TC_MEC_MEC010p2_MEO_GRANT_004_OK
     [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_004_OK 
     ...  Check that MEO sends an asynchronous grant response when a grant request is requested
     ...  ETSI GS MEC 010-2 2.2.1, clause 7.5.1.3.1
@@ -89,7 +71,7 @@ TP_MEC_MEC010p2_MEO_GRANT_004_OK
     Check HTTP Response Header Contains    Location
     
 
-TP_MEC_MEC010p2_MEO_GRANT_005_OK
+TC_MEC_MEC010p2_MEO_GRANT_005_OK
     [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_005_OK
     ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
     ...  The process of creating the grant is ongoing, no grant is available yet 
@@ -100,7 +82,7 @@ TP_MEC_MEC010p2_MEO_GRANT_005_OK
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
     
-TP_MEC_MEC010p2_MEO_GRANT_006_OK
+TC_MEC_MEC010p2_MEO_GRANT_006_OK
     [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_OK
     ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
     ...  The process of creating the grant is ongoing, no grant is available yet 
@@ -112,6 +94,14 @@ TP_MEC_MEC010p2_MEO_GRANT_006_OK
     Check HTTP Response Header Contains    Location
     Check HTTP Response Body Json Schema Is   Grant
     
+TC_MEC_MEC010p2_MEO_GRANT_006_NF
+    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_NF
+    ...  Check that MEO responds with an error when it receives 
+    ...  a request for returning a grant referred with a wrong ID
+    ...  ETSI GS MEC 010-2 2.1.1, clause 7.5.2.3.2
+    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
+    Get an individual grant    ${NOT_EXISTING_GRANT_ID}
+    Check HTTP Response Status Code Is    404