diff --git a/SRV/AMS/AMSService.robot b/SRV/AMS/AMSService.robot
index 3e7ce1cc30b6ce36a02adfd5a40307241cb0d038..51847604978a981ad9f0db16232d1d4aab00e13b 100644
--- a/SRV/AMS/AMSService.robot
+++ b/SRV/AMS/AMSService.robot
@@ -233,7 +233,7 @@ Post Expire Notification
 
 *** Keywords ***
 Get Registered AMS information
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -243,7 +243,7 @@ Get Registered AMS information
     
 Get Registered AMS information using attribute-selector
     [Arguments]    ${key}    ${value}
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -253,7 +253,7 @@ Get Registered AMS information using attribute-selector
     
     
 Get Registered AMS information using bad parameters
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -264,7 +264,7 @@ Get Registered AMS information using bad parameters
 
 Create a new application mobility service
     [Arguments]    ${content}
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -276,7 +276,7 @@ Create a new application mobility service
     
 
 Get Subscriptions for registered AMS    
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions
@@ -286,7 +286,7 @@ Get Subscriptions for registered AMS
     
     
 Get Subscriptions for registered AMS with wrong attbirube parameter
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?subscriptionTyp=${SUBSCRIPTION_TYPE}
@@ -297,7 +297,7 @@ Get Subscriptions for registered AMS with wrong attbirube parameter
 
 Post a new notification subscription
     [Arguments]    ${content}
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
@@ -311,7 +311,7 @@ Post a new notification subscription
     
 Get individual subscription for AMS services
     [Arguments]    ${content}
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${content}
@@ -321,7 +321,7 @@ Get individual subscription for AMS services
 
 Delete individual subscription for AMS services 
     [Arguments]    ${content}
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Authorization":"${TOKEN}"}
     Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${content}
     ${output}=    Output    response
@@ -330,7 +330,7 @@ Delete individual subscription for AMS services
 
 Update individual subscription for AMS services
     [Arguments]    ${identifier}    ${content}
-    Should Be True    ${PIC_AMS} == '1'
+    Should Be True    ${PIC_AMS} == 1
     Set Headers    {"Accept":"application/json"}
     Set Headers    {"Content-Type":"application/json"}
     Set Headers    {"Authorization":"${TOKEN}"}
diff --git a/SRV/RNIS/RnisNotifications.robot b/SRV/RNIS/RnisNotifications.robot
index 9ec6bd5d79099c03eb00d10101f6c40fc2529d74..0b6eced49263280fa6301b2b9f962f14c34c693f 100644
--- a/SRV/RNIS/RnisNotifications.robot
+++ b/SRV/RNIS/RnisNotifications.robot
@@ -49,4 +49,40 @@ RAB Establishment notification
     Clear Requests    ${callback_endpoint}
 
 
+RAB modification notification
+    [Documentation]   TC_MEC_SRV_RNIS_003_OK
+    ...  Check that the RNIS service sends an RNIS notification about RAB modification if the RNIS service has an associated subscription and the event is generated
+    ...  ETSI GS MEC 012 2.0.4, clause 6.4.4
+    ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml
+    Should Be True    ${PIC_RNIS_NOTIFICATIONS} == 1
+    ${json}=    Get File    schemas/RadioNetworkInformationAPI.schema.json
+    Log  Creating mock request and response to handle RAB establishment notification
+    &{req}=    Create Mock Request Matcher    POST    ${callback_endpoint}/rab_mod    body_type="JSON_SCHEMA"    body=${json}
+    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    Create Mock Expectation    ${req}    ${rsp}
+    Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
+    Log  Verifying results
+    Verify Mock Expectation    ${req}
+    Log  Cleaning the endpoint
+    Clear Requests    ${callback_endpoint}
+
+
+RAB release notification
+    [Documentation]   TC_MEC_SRV_RNIS_004_OK
+    ...  Check that the RNIS service sends an RNIS release about RAB modification if the RNIS service has an associated subscription and the event is generated
+    ...  ETSI GS MEC 012 2.0.4, clause 6.4.5
+    ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml
+    Should Be True    ${PIC_RNIS_NOTIFICATIONS} == 1
+    ${json}=    Get File    schemas/RadioNetworkInformationAPI.schema.json
+    Log  Creating mock request and response to handle RAB establishment notification
+    &{req}=    Create Mock Request Matcher    POST    ${callback_endpoint}/rab_rel    body_type="JSON_SCHEMA"    body=${json}
+    &{rsp}=    Create Mock Response    headers="Content-Type: application/json"    status_code=204
+    Create Mock Expectation    ${req}    ${rsp}
+    Wait Until Keyword Succeeds    ${total_polling_time}    ${polling_interval}    Verify Mock Expectation    ${req}
+    Log  Verifying results
+    Verify Mock Expectation    ${req}
+    Log  Cleaning the endpoint
+    Clear Requests    ${callback_endpoint}
+
+
 *** Keywords ***
diff --git a/TODO.md b/TODO.md
index b9f7500b2be03f95a3d188ec7bc03fecb9eaa5f4..36a81188ba925f8d8409276766a7e3467379e4d8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -28,6 +28,14 @@ https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purpo
 https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisQuery_BV.tplan2
 https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisQuery_BI_BO.tplan2
 
+- TC_MEC_SRV_RNIS_001_OK       <font color="color:green">To be tested</font>
+
+- TC_MEC_SRV_RNIS_002_OK       <font color="color:green">To be tested</font>
+
+- TC_MEC_SRV_RNIS_003_OK       <font color="color:green">To be tested</font>
+
+- TC_MEC_SRV_RNIS_004_OK       <font color="color:green">To be tested</font>
+
 - TC_MEC_SRV_RNIS_011_OK       <font color="color:green">To be tested</font>
 
 - TC_MEC_SRV_RNIS_012_OK       <font color="color:green">To be tested</font>