diff --git a/MEC040/SRV/FederationEnablement.robot b/MEC040/SRV/FederationEnablement.robot
index d59c956efed24f475dbaee79f67763d8e9bace27..ba14e44c3abe6afb76310a77ca01e31ffae524dd 100644
--- a/MEC040/SRV/FederationEnablement.robot
+++ b/MEC040/SRV/FederationEnablement.robot
@@ -1,6 +1,5 @@
 Y''[Documentation]   robot --outputdir ../../../outputs ./FederationEnablement.robot
 ...    Test Suite to validate the Federation Enablement API (FED) operations.
-
 *** Settings ***
 Resource    environment/variables.txt
 Resource    ../../pics.txt
@@ -8,24 +7,33 @@ Resource    ../../GenericKeywords.robot
 Library     REST    ${SCHEMA}://${HOST}:${PORT}    ssl_verify=false
 Library     OperatingSystem    
 
+
+Test Setup       Test Setup   ${SYSTEM_ID_PLACEHOLDER}   SystemInfo      ${NO_ACTION}
+Test Teardown    Test TearDown    ${SYSTEM_ID_PLACEHOLDER}   SystemInfo      ${NO_ACTION}
+
+
 *** Test Cases ***
-TP_MEC_MEC040_SRV_MEF_001_OK
+TC_MEC_MEC040_SRV_MEF_001_OK
     [Documentation]
     ...  Check that the IUT responds with a list of all available systemInfo 
     ...  when requested by a MEC Orchestrator - No query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
     Retrieve all system info resources
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+
 
 
-TP_MEC_MEC040_SRV_MEF_001_OK_02
+TC_MEC_MEC040_SRV_MEF_001_OK_02
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - SystemId query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    #SystemId cannot be set by the requestor, so Test setup and test tear down are not applicable
     Retrieve all system info resources with query params   ${SYSTEM_ID_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
@@ -33,137 +41,169 @@ TP_MEC_MEC040_SRV_MEF_001_OK_02
       Should Be Equal As Strings    ${element}[systemId]      ${EXPECTED_SYSTEM_ID}
     END
 
-TP_MEC_MEC040_SRV_MEF_001_OK_03
+TC_MEC_MEC040_SRV_MEF_001_OK_03
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo 
     ...  when requested by a MEC Orchestrator - Multiple SystemId query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    #SystemId cannot be set by the requestor, so Test setup and test tear down are not applicable
     Retrieve all system info resources with query params   ${MULTIPLE_SYSTEM_ID_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
     
     FOR  ${element}  IN  @{response['body']}
       IF    '''${element}[systemId]''' == '''${EXPECTED_SYSTEM_ID}'''
-        ${item}    Set Variable   ${TRUE}
+        ${found_first_system_id}    Set Variable   ${TRUE}
       END
       IF    '''${element}[systemId]''' == '''${EXPECTED_SYSTEM_ID2}'''
-        ${item2}    Set Variable   ${TRUE}
+        ${found_second_system_id}    Set Variable   ${TRUE}
       END
     END
-    Should Be True  ${item}
-    Should Be True  ${item2}
+    Should Be True  ${found_first_system_id}
+    Should Be True  ${found_second_system_id}
    
-TP_MEC_MEC040_SRV_MEF_001_OK_04
+TC_MEC_MEC040_SRV_MEF_001_OK_04
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - Empty SystemId query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
     Retrieve all system info resources
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+
 
-TP_MEC_MEC040_SRV_MEF_001_OK_05
+TC_MEC_MEC040_SRV_MEF_001_OK_05
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - SystemName query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    ${SYSTEM_NAME_VALUE}   Get value entry from JSON file    SystemInfo  systemName
+
     Retrieve all system info resources with query params   ${SYSTEM_NAME_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
     FOR  ${element}  IN  @{response['body']}
-      Should Be Equal As Strings    ${element}[systemName]      ${EXPECTED_SYSTEM_NAME}
+      Should Be Equal As Strings    ${element}[systemName]      ${SYSTEM_NAME_VALUE}
     END
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+
 
-TP_MEC_MEC040_SRV_MEF_001_OK_06
+TC_MEC_MEC040_SRV_MEF_001_OK_06
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - Multiple SystemName query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    ${SYSTEM_NAME_VALUE}   Get value entry from JSON file    SystemInfo  systemName
+
     Retrieve all system info resources with query params     ${MUTIPLE_SYSTEM_NAME_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
     FOR  ${element}  IN  @{response['body']}
-      IF    '''${element}[systemName]''' == '''${EXPECTED_SYSTEM_NAME}'''
-        ${item}    Set Variable   ${TRUE}
+      IF    '''${element}[systemName]''' == '''${SYSTEM_NAME_VALUE}'''
+        ${found_sys_name_one}    Set Variable   ${TRUE}
       END
       IF    '''${element}[systemName]''' == '''${EXPECTED_SYSTEM_NAME2}'''
-        ${item2}    Set Variable   ${TRUE}
+        ${found_sys_name_two}    Set Variable   ${TRUE}
       END
     END
-    Should Be True  ${item}
-    Should Be True  ${item2}
+    Should Be True  ${found_sys_name_one}
+    Should Be True  ${found_sys_name_two}
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
 
 
-TP_MEC_MEC040_SRV_MEF_001_OK_07
+
+TC_MEC_MEC040_SRV_MEF_001_OK_07
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - Empty SystemName query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    
     Retrieve all system info resources with query params     ${EMPTY_SYSTEM_NAME_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
-    FOR  ${element}  IN  @{response['body']}
-      Should Be Equal As Strings    ${element}[systemName]      ${EMPTY}
-    END
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+
 
-TP_MEC_MEC040_SRV_MEF_001_OK_08
+TC_MEC_MEC040_SRV_MEF_001_OK_08
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - systemProvider query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    ${SYS_PROVIDER_VALUE}   Get value entry from JSON file    SystemInfo  systemProvider
+
     Retrieve all system info resources with query params     ${SYSTEM_PROVIDER_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
     FOR  ${element}  IN  @{response['body']}
-      Should Be Equal As Strings    ${element}[systemProvider]      ${EXPECTED_SYSTEM_PROVIDER}
-    END    
+      Should Be Equal As Strings    ${element}[systemProvider]      ${SYS_PROVIDER_VALUE}
+    END
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+  
 
-TP_MEC_MEC040_SRV_MEF_001_OK_09
+TC_MEC_MEC040_SRV_MEF_001_OK_09
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - Multiple systemProvider query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    ##TODO complete
     Retrieve all system info resources with query params   ${MUTIPLE_SYS_PROVIDER_QUERY_PAR}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    ${SYS_PROVIDER_VALUE}   Get value entry from JSON file    SystemInfo  systemProvider
+
     FOR  ${element}  IN  @{response['body']}
-      IF    '''${element}[systemProvider]''' == '''${EXPECTED_SYSTEM_PROVIDER}'''
-        ${item}    Set Variable   ${TRUE}
+      IF    '''${element}[systemProvider]''' == '''${SYS_PROVIDER_VALUE}'''
+        ${sys_provider_found}    Set Variable   ${TRUE}
       END
       IF    '''${element}[systemProvider]''' == '''${EXPECTED_SYSTEM_PROVIDER2}'''
-        ${item2}    Set Variable   ${TRUE}
+        ${sys_provider2_found}    Set Variable   ${TRUE}
       END
     END
-    Should Be True  ${item}
-    Should Be True  ${item2} 
+    Should Be True  ${sys_provider_found}
+    Should Be True  ${sys_provider2_found} 
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+  
 
 
-TP_MEC_MEC040_SRV_MEF_001_OK_10
+TC_MEC_MEC040_SRV_MEF_001_OK_10
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - Empty systemProvider query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfoEmptySystemProvider    ${REGISTER_ACTION}
     Retrieve all system info resources with query params   ${EMPTY_SYSTEM_PROVIDER_QUERY_PARAM}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
     FOR  ${element}  IN  @{response['body']}
       Should Be Equal As Strings    ${element}[systemProvider]      ${EMPTY}
     END
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+  
     
-TP_MEC_MEC040_SRV_MEF_001_OK_11
+TC_MEC_MEC040_SRV_MEF_001_OK_11
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo
     ...  when requested by a MEC Orchestrator - Multiple query parameters
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    ${SYS_NAME_VALUE}   Get value entry from JSON file    SystemInfo  systemName
+
     Retrieve all system info resources with query params   ${FILTER_ON_SYSTEM_ID_AND_NAME}
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfoList
@@ -173,20 +213,23 @@ TP_MEC_MEC040_SRV_MEF_001_OK_11
       IF    '''${element}[systemId]''' == '''${EXPECTED_SYSTEM_ID}'''
         ${counterSystemId}=  set variable  ${counterSystemId+1}
       END
-      IF    '''${element}[systemId]''' == '''${EXPECTED_SYSTEM_ID}'''
+      IF    '''${element}[systemName]''' == '''${SYS_NAME_VALUE}'''
          ${counterSystemName}=  set variable  ${counterSystemName+1}
       END
       ${counterSystemName}=  set variable  ${counterSystemName+1}
     END
     Should Be True    '${counterSystemName}'>'0'
     Should Be True    '${counterSystemId}'>'0'
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+  
                                     
-TP_MEC_MEC040_SRV_MEF_001_NF_01
+TC_MEC_MEC040_SRV_MEF_001_NF_01
     [Documentation]
     ...  Check that the IUT responds with an error 
     ...  when selection is not applicable - SystemId
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${NOT_EXT_SYSTEM_ID_QUERY_PARAM}   ${None}    ${REMOVE_ACTION}
     Retrieve all system info resources with query params   ${NOT_EXT_SYSTEM_ID_QUERY_PARAM}
     Check HTTP Response Status Code Is    404
 
@@ -196,21 +239,23 @@ TP_MEC_MEC040_SRV_MEF_001_NF_02
     ...  when selection is not applicable - SystemName
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    ##Test setup not applicable because systemInfo cannot be deleted by systemName
     Retrieve all system info resources with query params   ${NOT_EXT_SYSTEM_NAME_QUERY_PARAM}
     Check HTTP Response Status Code Is    404
 
 
-TP_MEC_MEC040_SRV_MEF_001_NF_03
+TC_MEC_MEC040_SRV_MEF_001_NF_03
     [Documentation]
     ...  Check that the IUT responds with an error
     ...  when selection is not applicable - SystemProvider
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    ##Test setup not applicable because systemInfo cannot be deleted by systemProvider
     Retrieve all system info resources with query params   ${NOT_EXT_SYS_PROVIDER_QUERY_PARAM}
     Check HTTP Response Status Code Is    404
 
 ##TODO double check
-TP_MEC_MEC040_SRV_MEF_001_BR
+TC_MEC_MEC040_SRV_MEF_001_BR
     [Documentation]
     ...  Check that the IUT responds with an error when request is malformed
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.1, clause 5.2.2.2
@@ -218,17 +263,26 @@ TP_MEC_MEC040_SRV_MEF_001_BR
    Retrieve all system info resources wrong URL
    #Check HTTP Response Status Code Is    400
     
-TP_MEC_MEC040_SRV_MEF_002_OK
+TC_MEC_MEC040_SRV_MEF_002_OK
     [Documentation]
     ...  Check that the IUT creates a new systemInfo when requested by a MEC Orchestrator
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.4, clause 5.2.2.1.1
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    ##No test setup needed because the systemId is generated by IUT
     Register System Info    SystemInfo
     Check HTTP Response Status Code Is    201
-    Check HTTP Response Body Json Schema Is  SystemInfo   
+    Check HTTP Response Body Json Schema Is  SystemInfo  
+    ${SYS_NAME_VALUE}   Get value entry from JSON file    SystemInfo  systemName
+    ${SYS_NAME_PROVIDER}   Get value entry from JSON file    SystemInfo  systemProvider
+
+    Should Be Equal As Strings    ${response['body']['systemName']}       ${SYS_NAME_VALUE}
+    Should Be Equal As Strings    ${response['body']['systemProvider']}       ${SYS_NAME_PROVIDER}
+
+    [Teardown]    Test TearDown   ${response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+   
     
 
-TP_MEC_MEC040_SRV_MEF_002_BR_01
+TC_MEC_MEC040_SRV_MEF_002_BR_01
     [Documentation]
     ...  Check that the IUT responds with an error on creating an existing systemInfo
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.4, clause 5.2.2.1.1
@@ -238,7 +292,7 @@ TP_MEC_MEC040_SRV_MEF_002_BR_01
 
 
 ##TODO double check
-TP_MEC_MEC040_SRV_MEF_002_BR_02
+TC_MEC_MEC040_SRV_MEF_002_BR_02
     [Documentation]
     ...  Check that the IUT responds with an error on providing inconsistent data
     ...  ETSI GS MEC 040 V3.1.1, clause 7.3.3.4, clause 5.2.2.1.1
@@ -246,27 +300,29 @@ TP_MEC_MEC040_SRV_MEF_002_BR_02
     Register System Info    SystemInfoBR
     Check HTTP Response Status Code Is    400    
     
-TP_MEC_MEC040_SRV_MEF_003_OK
+TC_MEC_MEC040_SRV_MEF_003_OK
     [Documentation]
     ...  Check that the IUT responds with a selection of all available systemInfo 
     ...  when requested by a MEC Orchestrator
     ...  ETSI GS MEC 040 V3.1.1, clause 7.4.3.1, clause 5.2.2.1.1
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    ## No test setup and teardown applicable because systemId is generated by IUT
     Retrieve specific system info resource   ${EXPECTED_SYSTEM_ID} 
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is  SystemInfo
     
-TP_MEC_MEC040_SRV_MEF_003_NF
+TC_MEC_MEC040_SRV_MEF_003_NF
     [Documentation]
     ...  Check that the IUT responds with an error
     ...  when it receives a request for returning a systemInfo  referred with a wrong systemId
     ...  ETSI GS MEC 040 V3.1.1, clause 7.4.3.1, clause 5.2.2.1.1
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${NOT_EXISTING_SYSTEM_ID}   ${None}    ${REMOVE_ACTION}
     Retrieve specific system info resource    ${NOT_EXISTING_SYSTEM_ID} 
     Check HTTP Response Status Code Is    404
 
 ##TODO double check    
-TP_MEC_MEC040_SRV_MEF_003_BR
+TC_MEC_MEC040_SRV_MEF_003_BR
     [Documentation]
     ...  Check that the IUT responds with an error
     ...  when it receives a request for returning a systemInfo  referred with a wrong systemId
@@ -275,44 +331,60 @@ TP_MEC_MEC040_SRV_MEF_003_BR
     Retrieve specific system info resource    ${NOT_EXISTING_SYSTEM_ID} 
     #Check HTTP Response Status Code Is    400
     
-TP_MEC_MEC040_SRV_MEF_004_OK_01
+TC_MEC_MEC040_SRV_MEF_004_OK_01
     [Documentation]
     ...  Check that the IUT updates the systemInfo when requested by a MEC Orchestrator
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.3, clause 5.2.2.1.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
-    Update specific system info resource  ${EXPECTED_SYSTEM_ID}    SystemInfoUpdate
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}
+    ${SYS_PROVIDER}   Get value entry from JSON file    SystemInfoUpdate  endpoint
+    Update specific system info resource  ${setup_response['body']['systemId']}    SystemInfoUpdate 
     Check HTTP Response Status Code Is    200
-    Should Be Equal As Strings    ${response['body']['systemProvider']}        ${EXPECTED_NEW_SYSTEM_PROVIDER}
+    Should Be Equal As Strings    ${response['body']['systemProvider']}        ${SYS_PROVIDER}
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+
 
-TP_MEC_MEC040_SRV_MEF_004_OK_02
+TC_MEC_MEC040_SRV_MEF_004_OK_02
     [Documentation]
     ...  Check that the IUT updates the systemInfo when requested by a MEC Orchestrator
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.3, clause 5.2.2.1.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
-    Update specific system info resource  ${EXPECTED_SYSTEM_ID}    SystemInfoUpdate2
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}    
+    Update specific system info resource  ${setup_response['body']['systemId']}    SystemInfoUpdate2
+    ${SYS_NAME}   Get value entry from JSON file    SystemInfoUpdate2  systemName
     Check HTTP Response Status Code Is    200
-    Should Be Equal As Strings    ${response['body']['systemName']}        ${EXPECTED_NEW_SYSTEM_NAME}
+    Should Be Equal As Strings    ${response['body']['systemName']}        ${SYS_NAME}
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
+
+
   
-TP_MEC_MEC040_SRV_MEF_004_OK_02
+TC_MEC_MEC040_SRV_MEF_004_OK_03
     [Documentation]
     ...  Check that the IUT updates the systemInfo when requested by a MEC Orchestrator
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.3, clause 5.2.2.1.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
-    Update specific system info resource  ${EXPECTED_SYSTEM_ID}    SystemInfoUpdate3
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}    
+    Update specific system info resource  ${setup_response['body']['systemId']}    SystemInfoUpdate3
     Check HTTP Response Status Code Is    200
-    Should Be Equal As Strings    ${response['body']['systemName']}        ${EXPECTED_NEW_SYSTEM_NAME}
-    Should Be Equal As Strings    ${response['body']['systemProvider']}    ${EXPECTED_NEW_SYSTEM_PROVIDER}
+    ${SYS_NAME}   Get value entry from JSON file    SystemInfoUpdate3  systemName
+    ${SYS_PROVIDER}   Get value entry from JSON file    SystemInfoUpdate3  endpoint
+        
+    Should Be Equal As Strings    ${response['body']['systemName']}        ${SYS_NAME}
+    Should Be Equal As Strings    ${response['body']['systemProvider']}    ${SYS_PROVIDER}
+    [Teardown]    Test TearDown    ${setup_response['body']['systemId']}    ${None}      ${REMOVE_ACTION}
 
-TP_MEC_MEC040_SRV_MEF_004_NF
+
+TC_MEC_MEC040_SRV_MEF_004_NF
     [Documentation]
     ...  Check that the IUT responds with an error when requested to update an unknown systemInfo
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.3, clause 5.2.2.1.2
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${NOT_EXISTING_SYSTEM_ID}   ${None}    ${REMOVE_ACTION}    
     Update specific system info resource  ${NOT_EXISTING_SYSTEM_ID}    SystemInfoUpdate3
     Check HTTP Response Status Code Is    404
 
 ##TODO double check the corresponding TP
-#TP_MEC_MEC040_SRV_MEF_004_BR_01
+#TC_MEC_MEC040_SRV_MEF_004_BR_01
     #[Documentation]
     #...  Check that the IUT responds with an error when requested to update with an inconsistant URI
     #...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.3, clause 5.2.2.1.2
@@ -320,7 +392,7 @@ TP_MEC_MEC040_SRV_MEF_004_NF
     #Update specific system info resource  ${NOT_EXISTING_SYSTEM_ID}    SystemInfoUpdate3
     #Check HTTP Response Status Code Is    400
 
-TP_MEC_MEC040_SRV_MEF_004_BR_02
+TC_MEC_MEC040_SRV_MEF_004_BR_02
     [Documentation]
     ...  Check that the IUT responds with an error when requested to update with no data provided
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.3, clause 5.2.2.1.2
@@ -328,27 +400,62 @@ TP_MEC_MEC040_SRV_MEF_004_BR_02
     Update specific system info resource  ${EXPECTED_SYSTEM_ID}    SystemInfoUpdateBR
     Check HTTP Response Status Code Is    400            
     
-TP_MEC_MEC040_SRV_MEF_005_OK
+TC_MEC_MEC040_SRV_MEF_005_OK
     [Documentation]
     ...  Check that the IUT responds with an error when requested to delete an unknown systemInfo
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.5, clause 5.2.2.1.3
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${None}   SystemInfo    ${REGISTER_ACTION}    
     Remove specific system info resource  ${EXPECTED_SYSTEM_ID}  
     Check HTTP Response Status Code Is    204  
     
-TP_MEC_MEC040_SRV_MEF_005_NF
+TC_MEC_MEC040_SRV_MEF_005_NF
     [Documentation]
     ...  Check that the IUT responds with an error when requested to delete an unknown systemInfo
     ...  ETSI GS MEC 040 V3.1.1, clause clause 7.4.3.5, clause 5.2.2.1.3
     ...  https://www.etsi.org/deliver/etsi_gs/mec/001_099/040/03.01.01_60/gs_mec040v030101p.pdf
+    [Setup]      Test Setup   ${NOT_EXISTING_SYSTEM_ID}   ${None}    ${REMOVE_ACTION}    
     Remove specific system info resource  ${NOT_EXISTING_SYSTEM_ID}  
     Check HTTP Response Status Code Is    404
-############################################################################
 
 
-   
-      
+############################################################################
 *** Keywords ***
+Test Setup 
+    [Arguments]    ${systemId}    ${content}   ${action}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Content-Type":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+     
+    IF    '''${action}''' == '''${REGISTER_ACTION}'''
+       ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
+       ${body}=    Get File    ${file}
+       POST   ${apiRoot}/${apiName}/${apiVersion}/fed_resources/system_info   ${body}
+       ${output}=    Output    response
+       Set Suite Variable    ${setup_response}    ${output}
+    END
+    
+    IF    '''${action}''' == '''${REMOVE_ACTION}'''
+        DELETE   ${apiRoot}/${apiName}/${apiVersion}/fed_resources/system_info/${systemId}
+   END
+    
+Test Teardown  
+    [Arguments]     ${systemId}    ${content}   ${action}
+    Set Headers    {"Accept":"application/json"}
+    Set Headers    {"Content-Type":"application/json"}
+    Set Headers    {"Authorization":"${TOKEN}"}
+     
+    IF    '''${action}''' == '''${REGISTER_ACTION}'''
+       ${file}=    Catenate    SEPARATOR=    jsons/    ${content}    .json
+       ${body}=    Get File    ${file}
+       POST   ${apiRoot}/${apiName}/${apiVersion}/fed_resources/system_info   ${body}
+    END
+    
+    IF    '''${action}''' == '''${REMOVE_ACTION}'''
+        DELETE   ${apiRoot}/${apiName}/${apiVersion}/fed_resources/system_info/${systemId}
+   END
+
+
 Retrieve all system info resources
     Should Be True    ${PIC_MEC_PLAT} == 1
     Should Be True    ${PIC_SERVICES} == 1
diff --git a/MEC040/SRV/environment/variables.txt b/MEC040/SRV/environment/variables.txt
index f445ea346f853c2d302b8547c722723833956cfe..8ac81d51a9ec07c2783ac53729289c441cebac8e 100644
--- a/MEC040/SRV/environment/variables.txt
+++ b/MEC040/SRV/environment/variables.txt
@@ -9,6 +9,13 @@ ${apiRoot}
 ${apiName}                              fed-enablement
 ${apiVersion}                           v1
 
+${REGISTER_ACTION}        REGISTER
+${REMOVE_ACTION}          REMOVE 
+${NO_ACTION}              NO_ACTION
+
+
+${SYSTEM_ID_PLACEHOLDER}        		SYSTEM_ID_PLACEHOLDER
+
 ${EXPECTED_SYSTEM_ID}                   SYSTEM_ID
 ${NOT_EXISTING_SYSTEM_ID}               NOT_EXISTING_SYS_ID
 ${EXPECTED_SYSTEM_ID2}                  SYSTEM_ID2
diff --git a/MEC040/SRV/jsons/SystemInfo.json b/MEC040/SRV/jsons/SystemInfo.json
index 6abc01c25491241b1a7e8c91e9d6a577362c0bb7..c56ee19f43ff9aae95d909bad05400b47c20f649 100644
--- a/MEC040/SRV/jsons/SystemInfo.json
+++ b/MEC040/SRV/jsons/SystemInfo.json
@@ -1,4 +1,4 @@
 {
-  "systemName": "systemNamea",
+  "systemName": "systemName",
   "systemProvider": "systemProvider"
 }
\ No newline at end of file
diff --git a/MEC040/SRV/jsons/SystemInfo2.json b/MEC040/SRV/jsons/SystemInfo2.json
new file mode 100644
index 0000000000000000000000000000000000000000..f4adc3035df0a1ddd21f38fa583b38437f86481e
--- /dev/null
+++ b/MEC040/SRV/jsons/SystemInfo2.json
@@ -0,0 +1,4 @@
+{
+  "systemName": "systemName2",
+  "systemProvider": "systemProvider2"
+}
\ No newline at end of file
diff --git a/MEC040/SRV/jsons/SystemInfo3.json b/MEC040/SRV/jsons/SystemInfo3.json
new file mode 100644
index 0000000000000000000000000000000000000000..6ab6257f61c3ab9c089b8f4adce9d90797cb6c31
--- /dev/null
+++ b/MEC040/SRV/jsons/SystemInfo3.json
@@ -0,0 +1,4 @@
+{
+  "systemName": "systemName3",
+  "systemProvider": "systemProvider3"
+}
\ No newline at end of file
diff --git a/MEC040/SRV/jsons/SystemInfoEmptySystemProvider.json b/MEC040/SRV/jsons/SystemInfoEmptySystemProvider.json
new file mode 100644
index 0000000000000000000000000000000000000000..258706acd04fe6d694a6f175859156640e047362
--- /dev/null
+++ b/MEC040/SRV/jsons/SystemInfoEmptySystemProvider.json
@@ -0,0 +1,4 @@
+{
+  "systemName": "systemName",
+  "systemProvider": ""
+}
\ No newline at end of file