diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index 1da0b75437ff1d6e3d43aad164758c0f694fac55..7deaed7bf032b6f23e3ae9924e7a116a93d6b8f2 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -136,7 +136,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema}=    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index bb0b3f23266ab91179d11f726a66829a594fd246..8e42500c69040d420e51943d1f3ffed25d61c687 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -352,7 +352,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 361cd2374bfb4d620da324493356f639c8e99e02..5267feeab81d580d0a9120c0b087a63936137469 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -112,7 +112,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
\ No newline at end of file
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index fa7bfe6c1f7f6ae9ea584dd4d250993cfb5cb43c..c9c479a4fea15a7088ac6cf8fa2a769936ec8b49 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -192,7 +192,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index 69ea95cd96aa03146936352444899a44f107447e..aab3d6de2a0859ab057f11ac7f8e93fd9a28cedc 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -147,7 +147,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 8d4742c4376602eb2161b6758b0b142ef0558043..8ede0ce56fb3ac16b6ba7c1a2bd8caf8d681e394 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -424,7 +424,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
diff --git a/SOL002/VNFIndicator-API/IndividualSubscription.robot b/SOL002/VNFIndicator-API/IndividualSubscription.robot
index 9ea1314f9adc4d8bd4ed79877f55d57bffded60a..c4f45268bfc4c9e9a82d281154a28609aa68ed49 100644
--- a/SOL002/VNFIndicator-API/IndividualSubscription.robot
+++ b/SOL002/VNFIndicator-API/IndividualSubscription.robot
@@ -168,7 +168,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
index 32c7b0348ccc66629462f74de307656ac2e3ca6a..dc41e3b50765d03a266c3773b832b37a5eeddd93 100644
--- a/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
+++ b/SOL002/VNFIndicator-API/IndividualVNFindicator.robot
@@ -218,7 +218,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index 2fb925c5d93281862327b8c19cf3b05e0bb9060e..2ad0cfb67d08b66e75cdbda4d5f1d45d070de102 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -282,7 +282,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFIndicator-API/VNFIndicators.robot b/SOL002/VNFIndicator-API/VNFIndicators.robot
index 6643bb7981adebea6f48080fbb729756c6fdb922..261791e7b0660af1b72f58342bb6f619f46014c8 100644
--- a/SOL002/VNFIndicator-API/VNFIndicators.robot
+++ b/SOL002/VNFIndicator-API/VNFIndicators.robot
@@ -286,7 +286,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${schema}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${jsonSchema}=    Catenate    SEPARATOR=    ${schema}    .schema.json
     Validate Json    ${jsonSchema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
index 765eafcf6539bf7176170ff2b09dcd12e5c79c09..0287b43b36761ce6fb9022828dfc4d1fe9744fc7 100644
--- a/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
+++ b/SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
@@ -214,7 +214,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index ffbf9fda6c4040a243ab26004f01e693a8471854..2d5e64031085cfe6eed03b3670116de6a02b47de 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -40,6 +40,8 @@ Check Operation Occurrence Id
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index ef1fdb1c23596cdbf09f5771c74d9c1b9902afa7..b5dad77efb2679a4a47b2c73a420ad1ce9037d41 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -241,7 +241,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index b45328fd1e7f7192dfe45ee0fde4ca55b12d62cb..3855e66848576425fb704b359683e501cd3fb954 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -155,7 +155,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index 646e853c2a6906ff7fc82ce2c20be897f8c439aa..8e56dd2e6141b1cedb9526e02dac6b37f44e4819 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -243,7 +243,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 0e1993f3d41bbfdebaf77598f96de39f207d49ef..34b416d7c0ce646c9e8606dfc3db833071fe8e64 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -409,7 +409,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 0360763014b871a8a539e6560344c57af81fcc21..a016b2424bd9af964fc7191b47467575b1d11cf6 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -257,7 +257,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
index a5e14818d05d7daa5e00898a6c7d2df4211ad173..f986bff12f6497972bca0a9d7cb236be1f662a43 100644
--- a/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
+++ b/SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
@@ -271,7 +271,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index 408350d106a7ca489f4d3f084b606135e2ccde1a..f57e2d0a79d6bca6a54233c94d9895f09da137ae 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -63,6 +63,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
index 23c3a6a774cf762128ba01d6ab0522510ce1f0d5..5163cc9af5cf49607ec488899f6d2a4934f0c418 100644
--- a/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
+++ b/SOL003/VNFIndicator-API/VNFIndicatorsKeywords.robot
@@ -172,7 +172,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 9b76a7912a0d9439e09c7a30fcede74ab2429500..b7c038f32aa8684f2d1a704d369e455446d8b0d6 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -42,6 +42,8 @@ Check Operation Occurrence Id existence
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=   ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 24cd2bb5c5847758b1aaf41e265bddf6b216d4da..a23355984290306134aad413e8aaa372e03aa55f 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -166,6 +166,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index 3fa55f01f8195e68733794d890c0946e7f42668d..a097a2cffa1c97a94976934d359b3a8165259980 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -162,6 +162,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     
diff --git a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index bad2ad8b028b13c863f5a6f2d861f0e3c0be6772..725c3a02d13f1b794f790055dbd6b740f461f255 100644
--- a/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -652,7 +652,8 @@ Check HTTP Response Status Code Is
 
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
index 02b8a81c9fbbc10e73ef477151a7e2e6eeac2aaa..038559a01edcda205faa9e1ceb93931739b2bc9a 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -265,7 +265,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}	.schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
index 12259bfe207df2f14b3ac5ffe1721a1348e0299f..9e7c5b73e89c14d490879a9a87e4d9c099f93e33 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualReport.robot
@@ -143,7 +143,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
index 878485dfe96b1d0cd7d34cf3bc08ce698f20a160..fd7ab02a5936eb5a10601f398e63bcfc3164219d 100644
--- a/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -255,7 +255,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VNFPerformanceManagement-API/PMJobs.robot b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
index d8bca91e540b877690da6f5108c78b82a82e1c3f..9c863b890541bdbbaa1baf9f22bbc91a3b0d7537 100644
--- a/SOL003/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL003/VNFPerformanceManagement-API/PMJobs.robot
@@ -472,7 +472,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VNFPerformanceManagement-API/Thresholds.robot b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
index e59f8a7971a93114d2febb3f61b892d9b3a1468e..a5a5c27922d76583d599f65fafcbd7d28124fe22 100644
--- a/SOL003/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL003/VNFPerformanceManagement-API/Thresholds.robot
@@ -278,7 +278,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index 4a9e77183be457f1bd2060d3c578cbfcaf9f4afd..27d3cca022646e980217406e1fcfac8eca75fc7d 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -34,6 +34,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 9eeb0abdf133493d30ca936305f2531cc75bf080..874ec1a0af8c7a27f1892c935e07de828818b61f 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -866,7 +866,8 @@ Check HTTP Response Status Code Is
         
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Log     ${response['body']}
     Validate Json    ${schema}    ${response['body']}
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 2c9daa406b99ae1aebbe3e9bf513c4463f9795ca..1d142a8251ab5764cea1d5a869cecd1614e3bf33 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -35,6 +35,8 @@ Check HTTP Response Header Contains
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index de60b0830c29da5e799bf363e1a02fa059526d66..6e4e578854cf9773bb39589dbff99ebf4d98b512 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -219,6 +219,8 @@ Check Individual NS LCM operation occurrence operationState is
   
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 245f8488233b43b8d6edfa0aea3e4605a9a89958..ab2bbddea4d83ccf90db028710b0fa90f98b9f60 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -586,7 +586,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK  
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 6e0976a6c4004297b3c0d77d8eab3961bbb224a4..1a81bdcf0855e383e143172676bcc8ae8ef0b459 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -984,7 +984,8 @@ Check HTTP Response Status Code Is
     
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
+    Run Keyword If    '${input}' == 'ProblemDetails'    Should Contain    ${response['headers']['Content-Type']}    application/problem+json
+    ...    ELSE    Should Contain    ${response['headers']['Content-Type']}    application/json
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
     Validate Json    ${schema}    ${response['body']}
     Log    Json Schema Validation OK