diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 55611f29f72252d262b7c8e7a6a60e79280ad786..43a4c7ecddb368de5edc55f1927504b5762e487c 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -17,13 +17,13 @@ Post Cancel operation task Not Found
     [Setup]    Check Cancel not supported
 	POST Cancel operation task
 	Check HTTP Response Status Code Is    404
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
 Post Cancel operation task Conflict
     Depends on test failure      Check resource FAILED_TEMP
 	POST Cancel operation task
 	Check HTTP Response Status Code Is    409
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
 PUT Cancel operation task - Method not implemented
     PUT Cancel operation task
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 982f1516d6d5d4f4fda10d3fd821f69e46ab5488..6734bf0787d697a848e11e73ff5593ff0af31916 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -17,13 +17,13 @@ Post Continue operation task Not Found
     [Setup]    Check Continue not supported
 	POST Continue operation task
 	Check HTTP Response Status Code Is    404
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
 Post Continue operation task Conflict
     Depends on test failure  Check resource FAILED_TEMP
 	POST Continue operation task
 	Check HTTP Response Status Code Is    409
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
 PUT Continue operation task - Method not implemented
     PUT Continue operation task
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 3ab66349401c04eb384caf1f5c1af19e13b01a6d..38139f5b3e128edc0a47fa3fa9a80028c7d1f30d 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -12,7 +12,7 @@ NS Instance Creation
     POST New nsInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Body Json Schema Is    NsIdentifierCreationNotification.schema.json
+    Check HTTP Response Body Json Schema Is    NsIdentifierCreationNotification
     Check resource not_instantiated
     
     
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index df8672d1903f087806338c166d86416603cc2fd3..5ef3856c64877179fd31945a452740b85cdff993 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -12,7 +12,7 @@ NS Instance Deletion
     Check resource not_instantiated
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    204
-    Check HTTP Response Body Json Schema Is    NsIdentifierDeletionNotification.schema.json
+    Check HTTP Response Body Json Schema Is    NsIdentifierDeletionNotification
    
     
     
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index eead9b8ec30db666afad2dbdfeccefe3cb80b92f..b86573d3c83c5023af15a5982a07029a932bc513 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -17,13 +17,13 @@ Post Fail operation task Not Found
     [Setup]    Check Fail not supported
 	POST Fail operation task
 	Check HTTP Response Status Code Is    404
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
 Post Fail operation task Conflict
     Depends on test failure      Check resource FAILED_TEMP
 	POST Fail operation task
 	Check HTTP Response Status Code Is    409
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
 PUT Fail operation task - Method not implemented
     PUT Fail operation task
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index 732376dcfd708f62f83c6da840f01b5b2a6b3c99..3a5e3f00927a60056a14235cc8fe5f7d7d3e2ed7 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -18,7 +18,7 @@ Heal a NSInstance Conflict
     POST Heal NSInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Header Contains    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Heal NSInstance- Method not implemented
     GET Heal NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index bcf68fb7cb0e52e2010344c67745b8ea955d85d3..16850e75e4816e4cfedaa02c533c08f6df50e770 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -16,7 +16,7 @@ Get Information about an individual NS Instance
     GET IndividualNSInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    NsInstance.schema.json
+    Check HTTP Response Body Json Schema Is    NsInstance
     
 PUT Individual NSInstance - Method not implemented 
     PUT IndividualNSInstance
@@ -35,4 +35,4 @@ DELETE Individual NSInstance Conflict
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index 3914bee767e2c2950a1e65627cec9c1283ffdafe..b51d2b148442f8ffa8682ad223bb5568e0093767 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -27,7 +27,7 @@ Get stauts information about Individual NS LCM OP OCC
 	GET Individual NS LCN OP Occurence
 	Check HTTP Response Status Code Is    200
 	Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-	Check HTTP Response Body Json Schema Is    NsLcmOpOcc.schema.json
+	Check HTTP Response Body Json Schema Is    NsLcmOpOcc
 
 
 	
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index 5ba45ce767b01aaae6effbc09922a6b198df9613..6d734b9068d1695d7aa5ed37c0d09e897f6bebef 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -16,7 +16,7 @@ Post Individual Subscription - Method not implemented
 Get Information about an individual subscription
     GET Individual subscription
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Body Json Schema Is   subscription.schema.json
+    Check HTTP Response Body Json Schema Is   subscription
 
 PUT an individual subscription - Method not implemented
     PUT Individual Subscription
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index dc474e796ed0a50597926bbd48ea22edd87cfe4f..a297dfe3ce17c05a05728a8611d95eff78a7c775 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -17,8 +17,7 @@ Instantiate a nsInstance Conflict
     [Setup]    Check resource instantiated
     POST Instatiate nsInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Header Contains    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Instantiate NSInstance - Method not implemented
     GET Instantiate NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index efb6445b2830953d116b1e0005d8df12f817a72a..c74944d1f3c10812d226105b9c75bd15be3ac648 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -11,26 +11,22 @@ Create a new NsInstance
     POST New nsInstance
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    NsInstance.schema.json
+    Check HTTP Response Body Json Schema Is    NsInstance
 
 Get information about multiple NS instances  
     GET NsInstances
     Check HTTP Response Status Code Is    200
-    Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    NsInstances.schema.json  
+    Check HTTP Response Body Json Schema Is    NsInstances  
     
 Get information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     GET NsInstance Invalid Attribute-Based filtering parameter
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 Get information about multiple NS instances Bad Request Invalid attribute selector
     GET NsInstance Invalid Attribute Selector
     Check HTTP Response Status Code Is    400
-    Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 PUT NSInstances - Method not implemented
     PUT NSInstances
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 7f9188c29b6623b076d6551f0035adc9d2db58dd..5a15ef38a2ace4e5ee26f63baa526506e84e3cb3 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -26,16 +26,15 @@ DELETE stauts information about multiple NS LCM OP OCC - Method not implemented
 Get stauts information about multiple NS LCM OP OCC   
 	GET NS LCN OP Occurences
 	Check HTTP Response Status Code Is    200
-	Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
-	Check HTTP Response Body Json Schema Is    NsLcmOpOccs.schema.json
+	Check HTTP Response Body Json Schema Is    NsLcmOpOccs
 
 Get stauts information about multiple NS LCM OP OCC Bad Request Invalid attribute-based filtering parameters
 	GET NS LCN OP Occurences Invalid attribute-based filtering parameters
 	Check HTTP Response Status Code Is    400
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 
 Get stauts information about multiple NS LCM OP OCC Bad Request Invalid attribute selector
 	GET NS LCN OP Occurences Invalid attribute selector
 	Check HTTP Response Status Code Is    400
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index ca6405ebba9fdf8954681bfab3ce4317f738db68..c837de307a2f9b83a5290ba6d8e2cfc2ffef1b13 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -135,7 +135,8 @@ Check HTTP Response Header Contains
     Log    Header is present    
     
 Check HTTP Response Body Json Schema Is
-    [Arguments]    ${schema}
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
     Validate Json    ${schema}    ${response[0]['body']}
     Log    Json Schema Validation OK
     
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index 383968bba09d4682a248f00211494e5aac670693..99210715b8e08e8a3a8f69780af8b2b0d2607aeb 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -18,13 +18,13 @@ Post Retry operation task Not Found
     [Setup]    Check retry not supported
 	POST Retry operation task
 	Check HTTP Response Status Code Is    404
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
 Post Retry operation task Conflict
     Depends on test failure  Check resource FAILED_TEMP
 	POST Retry operation task
 	Check HTTP Response Status Code Is    409
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
 PUT Retry operation task - Method not implemented
     PUT Retry operation task
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index caced79acbe186d9668c646ac993a21d0a8f1068..f0765aa355418d3035675935531a1232f672c43b 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -18,13 +18,13 @@ Post Rollback operation task Not Found
     [Setup]    Check Rollback not supported
 	POST Rollback operation task
 	Check HTTP Response Status Code Is    404
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 		
 Post Rollback operation task Conflict
     Depends on test failure  Check resource FAILED_TEMP
 	POST Rollback operation task
 	Check HTTP Response Status Code Is    409
-	Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
 PUT Rollback operation task - Method not implemented
     PUT Rollback operation task
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index e4328d4f5f15980e153f720d37f7199eecdd78d6..6c2320d92cb7beb32babbe443147b6d641362758 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -17,8 +17,7 @@ Instantiate a nsInstance Conflict
     [Setup]    Check resource not_instantiated
     POST scale nsInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Header Contains    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Scale NSInstance- Method not implemented
     GET scale NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index b55960ff868f40a72d4bb1c4d06a3adbff526811..f9a87961bd093e1ee540d5128b170e5654939048 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -11,32 +11,29 @@ Create a new subscription
     POST subscriptions
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Header ContentType is  ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    subscription.schema.json
+    Check HTTP Response Body Json Schema Is    subscription
     
 
 Create a new Subscription - DUPLICATION
     POST subscriptions DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Header ContentType is  ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    subscription.schema.json
+    Check HTTP Response Body Json Schema Is    subscription
 
 Create a new Subscription - NO-DUPLICATION
     POST subscriptions NO DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
-    Check HTTP Response Header ContentType is  ${CONTENT_TYPE}
 
 GET Subscriptions
     GET Subscriptions
     Check HTTP Response Status Code Is  200
-    Check HTTP Response Body Json Schema Is  subscriptions.schema.json
+    Check HTTP Response Body Json Schema Is  subscriptions
 
 GET Subscription - Filter
     GET Subscriptions with filter
     Check HTTP Response Status Code Is  200
-    Check HTTP Response Body Json Schema Is  subscriptions.schema.json
+    Check HTTP Response Body Json Schema Is  subscriptions
     
 PUT subscriptions - Method not implemented
     PUT subscriptions
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 574992e3264e5e0da53e72abe632accf5eafd4eb..29f8bc60125b87769d038f6608ba2e5224dfec38 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -17,8 +17,7 @@ Terminate a NSInstance Conflict
     [Setup]    Check resource not_instantiated
     POST Terminate NSInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Header Contains    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Terminate NSInstance- Method not implemented
     GET Terminate NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index fd1832e3940e8d8363fe8ac0d388f979162fbeec..f1f397ab74a36f7bdf50097c359743042b62f78e 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -17,8 +17,7 @@ Update a NSInstance Conflict
     [Setup]    Check resource not_instantiated
     POST Update NSInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Header Contains    ${CONTENT_TYPE}
-    Check HTTP Response Body Json Schema Is    ProblemDetails.schema.json
+    Check HTTP Response Body Json Schema Is    ProblemDetails
     
 GET Update NSInstance- Method not implemented
     GET Update NSInstance