diff --git a/src/tests/scenario2/descriptors_emulated.json b/src/tests/scenario2/descriptors_emulated.json
deleted file mode 100644
index 83f9c39e2ac7154b088ccdd0a1519ea32c1aee1d..0000000000000000000000000000000000000000
--- a/src/tests/scenario2/descriptors_emulated.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "contexts": [
- {
- "context_id": {"context_uuid": {"uuid": "admin"}},
- "topology_ids": [],
- "service_ids": []
- }
- ],
- "topologies": [
- {
- "topology_id": {"topology_uuid": {"uuid": "admin"}, "context_id": {"context_uuid": {"uuid": "admin"}}},
- "device_ids": [],
- "link_ids": []
- }
- ],
- "devices": [
- {
- "device_id": {"device_uuid": {"uuid": "R1-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "R2-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "R3-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "R4-EMU"}},
- "device_type": "emu-packet-router",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- },
- {
- "device_id": {"device_uuid": {"uuid": "O1-OLS"}},
- "device_type": "emu-open-line-system",
- "device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
- {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
- {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"aade6001-f00b-5e2f-a357-6a0a9d3de870\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"eb287d83-f05e-53ec-ab5a-adf6bd2b5418\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"0ef74f99-1acc-57bd-ab9d-4b958b06c513\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"50296d99-58cc-5ce7-82f5-fc8ee4eec2ec\"}]}"}}
- ]},
- "device_operational_status": 1,
- "device_drivers": [0],
- "device_endpoints": []
- }
- ],
- "links": [
- {
- "link_id": {"link_uuid": {"uuid": "R1-EMU/13/0/0==O1-OLS/aade6001-f00b-5e2f-a357-6a0a9d3de870"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R1-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "aade6001-f00b-5e2f-a357-6a0a9d3de870"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R2-EMU/13/0/0==O1-OLS/eb287d83-f05e-53ec-ab5a-adf6bd2b5418"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R2-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "eb287d83-f05e-53ec-ab5a-adf6bd2b5418"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R3-EMU/13/0/0==O1-OLS/0ef74f99-1acc-57bd-ab9d-4b958b06c513"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R3-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "0ef74f99-1acc-57bd-ab9d-4b958b06c513"}}
- ]
- },
- {
- "link_id": {"link_uuid": {"uuid": "R4-EMU/13/0/0==O1-OLS/50296d99-58cc-5ce7-82f5-fc8ee4eec2ec"}},
- "link_endpoint_ids": [
- {"device_id": {"device_uuid": {"uuid": "R4-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},
- {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "50296d99-58cc-5ce7-82f5-fc8ee4eec2ec"}}
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/src/tests/scenario2/run_test_01_bootstrap.sh b/src/tests/scenario2/old_tests/run_test_01_bootstrap.sh
similarity index 100%
rename from src/tests/scenario2/run_test_01_bootstrap.sh
rename to src/tests/scenario2/old_tests/run_test_01_bootstrap.sh
diff --git a/src/tests/scenario2/run_test_02_create_service.sh b/src/tests/scenario2/old_tests/run_test_02_create_service.sh
similarity index 100%
rename from src/tests/scenario2/run_test_02_create_service.sh
rename to src/tests/scenario2/old_tests/run_test_02_create_service.sh
diff --git a/src/tests/scenario2/run_test_03_delete_service.sh b/src/tests/scenario2/old_tests/run_test_03_delete_service.sh
similarity index 100%
rename from src/tests/scenario2/run_test_03_delete_service.sh
rename to src/tests/scenario2/old_tests/run_test_03_delete_service.sh
diff --git a/src/tests/scenario2/run_test_04_cleanup.sh b/src/tests/scenario2/old_tests/run_test_04_cleanup.sh
similarity index 100%
rename from src/tests/scenario2/run_test_04_cleanup.sh
rename to src/tests/scenario2/old_tests/run_test_04_cleanup.sh
diff --git a/src/tests/scenario2/run_tests_and_coverage.sh b/src/tests/scenario2/old_tests/run_tests_and_coverage.sh
similarity index 100%
rename from src/tests/scenario2/run_tests_and_coverage.sh
rename to src/tests/scenario2/old_tests/run_tests_and_coverage.sh
diff --git a/src/tests/scenario2/tests/.gitignore b/src/tests/scenario2/old_tests/tests/.gitignore
similarity index 100%
rename from src/tests/scenario2/tests/.gitignore
rename to src/tests/scenario2/old_tests/tests/.gitignore
diff --git a/src/tests/scenario2/tests/BuildDescriptors.py b/src/tests/scenario2/old_tests/tests/BuildDescriptors.py
similarity index 94%
rename from src/tests/scenario2/tests/BuildDescriptors.py
rename to src/tests/scenario2/old_tests/tests/BuildDescriptors.py
index 5c5419190487eb5089e4a30f523dca43fa3870f2..98b78863318a7ad682fc5f970d44d02240b45a26 100644
--- a/src/tests/scenario2/tests/BuildDescriptors.py
+++ b/src/tests/scenario2/old_tests/tests/BuildDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/Fixtures.py b/src/tests/scenario2/old_tests/tests/Fixtures.py
similarity index 96%
rename from src/tests/scenario2/tests/Fixtures.py
rename to src/tests/scenario2/old_tests/tests/Fixtures.py
index e97006e4da655998bab924d6b6a2a808fed87b69..225147fc0cd243060e07163df46403965d7a74ab 100644
--- a/src/tests/scenario2/tests/Fixtures.py
+++ b/src/tests/scenario2/old_tests/tests/Fixtures.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/LoadDescriptors.py b/src/tests/scenario2/old_tests/tests/LoadDescriptors.py
similarity index 95%
rename from src/tests/scenario2/tests/LoadDescriptors.py
rename to src/tests/scenario2/old_tests/tests/LoadDescriptors.py
index 33bc699af933601e4c6d4b8dbc7b0c51206241ef..b232935f4675d718d55e67fe3a76012a39398dda 100644
--- a/src/tests/scenario2/tests/LoadDescriptors.py
+++ b/src/tests/scenario2/old_tests/tests/LoadDescriptors.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/Objects.py b/src/tests/scenario2/old_tests/tests/Objects.py
similarity index 99%
rename from src/tests/scenario2/tests/Objects.py
rename to src/tests/scenario2/old_tests/tests/Objects.py
index d2fb32ebb20b7bcdda9ac12b7a7390c46e6fb1d1..7eea0f4c3262793e9ba00ae80c66cc5b1ed0b8dc 100644
--- a/src/tests/scenario2/tests/Objects.py
+++ b/src/tests/scenario2/old_tests/tests/Objects.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/__init__.py b/src/tests/scenario2/old_tests/tests/__init__.py
similarity index 88%
rename from src/tests/scenario2/tests/__init__.py
rename to src/tests/scenario2/old_tests/tests/__init__.py
index 70a33251242c51f49140e596b8208a19dd5245f7..1549d9811aa5d1c193a44ad45d0d7773236c0612 100644
--- a/src/tests/scenario2/tests/__init__.py
+++ b/src/tests/scenario2/old_tests/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_bootstrap.py b/src/tests/scenario2/old_tests/tests/test_functional_bootstrap.py
similarity index 99%
rename from src/tests/scenario2/tests/test_functional_bootstrap.py
rename to src/tests/scenario2/old_tests/tests/test_functional_bootstrap.py
index cb4d481b22d93b436718f1ee93d70ec6102a25f5..cfe21603de85862e83d7dd8b9fb4eebefd99b702 100644
--- a/src/tests/scenario2/tests/test_functional_bootstrap.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_bootstrap.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_cleanup.py b/src/tests/scenario2/old_tests/tests/test_functional_cleanup.py
similarity index 98%
rename from src/tests/scenario2/tests/test_functional_cleanup.py
rename to src/tests/scenario2/old_tests/tests/test_functional_cleanup.py
index 3900af0dc43a5c01db7f9f583d6955298c5660e2..3a9843af69db4c0369b88c87985a0293b6aae605 100644
--- a/src/tests/scenario2/tests/test_functional_cleanup.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_cleanup.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_create_service.py b/src/tests/scenario2/old_tests/tests/test_functional_create_service.py
similarity index 99%
rename from src/tests/scenario2/tests/test_functional_create_service.py
rename to src/tests/scenario2/old_tests/tests/test_functional_create_service.py
index d5b9caa0f833379e5755c3a84eafcaf92f628c68..bc91b70d99313101211e3f49074a26d37067f8c0 100644
--- a/src/tests/scenario2/tests/test_functional_create_service.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_create_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/src/tests/scenario2/tests/test_functional_delete_service.py b/src/tests/scenario2/old_tests/tests/test_functional_delete_service.py
similarity index 98%
rename from src/tests/scenario2/tests/test_functional_delete_service.py
rename to src/tests/scenario2/old_tests/tests/test_functional_delete_service.py
index 5d9568cd81906ac76b600a2253a5e0bdf741bc01..58869a2e0d7bd422c75ba165a192043b77c98a7f 100644
--- a/src/tests/scenario2/tests/test_functional_delete_service.py
+++ b/src/tests/scenario2/old_tests/tests/test_functional_delete_service.py
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.