diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 2411b8b8bfd53797d801d89fde8d0e68034618d7..00839ae3c07638a942c253964b1daf27c3507bf6 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -15,6 +15,7 @@ Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
 Library    Process
+Library    String
 
 
 *** Keywords ***
@@ -54,9 +55,9 @@ GET VNF Packages with attribute-based filter
 
 Check HTTP Response Body VnfPkgsInfo Matches the requested Attribute-Based Filter
     Log    Checking that attribute-based filter is matched
-    @{attr} =  Split String    ${POS_FILTER}       ,${VAR_SEPERATOR} 
-    @{var_id} = Split String    @{attr}[0]       ,${SEPERATOR}
-    @{var_provider} = Split String    @{attr}[1]       ,${SEPERATOR}
+    @{attr} =    Split String    ${POS_FILTER}       ,${VAR_SEPERATOR} 
+    @{var_id} =    Split String    @{attr}[0]       ,${SEPERATOR}
+    @{var_provider} =    Split String    @{attr}[1]       ,${SEPERATOR}
     Should Be True     "${response['body'][0]['vnfdId']}"=="@{var_id}[1]" and "${response['body'][0]['vnfProvider']}"=="@{var_provider}[1]"
 
 GET VNF Packages with invalid attribute-based filter
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 96abb79122c315ba9a0bad37329b0fa4903bbdf9..c6888eedc1c1e0e7a6c7e221b404990ba01f0048 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -445,6 +445,18 @@ Send PUT Request to upload NSD Content as plain text file in synchronous mode
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
+Check Post Condition NSD Content has been Uploaded
+    Log    Checking NsdOnboardingNotification Recieved
+    Wait Until Keyword Succeeds    ${retry}    ${interval}  Check Response is NsdOnboardingNotification
+
+Check Response is NsdOnboardingNotification
+    ${response}=    Output    response body
+    Should Contain    ${response['headers']['Content-Type']}    application/json
+    ${schema} =    Catenate    SEPARATOR=    NsdOnboardingNotification    .schema.json
+    Validate Json    ${schema}    ${response['body']}
+    Log    Json Schema Validation OK
+
+
 Check Postcondition NSD Content is uploaded and available in the NFVO
     Get single file NSD Content in Plain or Zip Format
     Check HTTP Response Status Code Is    200
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 0461ed7a26e49b840dda0d70afa5bb1109304135..8114b240f97d58c5a2c3a392d1162cd69324f160 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -19,7 +19,7 @@ POST Individual NSInstance - Method not implemented
     ...    Post-Conditions: Check Postcondition NS Instance is not created
     POST IndividualNSInstance
     Check HTTP Response Status Code Is    405
-    Check Postcondition NS Instance is not crerated
+    Check Postcondition NS Instance is not created
 
 GET Information about an individual NS Instance
     [Documentation]    Test ID: 5.3.2.2.2