diff --git a/interconnectedTestCases/SOL003/IC_TC_Keywords.robot b/interconnectedTestCases/SOL003/IC_TC_Keywords.robot
index f5d446e02625de5ec09639cda6db9b6c41045498..dc1a1404f025add4682fd62da2d7173a3c933aaa 100644
--- a/interconnectedTestCases/SOL003/IC_TC_Keywords.robot
+++ b/interconnectedTestCases/SOL003/IC_TC_Keywords.robot
@@ -26,7 +26,7 @@ GET Individual VNF Package
     ...    Test title: GET Individual VNF Package
     ...    Test objective: The objective is to test the retrieval of an individual VNF package information perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ POST Create a new vnfInstance
     ...    Test title: POST Create a new vnfInstance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNF instance created
@@ -54,7 +54,7 @@ GET information about multiple VNF instances
     ...    Test title: GET information about multiple VNF instances
     ...    Test objective: The objective is to query information about multiple VNF instances
     ...    Pre-conditions:    none
-    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ Get Information about an individual VNF Instance
     ...    Test title: Get Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ DELETE Individual VNFInstance
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to delete a VNF instance
     ...    Pre-conditions: the VNF instance resource is existing
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNFInstance deleted
@@ -94,7 +94,7 @@ PATCH Individual VNFInstance
     ...    Test title: PATCH Individual VNFInstance
     ...    Test objective: This method modifies an individual VNF instance resource
     ...    Pre-conditions: an existing VNF instance resource
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: VNFInstance modified
@@ -107,7 +107,7 @@ Instantiate a vnfInstance
     ...    Test title: Post Instantiate Individual VNFInstance
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: VNF instance resource is in NOT INSTANTIATED state
-    ...    Reference: Clause 5.4.4.4.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.4.4.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -121,7 +121,7 @@ VNF Instantiation
     ...    Test title: VNF Instantiation workflow
     ...    Test objective: The objective is to test the workflow for the instantiation of a VNF instance
     ...    Pre-conditions: VNF instance resources is already created. NFVO is subscribed to VNF LCM Operation Occurrence notifications 
-    ...    Reference: Clause 5.4.4 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.4 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability:  NFVO is able to receive notifications from VNFM
     ...    Post-Conditions: VNF instance in INSTANTIATED state
@@ -139,7 +139,7 @@ POST Terminate a vnfInstance
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ Terminate a VNF Instance
     ...    Test title: Terminate a VNF Instance
     ...    Test objective: The objective is to terminate a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state 
-    ...    Reference: Clause 5.3.3 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.3.3 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. 
     ...    Post-Conditions: VNF instance in NOT_INSTANTIATED state 
@@ -171,7 +171,7 @@ GET status information about multiple VNF LCM Operation OCC
     ...    Test title: GET status information about multiple VNF LCM Operation OCC
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -184,7 +184,7 @@ Get Individual VNF LCM Operation occurrence
     ...    Test title: Get Individual VNF LCM Operation occurrences
     ...    Test objective: The objective is to test that this method retrieve information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -198,7 +198,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The POST method creates a new subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -211,7 +211,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -224,7 +224,7 @@ GET Individual Subscription
     ...    Test title: GET Individual Subscription
     ...    Test objective: The objective is to test the Get individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -232,12 +232,35 @@ GET Individual Subscription
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    Subscription
 
+VNF LCM Operation Occurrence Notification
+    [Documentation]    Test ID: 7.3.1.36.1
+    ...    Test title: VNF LCM Operation Occurrence Notification
+    ...    Test objective: The objective is to test that the POST request triggers VNF LCM Operation Occurrence Notification.
+    ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Post VNF LCM Operation Occurrence Notification
+    Check HTTP Response Status Code Is    204
+
+Test the Notification Endpoint - Successful
+    [Documentation]    Test ID: 7.3.1.36.4
+    ...    Test title: Test the Notification Endpoint - Successful
+    ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
+    ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
+    ...    Reference: Clause 5.4.20.3.2 - ETSI GS NFV-SOL 003 [1] v5.2.1
+    ...    Config ID: Config_prod_Notif_Endpoint
+    ...    Applicability: none
+    ...    Post-Conditions: none 
+    Get reach the notification endpoint
+    Check HTTP Response Status Code Is    204
 DELETE an individual subscription
     [Documentation]    Test ID: 7.3.1.18.5
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that the individual subscription is succesfully deleted
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Subscription deleted from VNFM
@@ -263,12 +286,20 @@ VNF Instance Scale Out
     Check Operation Notification For    COMPLETED
     Check Postcondition VNF    SCALE_OUT
 
+VNF Instance Scale Out - will fail
+    Send VNF Scale Out Request
+    Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location 
+    Check Operation Occurrence Id existence
+    Check Operation Notification For    STARTING
+    Check Operation Notification For    PROCESSING
+
 Post Retry operation task
     [Documentation]    Test ID: 7.3.1.13.1
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if the operation is in FAILED_TEMP state
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILEDGET status information about multiple VNF LCM Operation OCC_TEMP" state.
-    ...    Reference: Clause 5.4.14.4.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.14.4.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -282,7 +313,7 @@ Post Rollback operation task
     ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method initiates rollback on a VNF lifecycle operation
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -334,6 +365,14 @@ VNF Change External Connectivity
     Check Operation Notification For    COMPLETED
     Check Postcondition VNF Change Ext Connectivity
 
+VNF Change External Connectivity - will fail
+    Send Change Ext Connectivity Request
+    Check HTTP Response Status Code Is    202
+    Check HTTP Response Header Contains    Location 
+    Check Operation Occurrence Id existence
+    Check Operation Notification For    STARTING
+    Check Operation Notification For    PROCESSING
+
 Send Change Ext Connectivity Request
     Log    Trying to change the external connectivity of a VNF instance.
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -867,6 +906,17 @@ Send VNF Scale Out Request
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}
 
+Send VNF Scale Out Request - will fail
+    Log    Trying to scale a vnf Instance
+    Set Headers    {"Accept":"${ACCEPT}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}  
+    ${template}=    Get File    jsons/scaleVnfRequest.json
+    ${body}=        Format String   ${template}     scaletype=${scaleOutType}    scaleAspectId=${scaleAspectId}
+    Post    ${VNFM_API_ROOT}/${VNFM_API_NAME}/${VNFM_API_MAJOR_VERSION}/vnf_instances/${vnfid}/scale    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+
 Send VNF Scale In Request
     Log    Trying to scale a vnf Instance
     Set Headers    {"Accept":"${ACCEPT}"}
@@ -914,10 +964,21 @@ Check operation resource state is FAILED_TEMP
     ${outputResponse}=    Output    response
     ${state}=    Set Variable    ${outputResponse['body']['instantiationState']}
     Log    Current operation state: ${state}
-    Run Keyword If    "${state}" != "FAILED_TEMP"    
+    Run Keyword If    "${state}" != "FAILED_TEMP"  
     ...    Pass Execution If    True    Skipping test: Operation state must be FAILED_TEMP but found ${state}
     Log    Operation resource state is FAILED_TEMP as expected
 
+Check VNF LCM operation is failed
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Sleep    10s
+    Get    ${VNFM_API_ROOT}/${VNFM_API_NAME}/${VNFM_API_MAJOR_VERSION}/vnf_lcm_op_occs/${globalVnfLcmOpOccId}
+    ${outputResponse}=    Output    response
+    ${state}=    Set Variable    ${outputResponse['body']['instantiationState']}
+    Log    Current operation state: ${state}
+    Run Keyword If    "${state}" != "FAILED_TEMP" and "${state}" != "FAILED"
+    ...    Pass Execution If    True    Skipping test: Operation state must be failed but found ${state}
+    Log    Operation resource state is failed as expected
+
 Post Retry operation
     Log    Retry a VNF lifecycle operation if that operation has experienced a temporary failure
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -932,4 +993,26 @@ Post Rollback operation
     Log    Execute Query and validate response
     Post     ${VNFM_API_ROOT}/${VNFM_API_NAME}/${VNFM_API_MAJOR_VERSION}/vnf_lcm_op_occs/${globalVnfLcmOpOccId}/rollback
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}
\ No newline at end of file
+	Set Global Variable    ${response}    ${outputResponse}
+
+Post VNF LCM Operation Occurrence Notification
+    log    Trying to perform a POST to get notification
+    Set Headers  {"Accept":"${ACCEPT}"}
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Log  Creating mock request and response to handle POST operation on notification endpoint
+    ${req1}=    Configure Notification Forward    VnfLcmOpOccs    ${callback_endpoint}    ${callback_endpoint_fwd}
+    ${req2}=    Configure Notification Status Handler    ${callback_endpoint_fwd}    ${notificationStatus}
+	Log    Verify notification endpoint is tested
+    Wait Until Keyword Succeeds    30 sec   3 sec   Verify Mock Expectation    ${req2}
+    Clear Requests    ${callback_endpoint}
+    Clear Requests    ${callback_endpoint_fwd}
+
+GET reach the notification endpoint  
+    Log    Trying to reach the notification endpoint using GET method.
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${callback_uri}:${callback_port}/${callback_endpoint}
+    ${outputResponse}=    Output    response
+    Set Global Variable    ${response}    ${outputResponse}    
+    
\ No newline at end of file
diff --git a/interconnectedTestCases/SOL003/SubscriptionCreationAndNotification.robot b/interconnectedTestCases/SOL003/SubscriptionCreationAndNotification.robot
new file mode 100644
index 0000000000000000000000000000000000000000..519ca19a1901e1e76357a458b961f7a26c8578c8
--- /dev/null
+++ b/interconnectedTestCases/SOL003/SubscriptionCreationAndNotification.robot
@@ -0,0 +1,22 @@
+*** Settings ***
+Resource        environment/variables.txt
+Resource        IC_TC_Keywords.robot
+Library         JSONLibrary
+
+*** Test Cases ***
+
+Create a new subscription and verify notification is generated
+        [Documentation]         Test ID: 11.3.1.15.1
+        ...     Test title: Create a new subscription and verify notification is generated
+        ...     Test objective: The objective is to test the interconnected case of subscription resource creation and validation of generation of notification based on the issued filter
+        ...     Pre-conditions: None
+        ...     Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
+        ...     Config ID: Config_prod_NFVO, Config_prod_VNFM
+        ...     Applicability: None
+        ...     Post-conditions: None
+        GET Individual VNF Package
+        POST Create a new subscription
+        GET Subscriptions
+        GET Individual Subscription
+        VNF LCM Operation Occurrence Notification
+        Test the Notification Endpoint - Successful
\ No newline at end of file
diff --git a/interconnectedTestCases/SOL003/SubscriptionCreationAndQuery.robot b/interconnectedTestCases/SOL003/SubscriptionCreationAndQuery.robot
index 171cfcd9cda856bf4b71458e0884e48ea64541f2..8c8b7fb7fb1489ffa0447e4f8c7e96d3ad78beda 100644
--- a/interconnectedTestCases/SOL003/SubscriptionCreationAndQuery.robot
+++ b/interconnectedTestCases/SOL003/SubscriptionCreationAndQuery.robot
@@ -10,7 +10,7 @@ Create a new subscription and query information about multiple and individual su
         ...     Test title: Create a new subscription and query information about multiple and individual subscription resources
         ...     Test objective: The objective is to test the interconnected case of subscription resource creation and query multiple and individual resources
         ...     Pre-conditions: None
-        ...     Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+        ...     Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
         ...     Config ID: Config_prod_NFVO, Config_prod_VNFM
         ...     Applicability: None
         ...     Post-conditions: None
diff --git a/interconnectedTestCases/SOL003/SubscriptionDeletion.robot b/interconnectedTestCases/SOL003/SubscriptionDeletion.robot
index 0e08107bdc6b540ee9c01411090f4f3afb60615a..96a3efb0df660e54fd2bd8b751a5a6dc7be881c2 100644
--- a/interconnectedTestCases/SOL003/SubscriptionDeletion.robot
+++ b/interconnectedTestCases/SOL003/SubscriptionDeletion.robot
@@ -10,7 +10,7 @@ Delete individual subscription
     ...    Test title: Delete individual subscription
     ...    Test objective: The objective is to test the interconnected case of subscription resource creation and deletion
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: Subscription deleted from VNFM
diff --git a/interconnectedTestCases/SOL003/VNFInstanceChangeExtConn.robot b/interconnectedTestCases/SOL003/VNFInstanceChangeExtConn.robot
index a71426f5d0f1704feaa55672c90d0f3aabede7a8..3bb4b4e1fa23994b3593c076e3c5f6554549af98 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceChangeExtConn.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceChangeExtConn.robot
@@ -11,7 +11,7 @@ VNF instance Change External Connectivity
     ...    Test title: VNF instance Change External Connectivity
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation, instantiation and change external connectivity
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceCreationAndQuery.robot b/interconnectedTestCases/SOL003/VNFInstanceCreationAndQuery.robot
index 07924995a14b0e4f60bdafc8ef0d51921952859d..8a9dc00847e79b207bb4b99af6ce896df4fdb905 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceCreationAndQuery.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceCreationAndQuery.robot
@@ -10,7 +10,7 @@ Create a new VNF instance resource and query information about multiple and indi
         ...     Test title: Create a new VNF instance resource and query information about multiple and individual VNF instance
         ...     Test objective: The objective is to test the interconnected case of VNF instance resource creation and query multiple and individual resources
         ...     Pre-conditions: None
-        ...     Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+        ...     Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
         ...     Config ID: Config_prod_NFVO, Config_prod_VNFM
         ...     Applicability: None
         ...     Post-conditions: None
diff --git a/interconnectedTestCases/SOL003/VNFInstanceDeletion.robot b/interconnectedTestCases/SOL003/VNFInstanceDeletion.robot
index 498f33f56057d92713e2bd8cfacf1654910531a5..9d37254e2d258e54fd6a30fbf7e6544126f197c5 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceDeletion.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceDeletion.robot
@@ -11,7 +11,7 @@ Delete an individual VNF instance
     ...    Test title: Delete an individual VNF instance
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation and deletion
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceHeal.robot b/interconnectedTestCases/SOL003/VNFInstanceHeal.robot
index a9defc733f2c00f36efd8ef67015258c1f7a14c7..3f486ed9723b9085185870139f6b4c60353f4c0e 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceHeal.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceHeal.robot
@@ -11,7 +11,7 @@ Heal a VNF instance
     ...    Test title: Heal a VNF instance
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation, instantiation and heal
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceInstantiation.robot b/interconnectedTestCases/SOL003/VNFInstanceInstantiation.robot
index 923a642d95a4843f77f11b3c47008f767d70c009..604cf3c145f807306b0740eb0ec579120cdbfad2 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceInstantiation.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceInstantiation.robot
@@ -11,7 +11,7 @@ Instantiate a VNF instance
     ...    Test title: Instantiate a VNF instance
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation and instantiation
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceModification.robot b/interconnectedTestCases/SOL003/VNFInstanceModification.robot
index d722c03fb25e90b746e01919f08aa64b5fa9df55..6700f99b02339da3b5ed95b911b198b37c1e916b 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceModification.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceModification.robot
@@ -9,7 +9,7 @@ Modify an individual VNF instance resource
     ...    Test title: Modify an individual VNF instance resource
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation and modification
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceOperationOccurrences.robot b/interconnectedTestCases/SOL003/VNFInstanceOperationOccurrences.robot
index 565eafa47eff232e005ca4f0158e6fadf4dbb37b..a4ca0e7f2e715a1781293edb709340d4b28c16e9 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceOperationOccurrences.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceOperationOccurrences.robot
@@ -11,7 +11,7 @@ Retrieve VNF instance Operation Occurrences
     ...    Test title: Retrieve VNF instance Operation Occurrences
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation, instantiation and retrieval of information about VNF lifecycle management operation occurrences
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceScaleIn.robot b/interconnectedTestCases/SOL003/VNFInstanceScaleIn.robot
index b69969743054f3a0495cf623d0a5cd8e9a272fc6..f9915aa662639329f409f9e68863016925798a2c 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceScaleIn.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceScaleIn.robot
@@ -11,11 +11,12 @@ Scale In a VNF instance
     ...    Test title: Scale In a VNF instance
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation, instantiation and scale in
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET Individual VNF Package
     POST Create a new vnfInstance
     VNF Instantiation
+    GET information about multiple VNF instances
     VNF Instance Scale In
diff --git a/interconnectedTestCases/SOL003/VNFInstanceScaleOut.robot b/interconnectedTestCases/SOL003/VNFInstanceScaleOut.robot
index c330565f9f500cc9fb0088d9be08fdc1354e7e12..c249f561c94b8fa36a263d2d8efee1e2cd121559 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceScaleOut.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceScaleOut.robot
@@ -11,7 +11,7 @@ Scale Out a VNF instance
     ...    Test title: Scale Out a VNF instance
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation, instantiation and scale out
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFInstanceTermination.robot b/interconnectedTestCases/SOL003/VNFInstanceTermination.robot
index a0013a94fdc62c2b415c69b38fe93fee0eb84be5..652946b33a15a7b62befa5f070f4ddae504b3411 100644
--- a/interconnectedTestCases/SOL003/VNFInstanceTermination.robot
+++ b/interconnectedTestCases/SOL003/VNFInstanceTermination.robot
@@ -11,7 +11,7 @@ Terminate a VNF instance
     ...    Test title: Terminate a VNF instance
     ...    Test objective: The objective is to test the interconnected case of VNF instance resource creation, instantiation and termination
     ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFLCORetryingChangeExtConn.robot b/interconnectedTestCases/SOL003/VNFLCORetryingChangeExtConn.robot
new file mode 100644
index 0000000000000000000000000000000000000000..dabdee0c8e0dd999123f152b68af35680840f0a8
--- /dev/null
+++ b/interconnectedTestCases/SOL003/VNFLCORetryingChangeExtConn.robot
@@ -0,0 +1,23 @@
+*** Settings ***
+Suite Setup       Initialize System
+Suite Teardown    Terminate All Processes    kill=true
+Resource          environment/variables.txt    # Generic Parameters
+Resource          IC_TC_Keywords.robot
+Library           JSONLibrary
+
+*** Test Cases ***
+Retry a VNF Change External Connectivity operation that fails
+    [Documentation]    Test ID: 11.3.1.17.1
+    ...    Test title: Retry a VNF Change External Connectivity operation that fails
+    ...    Test objective: The objective is to test the interconnected case of VNF to retry a VNF Change External Connectivity if the operation fails.
+    ...    Pre-conditions: VNF package includes incorrect or missing parameters to cause failure during operation execution
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
+    ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual VNF Package
+    POST Create a new vnfInstance
+    VNF Instantiation
+    VNF Change External Connectivity - will fail
+    Check VNF LCM operation is failed
+    Post Retry operation task
\ No newline at end of file
diff --git a/interconnectedTestCases/SOL003/VNFLCORetryingFailedTemp.robot b/interconnectedTestCases/SOL003/VNFLCORetryingFailedTemp.robot
index 28294bb360a0e6510ccc7dae0377642a5182b2e2..a78bd1b6c2c48e1d7bc9a06d1eb6b676b7aa718f 100644
--- a/interconnectedTestCases/SOL003/VNFLCORetryingFailedTemp.robot
+++ b/interconnectedTestCases/SOL003/VNFLCORetryingFailedTemp.robot
@@ -6,12 +6,12 @@ Resource          IC_TC_Keywords.robot
 Library           JSONLibrary
 
 *** Test Cases ***
-Test that POST method initiates retrying a VNF lifecycle operation if the operation is in FAILED_TEMP state
+Retry a VNF lifecycle operation if the operation is in FAILED_TEMP state
     [Documentation]    Test ID: 11.3.1.13.1
-    ...    Test title: Test that POST method initiates retrying a VNF lifecycle operation if the operation is in FAILED_TEMP state
+    ...    Test title: Retry a VNF lifecycle operation if the operation is in FAILED_TEMP state
     ...    Test objective: The objective is to test the interconnected case of VNF is to retry a VNF lifecycle operation if the operation is in FAILED_TEMP state.
-    ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Pre-conditions: VNF package includes incorrect or missing parameters to cause failure during operation execution
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFLCORetryingScaleOut.robot b/interconnectedTestCases/SOL003/VNFLCORetryingScaleOut.robot
new file mode 100644
index 0000000000000000000000000000000000000000..9be62a1670e1498bd6fd7b48bfa9f7e347a7d33a
--- /dev/null
+++ b/interconnectedTestCases/SOL003/VNFLCORetryingScaleOut.robot
@@ -0,0 +1,23 @@
+*** Settings ***
+Suite Setup       Initialize System
+Suite Teardown    Terminate All Processes    kill=true
+Resource          environment/variables.txt    # Generic Parameters
+Resource          IC_TC_Keywords.robot
+Library           JSONLibrary
+
+*** Test Cases ***
+Retry a VNF Scale Out operation that fails
+    [Documentation]    Test ID: 11.3.1.16.1
+    ...    Test title: Retry a VNF Scale Out operation that fails
+    ...    Test objective: The objective is to test the interconnected case of VNF to retry a VNF scale out if the operation fails.
+    ...    Pre-conditions: VNF package includes incorrect or missing parameters to cause failure during operation execution
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
+    ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual VNF Package
+    POST Create a new vnfInstance
+    VNF Instantiation
+    VNF Instance Scale Out - will fail
+    Check VNF LCM operation is failed
+    Post Retry operation task
\ No newline at end of file
diff --git a/interconnectedTestCases/SOL003/VNFLCORollback.robot b/interconnectedTestCases/SOL003/VNFLCORollback.robot
index aadedc87f6c8580e7ecfdac64722689d86da8ab8..0704ef492673070ff562f9aab8bcd3038779279f 100644
--- a/interconnectedTestCases/SOL003/VNFLCORollback.robot
+++ b/interconnectedTestCases/SOL003/VNFLCORollback.robot
@@ -6,12 +6,12 @@ Resource          IC_TC_Keywords.robot
 Library           JSONLibrary
 
 *** Test Cases ***
-Test that POST method initiates rollback on a VNF lifecycle operation
+Rollback on a VNF lifecycle instantiation operation
     [Documentation]    Test ID: 11.3.1.14.1
-    ...    Test title: Test that POST method initiates rollback on a VNF lifecycle operation
-    ...    Test objective: The objective is to test the interconnected case of VNF is to rollback a VNF lifecycle operation.
-    ...    Pre-conditions: none
-    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.1.1
+    ...    Test title: Rollback on a VNF lifecycle instantiation operation
+    ...    Test objective: The objective is to test the interconnected case of VNF is to rollback a VNF lifecycle instantiation operation.
+    ...    Pre-conditions: VNF package includes incorrect or missing parameters to cause failure during operation execution
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
     ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/interconnectedTestCases/SOL003/VNFLCORollbackScaleOut.robot b/interconnectedTestCases/SOL003/VNFLCORollbackScaleOut.robot
new file mode 100644
index 0000000000000000000000000000000000000000..a22e97bb48b15a25f9539fcaeb5d626b0631a4f5
--- /dev/null
+++ b/interconnectedTestCases/SOL003/VNFLCORollbackScaleOut.robot
@@ -0,0 +1,23 @@
+*** Settings ***
+Suite Setup       Initialize System
+Suite Teardown    Terminate All Processes    kill=true
+Resource          environment/variables.txt    # Generic Parameters
+Resource          IC_TC_Keywords.robot
+Library           JSONLibrary
+
+*** Test Cases ***
+Rollback on a VNF Scale Out operation
+    [Documentation]    Test ID: 11.3.1.18.1
+    ...    Test title: Rollback on a VNF Scale Out operation
+    ...    Test objective: The objective is to test the interconnected case of VNF is to rollback a VNF Scale Out operation.
+    ...    Pre-conditions: VNF package includes incorrect or missing parameters to cause failure during operation execution
+    ...    Reference: ETSI GS NFV-SOL 003 [1] v5.2.1
+    ...    Config ID: Config_prod_NFVO, Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual VNF Package
+    POST Create a new vnfInstance
+    VNF Instantiation
+    VNF Instance Scale Out - will fail
+    Check VNF LCM operation is failed
+    Post Rollback operation task
\ No newline at end of file
diff --git a/interconnectedTestCases/SOL003/environment/variables.txt b/interconnectedTestCases/SOL003/environment/variables.txt
index f5c7d4664541d5fa08c1b0799c690148e00a688e..da59356cd5f2d9dbebfee858c3c5993bd3a57a2c 100644
--- a/interconnectedTestCases/SOL003/environment/variables.txt
+++ b/interconnectedTestCases/SOL003/environment/variables.txt
@@ -87,6 +87,8 @@ ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
+${callbackResp}    http://localhost:9091/endpoint
+${notificationStatus}    COMPLETED
 ${sleep_interval}    20s
 ${notification_request}    []
 ${notification_response}    []
@@ -107,7 +109,6 @@ ${HEADER_TEST_SUPPORTED}    0
 ${scaleInfo}
 ${element}
 ${aspectId}
-${callbackResp}    localhost
 ${descriptorType}    SOL001
 ${check_descriptors}    1
 #############internal variables used for descriptor parsing################