diff --git a/SRV/RNIS/RnisNotifications.robot b/SRV/RNIS/RnisNotifications.robot
index 1e1ea97ef5c2222d50e450718e7f493c97aab474..9a43119ead0f118dbc4710105efa5d68e41bb9e8 100644
--- a/SRV/RNIS/RnisNotifications.robot
+++ b/SRV/RNIS/RnisNotifications.robot
@@ -21,8 +21,10 @@ Cell change notification
     Should Be True    ${PIC_RNIS_NOTIFICATIONS} == 1
     ${json}=    Get File    schemas/CellChangeNotification.schema.json
     Log  Creating mock request and response to handle Cell change notification
-    &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/cell_change    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    Create Mock Session    ${callback_uri}${callback_port}
+    &{req}=    Create Mock Request Matcher    POST    ${callback_endpoint}    body_type="JSON_SCHEMA"    body=${json}
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=&{appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -40,7 +42,8 @@ RAB Establishment notification
     ${json}=    Get File    schemas/RabEstNotification.schema.json
     Log  Creating mock request and response to handle RAB establishment notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/rab_est    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -58,7 +61,8 @@ RAB modification notification
     ${json}=    Get File    schemas/RabModNotification.schema.json
     Log  Creating mock request and response to handle RAB modification notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/rab_mod    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -76,7 +80,8 @@ RAB release notification
     ${json}=    Get File    schemas/RabRelNotification.schema.json
     Log  Creating mock request and response to handle RAB release notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/rab_rel    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -94,7 +99,8 @@ UE measurement notification
     ${json}=    Get File    schemas/MeasRepUeNotification.schema.json
     Log  Creating mock request and response to handle UE measurement notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/MeasRepUeNotification    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -112,7 +118,8 @@ UE timing advance notification
     ${json}=    Get File    schemas/MeasTaSubscription.schema.json
     Log  Creating mock request and response to handle UE timing advance notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/MeasTaNotification    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -130,7 +137,8 @@ UE carrier aggregation reconfiguration notification
     ${json}=    Get File    schemas/CaReconfSubscription.schema.json
     Log  Creating mock request and response to handle UE carrier aggregation reconfiguration notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/CaReconfSubscription    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -148,7 +156,8 @@ S1-U bearer notification
     ${json}=    Get File    schemas/S1BearerSubscription.schema.json
     Log  Creating mock request and response to handle S1-U bearer notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/S1BearerSubscription    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    headers=${appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -166,7 +175,8 @@ TC_MEC_SRV_RNIS_009_OK
     ${json}=    Get File    schemas/NrMeasRepUeSubscription.schema.json
     Log  Creating mock request and response to handle UE Measurement notification
     &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}/meas_rep_ue    body_type="JSON_SCHEMA"    body=${json}
-    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    &{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    &{rsp}=    Create Mock Response    &{appjson_hdrs}    status_code=204
     Create Mock Expectation    ${req}    ${rsp}
     Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     Log  Verifying results
@@ -184,7 +194,8 @@ TC_MEC_SRV_RNIS_009_OK
     # ${json}=    Get File    schemas/RadioNetworkInformationAPI.schema.json
     # Log  Creating mock request and response to handle UE Measurement notification
     # &{req}=    Create Mock Request Matcher    POST    ${callback_uri}${callback_endpoint}    body_type="JSON_SCHEMA"    body=${json}
-    # &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    #&{appjson_hdrs}=    Create Dictionary    Content-type=application/json
+    # &{rsp}=    Create Mock Response    &{appjson_hdrs}    status_code=204
     # Create Mock Expectation    ${req}    ${rsp}
     # Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
     # Log  Verifying results