diff --git a/SRV/RNIS/RnisQuery_BV.robot b/SRV/RNIS/RnisQuery_BV.robot
index 145757f951058e2115106b0a07a3dec13cb2c966..f720677982a0489ee575f5a3c90542e49607ee77 100644
--- a/SRV/RNIS/RnisQuery_BV.robot
+++ b/SRV/RNIS/RnisQuery_BV.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pics.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../pics.txt
+Resource    ../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
diff --git a/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot b/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot
index a8874ab87ce5e52edec7996a0e12297b16b56c15..d0ddb2a56dc1a9dcf2de0f6597c6b100150cea2a 100644
--- a/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot
+++ b/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pics.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../pics.txt
+Resource    ../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
diff --git a/SRV/RNIS/RnisSpecificSubscription_BV.robot b/SRV/RNIS/RnisSpecificSubscription_BV.robot
index d0c3876e0ef7f17c40e5251678e3f87419f8780d..4c3dfc78abfd0f8725e490cc89d1e236e94e4f42 100644
--- a/SRV/RNIS/RnisSpecificSubscription_BV.robot
+++ b/SRV/RNIS/RnisSpecificSubscription_BV.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pics.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../pics.txt
+Resource    ../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
diff --git a/SRV/RNIS/resources/GenericKeywords.robot b/SRV/RNIS/resources/GenericKeywords.robot
deleted file mode 100644
index 800dc5decb35573a5eb2f818eb4f3f2662c6a286..0000000000000000000000000000000000000000
--- a/SRV/RNIS/resources/GenericKeywords.robot
+++ /dev/null
@@ -1,44 +0,0 @@
-*** Settings ***
-Resource    ../environment/variables.txt
-Resource    GenericKeywords.robot
-Library    REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
-Library    JSONSchemaLibrary    schemas/
-
-*** Keywords ***
-Get User Equipment for location with filters
-    [Arguments]    ${value}
-    Set Headers  {"Accept":"application/json"}
-    Get    /location/v2/users/${value}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}
-    Should Be Equal    ${response['status']}    ${status}
-    Log    Status code validated
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK
-
-Should Be Present In Json List
-    [Arguments]     ${expr}   ${json_field}   ${json_value}
-    Log    Check if ${json_field} is present in ${expr} with the value ${jsonvalue}
-    :FOR  ${item}  IN  @{expr}
-    \  Exit For Loop If    "${item['${json_field}']}" == "${json_value}"
-    Log    Item found ${item}
-    [return]    ${item}
-
-Check Result Contains
-    [Arguments]    ${source}    ${parameter}    ${value}
-    Should Be Present In Json List    ${source}    ${parameter}    ${value}
-
-Check ProblemDetails
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}
-    Should Be Equal    ${response['body']['problemDetails']['status']}    ${status}
-    Log    ProblemDetails Status code validated
diff --git a/pics.txt b/pics.txt
index 0d3c35c22b14e785ae79c3dda559da33982497b3..2c74d7ac666ac4357663f559eb4e66021bc70e52 100644
--- a/pics.txt
+++ b/pics.txt
@@ -1,6 +1,7 @@
 *** Variables ***
 
-${PIC_MEC_PLAT}        1 
+${PIC_MEC_PLAT}        1
 ${PIC_SERVICES}        1
 ${PIC_RNIS_QUERY}      1
-${PIC_AMS}             1
\ No newline at end of file
+${PIC_RNIS_SPECIFIC_SUBSCRIPTION}    1
+${PIC_AMS}             1