diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index bbe425897991b040c26be786a06969cbe96ce5dd..ede0ebf4b6f5b61d9aef85bc7a8fe18231e1320b 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -11,7 +11,7 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -64,7 +64,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify individual performace management job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -101,14 +101,29 @@ PATCH Individual VNF Performance Job - Precondition failed
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
     ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
     Send Patch request for individual VNF Performance Job
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
-    Check Postcondition VNF Performance Job is Unmodified (Implicit)    
+    Check Postcondition VNF Performance Job is Unmodified (Implicit)
+    
+PATCH Individual VNF Performance Job - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.4.2.9
+    ...    Test title: PATCH Individual VNF Performance Job - Unprocessable Entity
+    ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when a request contains syntactically correct data but the data cannot be processed.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: 
+    Send Patch request for individual VNF Performance Job with unprocessable entity
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
+    
 *** Keywords ***
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
@@ -170,6 +185,16 @@ Send Patch request for individual VNF Performance Job
 
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+Send Patch request for individual VNF Performance Job with unprocessable entity
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/PMJobModifications.json
+    ${body}=        Format String   ${template}    callback_uri=${unreachable_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 
 Check Postcondition VNF Performance Job is not Created
     Log    Trying to get a new Pm Job
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 39af0c1aa1cbd321a93f2212d550d4619e382273..9e2ab15ecbd42b41031a077e3aef43ecb390b74f 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -4,6 +4,7 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library           OperatingSystem
+Library           String
 
 *** Test Cases ***
 GET Individual Threshold
@@ -11,7 +12,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +26,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +39,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -51,7 +52,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -64,7 +65,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
     ...    Pre-conditions: A VNF instance is instantiated
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +77,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +89,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -101,7 +102,7 @@ PATCH Individual Threshold - Precondition failed
     ...    Test title: PATCH Individual Threshold - Preconition failed
     ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
@@ -109,6 +110,21 @@ PATCH Individual Threshold - Precondition failed
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
     Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
+    
+PATCH Individual Threshold - Unprocessible Entity
+    [Documentation]    Test ID: 7.3.4.5.9
+    ...    Test title: PATCH Individual Threshold - Unprocessible Entity 
+    ...    Test objective: The objective is to test that PATCH method cannot modify an individual threshold resource when a request contains syntactically correct data but the data cannot be processed.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Patch request for individual VNF Performance Threshold with unprocessable entity
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
+
 *** Keywords ***
 GET Individual VNF Performance Threshold
     Log    Trying to get a Threhsold present in the VNFM
@@ -167,6 +183,17 @@ Send Patch request for individual VNF Performance Threshold
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+Send Patch request for individual VNF Performance Threshold with unprocessable entity
+    Log    Trying to PATCH threshold
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/ThresholdModifications.json
+    ${body}=        Format String   ${template}    callback_uri=${unreachable_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 
 Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
     Log    Check postconidtion threshold not modified
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index be4b8957f467bba6432e18bf745d5a1893e5ed77..dcd4710146ec9e267462cd62449dc1dcb6bfcc13 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -13,7 +13,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -69,7 +69,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -122,7 +122,7 @@ Create new VNF Performance Monitoring Job
     ...    Test title:  Create a new VNF Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -136,7 +136,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -148,7 +148,7 @@ PATCH all VNF Performance Monitoring Jobs - (Method not implemented)
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -160,7 +160,7 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ GET all VNF Performance Monitoring Jobs as Paged Response
     ...    Test title: GET all VNF Performance Monitoring Jobs as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs as Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test title: GET VNF Performance Monitoring Jobs - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -199,7 +199,7 @@ GET all VNF Performance Monitoring Jobs with fields and exclude_default attribut
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields and exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields and exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of fields and exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -208,6 +208,19 @@ GET all VNF Performance Monitoring Jobs with fields and exclude_default attribut
     Check HTTP Response Body Json Schema Is   PmJobs
     Check HTTP Response Body PmJobs Matches the requested fields selector
     
+POST Create new VNF Performance Monitoring Job - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.4.1.16
+    ...    Test title: POST Create new VNF Performance Monitoring Job - Unprocessable Entity
+    ...    Test objective:  The objective is to test the creation of a new VNF performance monitoring job fails when a request contains syntactically correct data but the data cannot be processed.
+    ...    Pre-conditions: none
+    ...    Reference: clause 6.4.2.3.1 - ETSI GS NFV-SOL 003 [1] V3.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request for VNF Performance Monitoring Job with unprocessable entity
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails 
+
 *** Keywords ***
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
@@ -407,4 +420,15 @@ Check HTTP Response Body Json Schema Is
     
 Check LINK in Header
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
-    Should Not Be Empty    ${linkURL}
\ No newline at end of file
+    Should Not Be Empty    ${linkURL}
+    
+Send Post Request for VNF Performance Monitoring Job with unprocessable entity
+    Log    trying to create a new PM Job
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/CreatePmJobRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${unreachable_callback_uri}:${callback_port}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index efcc68988ceafd735f308212439f96361b1fd140..191540a1d3dc2bf2657e638a9f84d8890b75e7b9 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -12,7 +12,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -79,7 +79,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNF.
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF performance thresholds are not deleted by the failed operation
@@ -116,7 +116,7 @@ GET All Performance Thresholds as Paged Response
     ...    Test title: GET All Performance Thresholds as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds as a Paged Response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,13 +129,27 @@ GET Performance Thresholds - Bad Request Response too Big
     ...    Test title: GET Performance Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 003 [1] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET all Performance Thresholds
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
+    
+POST create new Performance Threshold - Unprocessable Entity
+    [Documentation]    Test ID: 7.3.4.4.11
+    ...    Test title:  POST create new Performance Threshold - Unprocessable Entity
+    ...    Test objective: The objective is to test that creation of new VNF performance threshold fails when a request contains syntactically correct data but the data cannot be processed.
+    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 003 [1] v3.3.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    Send Post Request Create new Performance Threshold with unprocessable entity
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+    
 *** Keywords ***
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
@@ -179,6 +193,18 @@ Send Post Request Create new Performance Threshold
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${request}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+Send Post Request Create new Performance Threshold with unprocessable entity
+    Log    trying to create a new Threshold
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${template}=    Get File    jsons/CreateThresholdRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${unreachable_callback_uri}:${callback_port}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
diff --git a/SOL003/VNFPerformanceManagement-API/environment/variables.txt b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
index 3b1c0b844d34484a0bbbccabe377243dbc2299ee..0b9801980ccc6de95bc76efa5861887ab4b01d9e 100644
--- a/SOL003/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagement-API/environment/variables.txt
@@ -22,6 +22,7 @@ ${apiName}        vnfpm
 
 ${callback_port}    9091
 ${callback_uri}    http://172.22.1.7:${callback_port}
+${unreachable_callback_uri}    http://not-reachable-uri
 ${callback_endpoint}    /vnfpm/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${sleep_interval}    20s
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json b/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
index 4dbfc7c6c2c64a53700cf453bd2c1b3232442707..c8abf77c85063a88a6cabd17f8f420284acb2f68 100644
--- a/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
+++ b/SOL003/VNFPerformanceManagement-API/jsons/CreatePmJobRequest.json
@@ -5,5 +5,6 @@
 		"performanceMetricGroup": [],
 		"collectionPeriod": 10,
 		"reportingPeriod": 30
-	}}
+	}},
+	"callbackUri": "{callback_uri}"
 }}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json b/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
index c7cfee14f65a08a338ddccdb6f0edeb990e008b3..645c64fda53063b99ad2ff189f297a41a1ac6a20 100644
--- a/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
+++ b/SOL003/VNFPerformanceManagement-API/jsons/CreateThresholdRequest.json
@@ -8,5 +8,6 @@
 			"hysteresis": 50
 		}}
 		
-	}}
+	}},
+	"callbackUri": "{callback_uri}"
 }}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json b/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json
index 799d664bafd8d3876b17968dc3a84ad2ff6daba5..275f942d93c39a77bbe990ea674eb26c8adcd157 100644
--- a/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json
+++ b/SOL003/VNFPerformanceManagement-API/jsons/PmJobModifications.json
@@ -1,3 +1,3 @@
 {
-	"callbackUri":"127.0.0.3"
+	"callbackUri": "{callback_uri}"
 }
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json b/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json
index b3f998b3fca56eccb6867696a5546dce23d6251b..bcd6f00907cfe3660f1f49fae8d4aabc40bab8c8 100644
--- a/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json
+++ b/SOL003/VNFPerformanceManagement-API/jsons/ThresholdModifications.json
@@ -1,3 +1,3 @@
  {
-	"callbackUri":"127.0.0.1"
+	"callbackUri": "{callback_uri}"
 }
\ No newline at end of file