diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index 1d5a78aaf8ab78ea6c02932e13b9c166d1798ec8..fcbed86adc5a594450608d6ff36b9a70e696aca2 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -16,8 +16,8 @@ Deliver a notification - Alarm
     ${json}=	Get File	schemas/alarmNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle alarmNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}    body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -30,8 +30,8 @@ Deliver a notification - Alarm Clearance
     ${json}=	Get File	schemas/alarmClearedNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle alarmNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -44,8 +44,8 @@ Deliver a notification - Alarm List Rebuilt
     ${json}=	Get File	schemas/alarmListRebuiltNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle alarmNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -55,8 +55,8 @@ Deliver a notification - Alarm List Rebuilt
 
 Test a notification end point
     log    The GET method allows the server to test the notification endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${notification_ep}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher    GET  ${notification_ep}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 02f5c707d4421caf1db6d1bb11a64bb501e9fa86..8745df345d6d2bdc298fac1e1217ae2625a23650 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -12,8 +12,8 @@ Library    String
 
 *** Test Cases ***
 Check Notification Endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${callback_endpoint}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
@@ -23,8 +23,8 @@ Post VNF Indicator Notification
     ${json}=	Get File	schemas/VnfIndicatorValueChangeNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle VNF Indicator Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -36,8 +36,8 @@ Post VNF Indicator Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle VNF Indicator Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -49,8 +49,8 @@ Post VNF Indicator Notification Negative 404
     
 PUT VNF Indicator Notification 
     Log  PUT Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PUT  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PUT  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -61,8 +61,8 @@ PUT VNF Indicator Notification
     
 PATCH VNF Indicator Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PATCH  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PATCH  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -73,8 +73,8 @@ PATCH VNF Indicator Notification
     
 DELETE VNF Indicator Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	DELETE  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	DELETE  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 662897f492b332a6f58c4a8cbc9f922392675b4c..d5ec15223f21032319497f297d1d1ed2df7a08fd 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -16,8 +16,8 @@ Deliver a notification - Operation Occurence
     ${json}=	Get File	schemas/vnfLcmOperationOccurrenceNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -30,8 +30,8 @@ Deliver a notification - Id Creation
     ${json}=	Get File	schemas/vnfIdentifierCreationNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -44,8 +44,8 @@ Deliver a notification - Id deletion
     ${json}=	Get File	schemas/vnfIdentifierCreationNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -55,8 +55,8 @@ Deliver a notification - Id deletion
 
 Test a notification end point
     log    The GET method allows the server to test the notification endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${notification_ep}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${notification_ep}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index 8662ae0063c0032c7dafdc15ca1931888148cacb..b6a0df5b8325c0e5994747860ee77a16367bfa8d 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -11,8 +11,8 @@ Library    String
 
 *** Test Cases ***
 Check Notification Endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${callback_endpoint}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
@@ -22,8 +22,8 @@ Post Performance Information Available Notification
     ${json}=	Get File	schemas/PerformanceInformationAvailableNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Performance Information Available Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -36,8 +36,8 @@ Post Performance Information Available Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Performance Information Available Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -49,8 +49,8 @@ Post Threshold Crossed Notification
     ${json}=	Get File	schema/ThresholdCrossedNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Threshold Crossed Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -63,8 +63,8 @@ PostThreshold Crossed Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handleThreshold Crossed Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -75,8 +75,8 @@ PostThreshold Crossed Notification Negative 404
     
 PUT Performance Notification 
     Log  PUT Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PUT  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PUT  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -87,8 +87,8 @@ PUT Performance Notification
     
 PATCH Performance Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PATCH  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PATCH  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -99,8 +99,8 @@ PATCH Performance Notification
     
 DELETE Performance Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	DELETE  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	DELETE  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index ae38099f8b556f5dbf9552fd61c51a9ed0a2386d..22e7470187b7ec21f3875d8467968287c27da83c 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -14,8 +14,8 @@ Deliver a notification - Alarm
     ${json}=	Get File	schemas/alarmNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle alarmNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -28,8 +28,8 @@ Deliver a notification - Alarm Clearance
     ${json}=	Get File	schemas/alarmClearedNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle alarmNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -42,8 +42,8 @@ Deliver a notification - Alarm List Rebuilt
     ${json}=	Get File	schemas/alarmListRebuiltNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle alarmNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher  POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -53,8 +53,8 @@ Deliver a notification - Alarm List Rebuilt
 
 Test a notification end point
     log    The GET method allows the server to test the notification endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${notification_ep}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${notification_ep}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
diff --git a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index b0189c7ffffb0352badd0d3f2fe2e587f7c942c4..229a939b3de912f56b5b6f8900269c4d8f0f1b72 100644
--- a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -12,8 +12,8 @@ Library    String
 
 *** Test Cases ***
 Check Notification Endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${callback_endpoint}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
@@ -23,8 +23,8 @@ Post VNF Indicator Notification
     ${json}=	Get File	schemas/VnfIndicatorValueChangeNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle VNF Indicator Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -36,8 +36,8 @@ Post VNF Indicator Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle VNF Indicator Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -49,8 +49,8 @@ Post VNF Indicator Notification Negative 404
     
 Put VNF Indicator Notification 
     Log  PUT Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PUT  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PUT  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -61,8 +61,8 @@ Put VNF Indicator Notification
     
 Patch VNF Indicator Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PATCH  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PATCH  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -73,8 +73,8 @@ Patch VNF Indicator Notification
     
 Delete VNF Indicator Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	DELETE  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	DELETE  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot
index fb44e0a8642ed11fee435426454c4cfc3714f251..637644b33ea3193311f0d6696d3541ed1966e595 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot
@@ -91,8 +91,8 @@ Configure Notification Handler
     ${json}=	Get File	schemas/${element}.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle ${element}
-    &{notification_request}=  Create Mock Request Matcher Schema	POST  ${endpoint}  body=${BODY}
-    &{notification_response}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     
 Check Operation Notification
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 662897f492b332a6f58c4a8cbc9f922392675b4c..d5ec15223f21032319497f297d1d1ed2df7a08fd 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -16,8 +16,8 @@ Deliver a notification - Operation Occurence
     ${json}=	Get File	schemas/vnfLcmOperationOccurrenceNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -30,8 +30,8 @@ Deliver a notification - Id Creation
     ${json}=	Get File	schemas/vnfIdentifierCreationNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -44,8 +44,8 @@ Deliver a notification - Id deletion
     ${json}=	Get File	schemas/vnfIdentifierCreationNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle vnfLcmOperationOccurrenceNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -55,8 +55,8 @@ Deliver a notification - Id deletion
 
 Test a notification end point
     log    The GET method allows the server to test the notification endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${notification_ep}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${notification_ep}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
index 6f0f5b46683a2e62a6c3a8cd5e5cc0ad9074dacf..9093c24bf9252075946ce5d596ef34a84f0a61ad 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
@@ -8,6 +8,7 @@ Library    OperatingSystem
 Library    BuiltIn
 Library    Collections
 Library    JSONLibrary
+Library    Process
 Suite Setup    Initialize System
 Suite Teardown    Terminate All Processes    kill=true
 
diff --git a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
index f3c1cd60e05d348e19db4bb2be3f39d910aa4f09..910f3d2dac6bd796268d0dd79d1058561923b042 100644
--- a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
@@ -26,8 +26,8 @@ Configure Notification Handler
     ${json}=	Get File	schemas/${element}.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle ${element}
-    &{notification_request}=  Create Mock Request Matcher Schema	POST  ${endpoint}  body=${BODY}
-    &{notification_response}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{notification_response}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
     [Return]        &{notification_request}
     
diff --git a/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
index 10320e42a177295462faf38c6b461d47645e713e..420c3c6106c80c55d745c98e6207cb30a313d1e1 100644
--- a/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
@@ -12,8 +12,8 @@ Library    String
 
 *** Test Cases ***
 Check Notification Endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${callback_endpoint}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
@@ -23,8 +23,8 @@ Post VNF Package Onboarding Notification
     ${json}=	Get File	schemas/PackageOnboardingNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle  VNF Package Onboarding Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -37,8 +37,8 @@ Post VNF Package Onboarding Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle VNF Package Onboarding Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -50,8 +50,8 @@ Post VNF Package Change Notification
     ${json}=	Get File	schema/PackageChangeNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Package Change Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -64,8 +64,8 @@ Post Package Change Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Package Change Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -76,8 +76,8 @@ Post Package Change Notification Negative 404
     
 PUT VNF Package Management Notification 
     Log  PUT Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PUT  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PUT  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -88,8 +88,8 @@ PUT VNF Package Management Notification
     
 PATCH VNF Package Management Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PATCH  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PATCH  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -100,8 +100,8 @@ PATCH VNF Package Management Notification
     
 DELETE VNF Package Management Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	DELETE  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	DELETE  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
diff --git a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index f4e2b487e2833c9efea7bcaaf1a78f07d29a0241..65349f8c1a34e229a4f7b0dfce8ce7473266db7c 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -12,8 +12,8 @@ Library    String
 
 *** Test Cases ***
 Check Notification Endpoint
-    &{req}=  Create Mock Request Matcher Schema	GET  ${callback_endpoint}    
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Verify Mock Expectation  ${req}
@@ -23,8 +23,8 @@ Post Performance Information Available Notification
     ${json}=	Get File	schemas/PerformanceInformationAvailableNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Performance Information Available Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -37,8 +37,8 @@ Post Performance Information Available Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Performance Information Available Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -50,8 +50,8 @@ Post Threshold Crossed Notification
     ${json}=	Get File	schema/ThresholdCrossedNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Threshold Crossed Notification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -64,8 +64,8 @@ Post Threshold Crossed Notification Negative 404
     ${json}=	Get File	schemas/ProblemDetails.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handleThreshold Crossed Notification to handle 404 error
-    &{req}=  Create Mock Request Matcher Schema	POST  ${callback_endpoint_error}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=404
+    &{req}=  Create Mock Request Matcher	POST  ${callback_endpoint_error}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=404
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -76,8 +76,8 @@ Post Threshold Crossed Notification Negative 404
     
 PUT Performance Notification 
     Log  PUT Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PUT  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PUT  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -88,8 +88,8 @@ PUT Performance Notification
     
 PATCH Performance Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	PATCH  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	PATCH  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
@@ -100,8 +100,8 @@ PATCH Performance Notification
     
 DELETE Performance Notification 
     Log  PATCH Method not implemented
-    &{req}=  Create Mock Request Matcher Schema	DELETE  ${callback_endpoint}
-    &{rsp}=  Create Mock Response Schema  status_code=405
+    &{req}=  Create Mock Request Matcher	DELETE  ${callback_endpoint}
+    &{rsp}=  Create Mock Response  status_code=405
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 5704ad479c41976dc6254ff6b15c439ea7eb880a..bfec540c0d915f38c355f51ee0c84df972e9dd91 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -14,8 +14,8 @@ Deliver a notification - Vr Quota Availibility
     ${json}=	Get File	schemas/VrQuotaAvailNotification.schema.json
     ${BODY}=	evaluate	json.loads('''${json}''')	json
     Log  Creating mock request and response to handle Vr Quota AvailibilityNotification
-    &{req}=  Create Mock Request Matcher Schema	POST  ${notification_ep}  body=${BODY}
-    &{rsp}=  Create Mock Response Schema	headers="Content-Type: application/json"  status_code=204
+    &{req}=  Create Mock Request Matcher	POST  ${notification_ep}  body_type="JSON_SCHEMA"    body=${BODY}
+    &{rsp}=  Create Mock Response	headers="Content-Type: application/json"  status_code=204
     Create Mock Expectation  ${req}  ${rsp}
     Sleep  ${sleep_interval}
     Log  Verifying results