diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 043a73c86dce3356eaa003bff20e959381c202a2..b89cfb101b4f9030240a303bf01ad9b0a130f1e2 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -123,6 +123,7 @@ PATCH Individual Threshold - Unprocessible Entity
     Send Patch request for individual VNF Performance Threshold with Unreachable Callback URI
     Check HTTP Response Status Code Is    422
     Check HTTP Response Body Json Schema Is    ProblemDetails
+    Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
 *** Keywords ***
 GET Individual VNF Performance Threshold
@@ -166,9 +167,6 @@ Send Put request for individual VNF Performance Threshold
     Log    Trying to perform a PUT. This method should not be supported.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
-    ${origOutput}=    Output    response
-    Set Suite Variable    ${origResponse}    ${origOutput}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -190,6 +188,9 @@ Send Patch request for individual VNF Performance Threshold with Unreachable Cal
     Set Headers  {"Accept":"${ACCEPT_JSON}"} 
     Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
     ${template}=    Get File    jsons/ThresholdModification.json
     ${body}=        Format String   ${template}    callback_uri=${unreachable_callback_uri}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}     ${body}
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 46b92cb6690eccc3f707e6f5780f18c82a1162b8..6729e776e0faf0fdbd9f4fcbcde5bcae9edeb5d1 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -310,7 +310,7 @@ Send Post Request Create new VNF Performance Monitoring Job with Unreachable Cal
     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}
+    ${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}
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json b/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json
deleted file mode 100644
index 5986c37f1b2b5a6793620d9536bb55cef425a674..0000000000000000000000000000000000000000
--- a/SOL002/VNFPerformanceManagement-API/jsons/CreatePmJobRequestInvalidURI.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{{
-	"objectInstanceIds" : ["{objectInstanceIds}"],
-	"criteria" : {{
-		"performanceMetric": [],
-		"performanceMetricGroup": [],
-		"collectionPeriod": 10,
-		"reportingPeriod": 30
-	}},
-    "callbackUri": "{callbackUri}"
-}}
\ No newline at end of file