diff --git a/README.md b/README.md
index 10623022c7381b36f66a2894c98c44ab1c56f321..133852e0f1d3c1170e01ae0841d00f1e7ba61efa 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,16 @@
## Introduction
This repositories contains the test specifications and test adapter code for MEC API Conformance Testing in TTCN-3, GS 032-3.
-Latest publicly available drafts are available at https://docbox.etsi.org/isg/mec/open.
-
-**{- Disclaimer: The content of this repository is related to a DRAFT, i.e. a working document, of ETSI ISG MEC. -}**
-{-The content of the repository is provided for information only and is still under development. It may be updated, replaced, or removed at any time. Do not use as reference material. -}
+More information and dowload of the standard at https://portal.etsi.org/webapp/WorkProgram/Report_WorkItem.asp?WKI_ID=56776.
For more information on ETSI ISG Multi-access Edge Computing (MEC), visit https://www.etsi.org/technologies/multi-access-edge-computing.
## Contact information
+
Email at `cti_support` at `etsi` dot `org`.
## License
+
Unless specified otherwise, the content of this repository and the files contained are released under the BSD-3-Clause license.
See the attached LICENSE file or visit https://forge.etsi.org/legal-matters.
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index dc1a87479ac9b3abd00ae71f2f4bba95eb77ecf9..0000000000000000000000000000000000000000
--- a/TODO.md
+++ /dev/null
@@ -1,307 +0,0 @@
-# MEC Testing Framework in TTCN-3- TODO list
-
-## Introduction
-This file provides the list of the TODOs related to the STF 569.
-
-## MEO
-
-### UEAPPCTX
-
-ETSI GS MEC 016 V2.1.1
-
-https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/MEO/UEAPPCTX/SysUeAppsContext.tplan2
-
-
-- TC_MEC_MEO_UEAPPCTX_001_OK To be tested
-
-- TC_MEC_MEO_UEAPPCTX_001_BR To be tested
-
-- TC_MEC_MEO_UEAPPCTX_002_OK To be tested
-
-- TC_MEC_MEO_UEAPPCTX_002_BR To be tested
-
-- TC_MEC_MEO_UEAPPCTX_002_NF To be tested
-
-- TC_MEC_MEO_UEAPPCTX_003_OK To be tested
-
-- TC_MEC_MEO_UEAPPCTX_003_NF To be tested
-
-- TC_MEC_MEO_UEAPPS_001_OK To be tested
-
-- TC_MEC_MEO_UEAPPS_001_BR To be tested
-
-- TC_MEC_MEO_UEAPPS_001_NF To be tested
-
-
-### UEAPPS
-
-ETSI GS MEC 016 V2.1.1
-
-https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/MEO/UEAPPS/SysUeApplications.tplan2
-
-
-## SRV
-
-### AMS
-Early draft ETSI GS MEC 021 2.0.8
-
-https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/AMS/Ams_BV.tplan2
-https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/AMS/Ams_BO_BI.tplan2
-
-
-- TP_MEC_SRV_AMS_001_OK To be tested
-
-- TP_MEC_SRV_AMS_001_BR To be tested
-
-- TP_MEC_SRV_AMS_002_OK To be tested
-
-- TP_MEC_SRV_AMS_002_BR To be tested
-
-- TP_MEC_SRV_AMS_003_OK To be tested
-
-- TP_MEC_SRV_AMS_003_BR To be tested
-
-- TP_MEC_SRV_AMS_004_OK To be tested
-
-- TP_MEC_SRV_AMS_004_BR To be tested
-
-- TP_MEC_SRV_AMS_005_OK To be tested
-
-- TP_MEC_SRV_AMS_005_NF To be tested
-
-- TP_MEC_SRV_AMS_006_OK To be tested
-
-- TP_MEC_SRV_AMS_006_NF To be tested
-
-- TP_MEC_SRV_AMS_007_OK To be tested
-
-- TP_MEC_SRV_AMS_007_BR To be tested
-
-- TP_MEC_SRV_AMS_007_NF To be tested
-
-- TP_MEC_SRV_AMS_008_OK To be tested
-
-- TP_MEC_SRV_AMS_008_OK To be tested
-
-- TP_MEC_SRV_AMS_010_OK To be tested
-
-
-### APPSAQ
-
-### APPSUB
-
-### BWA
-
-### DNS
-
-### FAIS
-
-### RLOCLOOK
-
-ETSI GS MEC 013 V1.5.0
-
-https://forge.etsi.org/gitlab/mec/gs013-location-api/blob/master/LocationAPI.yaml#/definitions/AccessPointList
-
-- TC_MEC_PLAT_RLOCLOOK_001_OK To be tested
-
-- TC_MEC_PLAT_RLOCLOOK_001_NF To be tested
-
-
-### RNIS
-
-Draft ETSI GS MEC 012 2.0.4
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisAllSubscription_BV.tplan2
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisAllubscription_BI_BO.tplan2
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BV.tplan2
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisSpecificSubscription_BI_BO.tplan2
-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
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/RNIS/RnisNotifications.tplan2
-
-- TC_MEC_SRV_RNIS_001_OK To be tested
-
-- TC_MEC_SRV_RNIS_002_OK To be tested
-
-- TC_MEC_SRV_RNIS_003_OK To be tested
-
-- TC_MEC_SRV_RNIS_004_OK To be tested
-
-- TC_MEC_SRV_RNIS_005_OK To be tested
-
-- TC_MEC_SRV_RNIS_006_OK To be tested
-
-- TC_MEC_SRV_RNIS_007_OK To be tested
-
-- TC_MEC_SRV_RNIS_008_OK To be tested
-
-- TODO TC_MEC_SRV_RNIS_009_OK & TC_MEC_SRV_RNIS_010_OK
-
-- TC_MEC_SRV_RNIS_011_OK To be tested
-
-- TC_MEC_SRV_RNIS_012_OK To be tested
-
-- TC_MEC_SRV_RNIS_011_BR To be tested
-
-- TC_MEC_SRV_RNIS_012_BR To be tested
-
-- TC_MEC_SRV_RNIS_016_OK To be tested
-
-- TC_MEC_SRV_RNIS_016_BR To be tested
-
-- TC_MEC_SRV_RNIS_016_NF To be tested
-
-- TC_MEC_SRV_RNIS_017_OK To be tested
-
-- TC_MEC_SRV_RNIS_017_BR To be tested
-
-- TC_MEC_SRV_RNIS_017_NF To be tested
-
-- TC_MEC_SRV_RNIS_018_OK To be tested
-
-- TC_MEC_SRV_RNIS_018_BR To be tested
-
-- TC_MEC_SRV_RNIS_018_NF To be tested
-
-- TC_MEC_SRV_RNIS_019_OK To be tested
-
-- TC_MEC_SRV_RNIS_019_BR To be tested
-
-- TC_MEC_SRV_RNIS_019_NF To be tested
-
-### SAQ
-
-### SRVSUB
-
-### TIME
-
-### TRAF
-
-Draft ETSI GS MEC 011 V2.0.9 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/TRAF/PlatTrafficRules.tplan2
-
-- TC_MEC_SRV_TRANS_001_OK To be tested
-- TC_MEC_SRV_TRAF_001_OK To be tested
-- TC_MEC_SRV_TRAF_002_OK To be tested
-- TC_MEC_SRV_TRAF_003_OK To be tested
-- TC_MEC_SRV_TRAF_001_NF To be tested
-
-### TRANS
-
-Draft ETSI GS MEC 011 V2.0.9 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/TRANS/PlatTransport.tplan2
-
-- TP_MEC_SRV_TRAF_001_OK To be tested
-
-### UEAREASUB
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UEDISTSUB/PlatUeAreaSubscription.tplan2
-
-TODO CircleNotificationSubscription data structure not found
-
-### UEDISTLOOK
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UEDISTLOOK/PlatUeDistanceSubscription.tplan2
-
-TODO TerminalDistance data structure not found
-
-### UEDISTSUB
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UEDISTSUB/PlatUeDistanceSubscription.tplan2
-
-TODO DistanceNotificationSubscription data structure not found
-
-### UEINFLOOK
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UEINFLOOK/PlatUeInformationLookup.tplan2
-
-- TC_MEC_SRV_UEINFLOOK_001_OK To be tested
-
-- TC_MEC_SRV_UEINFLOOK_001_BR To be tested
-
-- TC_MEC_SRV_UEINFLOOK_001_NF To be tested
-
-### UEINFSUB
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UEINFSUB/PlatUeInformationSubscription.tplan2
-
-- TC_MEC_SRV_UEINFSUB_001_OK To be tested
-
-- TC_MEC_SRV_UEINFSUB_001_BR To be tested
-
-- TC_MEC_SRV_UEINFSUB_002_OK To be tested
-
-- TC_MEC_SRV_UEINFSUB_002_NF To be tested
-
-### UELOCLOOK
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/MEC-tests/blob/master/Test%20Purposes/SRV/UELOC/PlatUeLocationLookup.tplan2
-
-- TC_MEC_SRV_UELOCLOOK_001_OK Done
-
-- TC_MEC_SRV_UELOCLOOK_001_BR To be tested
-
-- TC_MEC_SRV_UELOCLOOK_001_NF To be tested
-
-### UELOCSUB
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UELOCSUB/PlatUeLocationSubscription.tplan2
-
-- TC_MEC_SRV_UELOCSUB_001_OK Done
-
-- TC_MEC_SRV_UELOCSUB_001_BR Done
-
-- TC_MEC_SRV_UELOCSUB_002_OK Done
-
-- TC_MEC_SRV_UELOCSUB_002_NF Done
-
-### UETAG
-
-ETSI GS MEC 014 V1.1.1 (2018-02)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/UETAG/PlatUeIdentity.tplan2
-
-- TC_MEC_SRV_UETAG_001_OK To be tested
-
-- TC_MEC_SRV_UETAG_001_BR To be tested
-
-- TC_MEC_SRV_UETAG_001_NF To be tested
-
-- TC_MEC_SRV_UETAG_002_OK To be tested
-
-- TC_MEC_SRV_UETAG_002_BR To be tested
-
-- TC_MEC_SRV_UETAG_002_NF Done
-
-- TC_MEC_SRV_UETAG_002_PF Done
-
-### UETRACKSUB
-
-Draft ETSI GS MEC 013 V2.0.3 (2018-10)
-
-https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UETRACKSUB/PlatUeTrackingSubscription.tplan2
-
-- TC_MEC_SRV_UETRACKSUB_001_OK To be tested
-
-- TC_MEC_SRV_UETRACKSUB_001_BR To be tested
-
-- TC_MEC_SRV_UETRACKSUB_002_OK To be tested
-
-- TC_MEC_SRV_UETRACKSUB_002_NF To be tested
-
diff --git a/docker/Dockerfile.stfubuntu b/docker/Dockerfile.stfubuntu
index 74ca510d02b01c64d3c171c7fa97c4abdb4b3d88..ffc135d51d90d68363d9548ad61c7752ddbb8637 100644
--- a/docker/Dockerfile.stfubuntu
+++ b/docker/Dockerfile.stfubuntu
@@ -32,12 +32,14 @@ RUN echo "docker-STF-dev" > /etc/hostname \
gnutls-bin \
graphviz \
iputils-ping \
+ libedit-dev \
libffi-dev \
libglib2.0-dev \
libgcrypt-dev \
libncurses5-dev \
libpcap-dev \
libqt5svg5-dev \
+ libreadline-dev \
libssl-dev \
libtool-bin \
libtool \