diff --git a/doc/testing/testplan/api_discover_service/README.md b/doc/testing/testplan/api_discover_service/README.md
index 5d89b90bff47c30dd0f452d343b5f90f9151a784..983756985056781638d66a5383e17274fddc8639 100644
--- a/doc/testing/testplan/api_discover_service/README.md
+++ b/doc/testing/testplan/api_discover_service/README.md
@@ -7,13 +7,13 @@ At this documentation you will have all information and related files and exampl
 
 **Description**:
 
-  This test case will check if NetApp (Invoker) can discover published service APIs.
+  This test case will check if Network App (Invoker) can discover published service APIs.
 
 **Pre-Conditions**:
 
   * Service APIs are published.
-  * NetApp was registered previously
-  * NetApp was onboarded previously with {onboardingId}
+  * Network App was registered previously
+  * Network App was onboarded previously with {onboardingId}
 
 **Execution Steps**:
 
@@ -167,13 +167,13 @@ At this documentation you will have all information and related files and exampl
 
 **Description**:
 
-  This test case will check if NetApp (Invoker) can discover published service APIs.
+  This test case will check if Network App (Invoker) can discover published service APIs.
 
 **Pre-Conditions**:
 
   * At least 2 Service APIs are published.
-  * NetApp was registered previously
-  * NetApp was onboarded previously with {onboardingId}
+  * Network App was registered previously
+  * Network App was onboarded previously with {onboardingId}
 
 **Execution Steps**:
 
@@ -228,13 +228,13 @@ At this documentation you will have all information and related files and exampl
 
 **Description**:
 
-  This test case will check if NetApp (Invoker) can discover published service APIs.
+  This test case will check if Network App (Invoker) can discover published service APIs.
 
 **Pre-Conditions**:
 
   * At least 2 Service APIs are published.
-  * NetApp was registered previously
-  * NetApp was onboarded previously with {onboardingId}
+  * Network App was registered previously
+  * Network App was onboarded previously with {onboardingId}
 
 **Execution Steps**:
 
@@ -292,13 +292,13 @@ At this documentation you will have all information and related files and exampl
 
 **Description**:
 
-  This test case will check if NetApp (Invoker) can discover published service APIs.
+  This test case will check if Network App (Invoker) can discover published service APIs.
 
 **Pre-Conditions**:
 
   * 2 Service APIs are published.
-  * NetApp was registered previously
-  * NetApp was onboarded previously with {onboardingId}
+  * Network App was registered previously
+  * Network App was onboarded previously with {onboardingId}
 
 **Execution Steps**:
 
diff --git a/doc/testing/testplan/api_invoker_management/README.md b/doc/testing/testplan/api_invoker_management/README.md
index 4b511906ecf67484191ffd587930e8a1d7399e96..50227871e1d39fc4a4773b18efa8400f504e7650 100644
--- a/doc/testing/testplan/api_invoker_management/README.md
+++ b/doc/testing/testplan/api_invoker_management/README.md
@@ -15,6 +15,12 @@ At this documentation you will have all information and related files and exampl
   * NetApp was not onboarded previously
   * ***Preconditions: The administrator must have previously registered the User.***
 
+**Execution Steps**:
+
+  1. Retrieve access_token by User from register
+  2. Onboard Invoker at CCF
+  3. Store signed Certificate
+
 **Information of Test**:
 
   1. Create public and private key at invoker
@@ -31,12 +37,6 @@ At this documentation you will have all information and related files and exampl
      * "onboardingInformation"->"apiInvokerPublicKey": must contain public key generated by Invoker.
      * Send in Authorization Header the Bearer access_token obtained previously (Authorization:Bearer ${access_token})
 
-**Execution Steps**:
-
-  1. Retrieve access_token by User from register
-  2. Onboard Invoker at CCF
-  3. Store signed Certificate
-
 **Expected Result**:
 
   1. Response to Onboard request must accomplish:
@@ -60,6 +60,13 @@ At this documentation you will have all information and related files and exampl
   * NetApp was registered previously
   * NetApp was onboarded previously
 
+**Execution Steps**:
+
+  1. Register NetApp at CCF
+  2. Onboard NetApp at CCF
+  3. Store signed Certificate at NetApp
+  4. Onboard Again the NetApp at CCF
+
 **Information of Test**:
 
   1. Perform [Invoker Onboarding]
@@ -70,13 +77,6 @@ At this documentation you will have all information and related files and exampl
      * "onboardingInformation"->"apiInvokerPublicKey": must contain public key generated by Invoker.
      * Send in Authorization Header the Bearer access_token obtained previously (Authorization:Bearer ${access_token})
 
-**Execution Steps**:
-
-  1. Register NetApp at CCF
-  2. Onboard NetApp at CCF
-  3. Store signed Certificate at NetApp
-  4. Onboard Again the NetApp at CCF
-
 **Expected Result**:
 
   1. Response to Onboard request must accomplish:
@@ -107,6 +107,13 @@ At this documentation you will have all information and related files and exampl
   * NetApp was registered previously
   * NetApp was onboarded previously with {onboardingId}
 
+**Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Store signed Certificate
+  4. Update Onboarding Information at CCF with a minor change on "notificationDestination"
+
 **Information of Test**:
 
   1. Perform [Invoker Onboarding]
@@ -116,13 +123,6 @@ At this documentation you will have all information and related files and exampl
      * Reference Request Body is: [put invoker onboarding body]
        * "notificationDestination": "*http://host.docker.internal:8086/netapp_new_callback*",
 
-**Execution Steps**:
-
-  1. Register Invoker at CCF
-  2. Onboard Invoker at CCF
-  3. Store signed Certificate
-  4. Update Onboarding Information at CCF with a minor change on "notificationDestination"
-
 **Expected Result**:
 
   1. Response to Onboard request must accomplish:
@@ -149,6 +149,12 @@ At this documentation you will have all information and related files and exampl
   * NetApp was registered previously
   * NetApp was not onboarded previously
 
+**Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Update Onboarding Information at CCF of not onboarded
+
 **Information of Test**:
 
   1. Perform [Invoker Onboarding]
@@ -157,12 +163,6 @@ At this documentation you will have all information and related files and exampl
      * Send **PUT** to **https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{INVOKER_NOT_REGISTERED}**
      * Reference Request Body is: [put invoker onboarding body]
 
-**Execution Steps**:
-
-  1. Register Invoker at CCF
-  2. Onboard Invoker at CCF
-  3. Update Onboarding Information at CCF of not onboarded
-
 **Expected Result**:
 
   1. Response to Onboard request must accomplish:
@@ -176,7 +176,6 @@ At this documentation you will have all information and related files and exampl
         * cause with message "Not exist NetappID".
 
 
-
 ## Test Case 5: Offboard NetApp
 
 **Test ID**: ***capif_api_invoker_management-5***
@@ -190,6 +189,12 @@ At this documentation you will have all information and related files and exampl
   * NetApp was registered previously
   * NetApp was onboarded previously
 
+**Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Offboard Invoker at CCF
+
 **Information of Test**:
 
   1. Perform [Invoker Onboarding]
@@ -197,12 +202,6 @@ At this documentation you will have all information and related files and exampl
   2. Offboard:
      * Send **DELETE** to **https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{onboardingId}**
 
-**Execution Steps**:
-
-  1. Register Invoker at CCF
-  2. Onboard Invoker at CCF
-  3. Offboard Invoker at CCF
-
 **Expected Result**:
 
   1. Response to Onboard request must accomplish:
@@ -224,6 +223,11 @@ At this documentation you will have all information and related files and exampl
   * NetApp was registered previously
   * NetApp was not onboarded previously
 
+**Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Offboard Invoker at CCF
+
 **Information of Test**:
 
   1. Perform [Invoker Onboarding]
@@ -231,11 +235,6 @@ At this documentation you will have all information and related files and exampl
   2. Offboard:
      * Send **DELETE** to **https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{INVOKER_NOT_REGISTERED}**
 
-**Execution Steps**:
-
-  1. Register Invoker at CCF
-  2. Offboard Invoker at CCF
-
 **Expected Result**:
 
   1. Response to Offboard Request (DELETE) must contain:
@@ -259,6 +258,14 @@ At this documentation you will have all information and related files and exampl
   * NetApp was registered previously
   * NetApp was onboarded previously with {onboardingId} and {public_key_1}
 
+**Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Store signed Certificate
+  4. Update Onboarding Information at CCF with new public key
+  5. Update Onboarding Information at CCF with minor change
+
 **Information of Test**:
 
   1. Perform [Invoker Onboarding] with public_key_1.
@@ -277,14 +284,6 @@ At this documentation you will have all information and related files and exampl
        * "notificationDestination": "*http://host.docker.internal:8086/netapp_new_callback*",
      * Use new **Invoker Certificate**
 
-**Execution Steps**:
-
-  1. Register Invoker at CCF
-  2. Onboard Invoker at CCF
-  3. Store signed Certificate
-  4. Update Onboarding Information at CCF with new public key
-  5. Update Onboarding Information at CCF with minor change
-
 **Expected Result**:
 
   1. Response to Onboard request must accomplish:
@@ -302,7 +301,6 @@ At this documentation you will have all information and related files and exampl
 
 
 
-
 [invoker onboarding body]: ./invoker_details_post_example.json  "API Invoker Request"
 [user_getauth_response_body_example]: ../common_operations/user_getauth_response_body_example.json  "User GetAuth response Body Example"
 [put register body]: ./invoker_details_put_example.json  "API Invoker Update Request"