diff --git a/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md b/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md
index 2898ee596f0474ca1a8537bc769b2fd147b90017..31892ce16715dad47b3ab00b96066e80896433bb 100644
--- a/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md
+++ b/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md
@@ -1,5 +1,5 @@
 
-![media/image1.png](media/image1.png)
+![__CAPTION__](media/image1.png)
 
 
 
@@ -9,9 +9,9 @@
 
 |oneM2M<br />Technical Specification |oneM2M<br />Technical Specification |
 |-|-|
-|Document Number |oneM2M-TS-0019-V-2.7.0 |
+|Document Number |oneM2M-TS-0019-V-2.8.0 |
 |Document Name: |Abstract Test Suite and Implementation eXtra Information for Test  |
-|Date: |2022 January  26 |
+|Date: |2023 April 20 |
 |Abstract: |Abstract Test Suite and Implementation eXtra Information for Test consists of :<br />-	Definition of the Abstract Protocol Tester (APT)<br />-	Definition of TTCN-3 test architecture<br />-	Development of TTCN-3 test suite, e.g. naming conventions, code documentation, test case structure.<br />-	IXIT proforma; <br /> |
 |Template Version:23 February 2015 (Do not modify) |Template Version:23 February 2015 (Do not modify) |
 
@@ -107,13 +107,12 @@ NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURA
 &nbsp;&nbsp;&nbsp;&nbsp;[7.3 IXIT](#73-ixit)  
 [8 TTCN-3 Verifications](#8-ttcn-3-verifications)  
 [Annex A (normative): TTCN-3 library modules](#annex-a-normative-ttcn-3-library-modules)  
-&nbsp;&nbsp;&nbsp;&nbsp;[A.1 Electronic annex, zip file with TTCN-3 code](#a1-electronic-annex-zip-file-with-ttcn-3-code)  
+[A.1 Electronic annex, zip file with TTCN-3 code](#a1-electronic-annex-zip-file-with-ttcn-3-code)  
 [Annex B (informative): Bibliography](#annex-b-informative-bibliography)  
 [History](#history)  
 
 
 
-
 # 1 Scope
 The present document contains the Abstract Test Suite (ATS) for oneM2M as defined in oneM2M TS-0001 <a href="#_ref_1">[1]</a> and oneM2M TS-0004 <a href="#_ref_2">[2]</a> in compliance with the relevant requirements and in accordance with the relevant guidance given in ISO/IEC 96467 <a href="#_ref_5">[5]</a>.
 
@@ -208,9 +207,7 @@ An abstract protocol tester (APT) is a process that provides behaviours for test
 APTs used by the oneM2M test suite are described in figure 5.1-1. The test system will simulate valid and invalid protocol behaviour, and will analyse the reaction of the IUT.
 
 
-![media/image2.png](media/image2.png)                           ![media/image3.png](media/image3.png)
-
-![media/image4.png](media/image4.png)                           ![media/image5.png](media/image5.png) 
+![Figure 5.1-1: Abstract protocol testers - oneM2M](media/image2bis.png)
 
 **Figure 5.1-1: Abstract protocol testers - oneM2M**
 
@@ -228,7 +225,7 @@ Figure 5.2.1-1 shows a AE test configuration which is mapped to CF03 in clause 6
 The TTCN-3 Test Component in Test System sends triggering actions or behaviour to the Upper Tester Application of SUT through upper tester transport link Ut while the IUT sends/receives oneM2M service primitives through Mca to/from CSE in Test System.
 
 
-![media/image6.png](media/image6.png)
+![Figure 5.2.1-1: AE test configuration](media/image6.png)
 
 **Figure 5.2.1-1: AE test configuration**
 
@@ -240,7 +237,7 @@ The approach for the implementation of an Abstract Protocol Tester selected in o
 Following this recommendation the oneM2M tester architecture comprises a non-platform dependent Test Suite, and a platform dependent part.
 
 
-![media/image7.png](media/image7.png)
+![Figure 5.3-1: High level oneM2M Test Architecture](media/image7.png)
 > NOTE:    However, it can be implemented in a semi-independent manner, which will minimize the dependency to those elements.
 > 
 
@@ -263,7 +260,7 @@ The test algorithms use the interfaces defined in <a href="#_ref_1">[1]</a> and
 In TTCN-3 these two interfaces have been implemented through a set of logical TTCN-3 ports (mcaPort and mcaPortIn for mca interface, and mccPort and mccPortIn for mcc interface) which allows oneM2M message primitives exchange with the IUT.
 
 
-![media/image8.png](media/image8.png)
+![Figure 5.3-2: oneM2M Test Architecture](media/image8.png)
 
 **Figure 5.3-2: oneM2M Test Architecture**
 
@@ -323,7 +320,7 @@ Both primitives contain another parameters that permits to dynamically configure
 - Serialization
 - ForceFields: used to force invalid or empty values to certain attributes. This behaviour shall be implemented by the System Adaptor.
 
-**Table 5.4.1-1: Mapping of TTCN-3 Primitives to oneM2M Service Primitives**
+**Table 5.4.1-1: Mapping of TTCN-3 Primitives to oneM2M Service Primitives**<a name="table_5.4.1-1"></a>
 
 |TTCN-3 Primitive |oneM2M Message |Direction |IUT |
 |-|-|-|-|
@@ -360,7 +357,7 @@ oneM2M service Primitive defined for utPort is listed as follows:
 The Upper Tester Application in SUT can be implemented as an embedded source code. An example for implementation of automated AE test for Registration is shown as figure 5.4.2.1-1.
 
 
-![media/image9.png](media/image9.png)
+![Figure 5.4.2.1-1: Example of automated AE test using Ut interface](media/image9.png)
 
 **Figure 5.4.2.1-1: Example of automated AE test using Ut interface**
 
@@ -374,7 +371,7 @@ The upper tester triggering message is used to transport control commands betwee
 The upper tester triggering message type maps to particular message formats for exchanging data and those message formats are defined by TTCN-3 primitive as shown at table 5.4.2.2.1-1, UtTrigger and UtTriggerAck primitive.
 
 
-**Table 5.4.2.2.1-1: Mapping of TTCN-3 Primitives to oneM2M Service Primitives**
+**Table 5.4.2.2.1-1: Mapping of TTCN-3 Primitives to oneM2M Service Primitives**<a name="table_5.4.2.2.1-1"></a>
 
 |Upper Tester Control Message Type |TTCN-3 Primitives |Direction |Direction |
 |-|-|-|-|
@@ -388,7 +385,8 @@ The upper tester triggering message type maps to particular message formats for
 ##### 5.4.2.2.2 UtTrigger and UtTriggerAck Primitives
 The UtTrigger primitive is initialized by the Test System to send triggering message to the target IUT as depicted in figure 5.4.2.2.2-1. The IUT will send acknowledgement message back to the Test System using UtTriggerAck primitive if trigger message is successfully transported to the IUT. Then IUT starts interaction with Test System through oneM2M request and response primitives.
 
-![media/image10.png](media/image10.png)
+
+![Figure 5.4.2.2.2-1: Example of automated AE test using Ut interface](media/image10.png)
 
 **Figure 5.4.2.2.2-1: Trigger message flow**
 
@@ -398,7 +396,7 @@ Table 5.4.2.2.2-1 defines UtTrigger and UtTriggerAck primitives including oneM2M
 
 
 
-**Table 5.4.2.2.2-1: UtTrigger and UtTriggerAck Primitive**
+**Table 5.4.2.2.2-1: UtTrigger and UtTriggerAck Primitive**<a name="table_5.4.2.2.2-1"></a>
 
 |Ut Control Primitive |Mapping to oneM2M data types |Description |Reference |Triggering Message |HTTP message |
 |-|-|-|-|-|-|
@@ -414,23 +412,26 @@ Table 5.4.2.2.2-1 defines UtTrigger and UtTriggerAck primitives including oneM2M
 
 ****
 
-**Table 5.4.2.2.2-2: Rules for defining UtTrigger and UtTriggerAck primitives**
+The rules for defining UtTrigger and UtTriggerAck primitives are:
 
 1. UtTrigger primitive is represented in requestPrimitive serialized in JSON format. 
+
 1. UtTrigger primitive shall be interpreted as follows:
-	- Any attribute/parameter containing a value shall be present and equal in the triggered request primitive.
-	- Any attribute/parameter containing "UNINITIALIZED" value shall be present in the triggered request primitive.
-	- Any other attribute/parameter shall comply with oneM2M TS-0004 [2].
+    - Any attribute/parameter containing a value shall be present and equal in the triggered request primitive.
+    - Any attribute/parameter containing "UNINITIALIZED" value shall be present in the triggered request primitive.
+    - Any other attribute/parameter shall comply with oneM2M TS-0004 <a href="#_ref_2">[2]</a>.
+
 1. Parameters within UtTrigger are listed as following:
-    - operation: (mandatory)operation type that IUT is triggered to perform.
-	- resourceType: (optional)resource type of a target resource against which IUT is triggered to perform certain operation
-	- to: (mandatory)target resource against which IUT is triggered to perform certain operation. 
-	- primitiveContent:(optional)represents the resource attributes that shall be included in the requestPrimitive.
+    - operation: (mandatory) operation type that IUT is triggered to perform.
+    - resourceType: (optional) resource type of a target resource against which IUT is triggered to perform certain operation
+    - to: (mandatory) target resource against which IUT is triggered to perform certain operation. 
+    - primitiveContent: (optional) represents the resource attributes that shall be included in the requestPrimitive.
+
 
 
 
 
-**Table 5.4.2.2.2-3: Definition of ResponseStatusCode for UtTriggerAck primitive**
+**Table 5.4.2.2.2-3: Definition of ResponseStatusCode for UtTriggerAck primitive**<a name="table_5.4.2.2.2-3"></a>
 
 |Response Status Code Description |Response Status Code Value |Interpretation |
 |-|-|-|
@@ -463,7 +464,7 @@ The infoPort is included in the oneM2M ATS in order for the TTCN-3 test componen
 The Tester test component includes a set of ports, timers and variables that are common to the other defined components which are described in table 5.5.1-1.
 
 
-**Table 5.5.1-1: Tester component elements**
+**Table 5.5.1-1: Tester component elements**<a name="table_5.5.1-1"></a>
 
 |Name |Instance type |Element type |Description |
 |-|-|-|-|
@@ -495,7 +496,7 @@ Note that vc_aeSimu and vc_cseSimu are not common to the other defined test comp
 The AeSimu test component extends the Tester component by adding elements specific to an AE entity. Table 5.5.2-1 summarizes those elements.
 
 
-**Table 5.5.2-1: AeSimu component elements**
+**Table 5.5.2-1: AeSimu component elements**<a name="table_5.5.2-1"></a>
 
 |Name |Instance type |Element type |Description |
 |-|-|-|-|
@@ -513,7 +514,7 @@ The AeSimu test component extends the Tester component by adding elements specif
 The CseSimu test component extends the Tester component by adding elements specific to an CSE entity. Table 5.5.3-1 summarizes those elements.
 
 
-**Table 5.5.3-1: CseSimu component elements**
+**Table 5.5.3-1: CseSimu component elements**<a name="table_5.5.3-1"></a>
 
 |Name |Instance type |Element type |Description |
 |-|-|-|-|
@@ -536,7 +537,8 @@ This clause introduces the test strategy being used for the TTCN-3 test cases. T
 
 The use of the TTCN-3 MTC and PTC(s) is as depicted in figure 5.6-1.
 
-![media/image11.png](media/image11.png)
+
+![Figure 5.6-1: Use of TTCN-3 components](media/image11.png)
 
 **Figure 5.6-1: Use of TTCN-3 components**
 
@@ -617,7 +619,7 @@ The naming convention is based on the following underlying principles:
 Table 7.2.1-1 specifies the naming guidelines for each element of the TTCN3 language indicating the recommended prefix, suffixes (if any) and capitalization.
 
 
-**Table 7.2.1-1: TTCN-3 generic naming conventions**
+**Table 7.2.1-1: TTCN-3 generic naming conventions**<a name="table_7.2.1-1"></a>
 
 |Language element |Naming convention |Prefix |Example identifier |
 |-|-|-|-|
@@ -688,7 +690,7 @@ Furthermore, the following rules are applied too:
 
 ### 7.2.4 Test Case (TC) identifier
 
-**Table 7.2.4-1: TC naming convention**
+**Table 7.2.4-1: TC naming convention**<a name="table_7.2.4-1"></a>
 
 |Identifier: |TC_&lt;root>_&lt;gr>_&lt;sgr>_&lt;nn>_&lt;per> | | |
 |-|-|-|-|
@@ -711,14 +713,15 @@ Furthermore, the following rules are applied too:
 
 
 
-`EXAMPLE:    TP identifier:    TP/oneM2M/CSE/DMR/CRE/001<br />TC identifier:    TC_ONEM2M_CSE_DMR_CRE_001.`  
+`EXAMPLE:    TP identifier:    TP/oneM2M/CSE/DMR/CRE/001`  
+`TC identifier:    TC_ONEM2M_CSE_DMR_CRE_001.`  
 
 ## 7.3 IXIT
 
 The following parameters are used by the oneM2M ATS for the correct execution of the test cases.
 
 
-**Table 7.3-1: oneM2M ATS IXITs**
+**Table 7.3-1: oneM2M ATS IXITs**<a name="table_7.3-1"></a>
 
 |GROUP |IXIT NAME |DESCRIPTION |DEFAULT VALUE |
 |-|-|-|-|
@@ -765,16 +768,14 @@ All test cases provided with the present document in annex A which correspond to
 
 # Annex A (normative): TTCN-3 library modules
 
-## A.1 Electronic annex, zip file with TTCN-3 code
+# A.1 Electronic annex, zip file with TTCN-3 code
 This ATS has been produced using the Testing and Test Control Notation (TTCN) according to ETSI ES 201 873-1 <a href="#_ref_6">[6]</a>.
 
 This test suite has been compiled error-free using two different commercial TTCN-3 compilers.
 
 The TTCN-3 library modules, which form parts of the present document, are contained in the following gitLab tag:
 
-[https://git.onem2m.org/TST/ATS/tags/TS-0019-baseline-v2_7_0](https://git.onem2m.org/TST/ATS/tags/TS-0019-baseline-v2_7_0)  
-
-<br />
+[https://git.onem2m.org/TST/ATS/-/tags/TS-0019-baseline-v2_8_0](https://git.onem2m.org/TST/ATS/-/tags/TS-0019-baseline-v2_8_0)<br />
 
 
 # Annex B (informative): Bibliography
@@ -796,6 +797,5 @@ oneM2M TS-0031: "Feature catalogue".
 |V2.4.0 |Sep 2019 |Integrated approved contributions:<br />TDE-2019-0162-TTCN-3_Test_cases |
 |V2.5.0 |May 2020 |Integrated approved contributions:<br />TDE-2020-0043-<br />- |
 |V2.6.0 |Jan 2021 |Integrated approved contributions:<br />TDE-2020-0105-TS-0019_TTCN3_Test_cases_R2 |
-|V2.7.0 |Jan 2022 |Integrated approved contributions:<br />TDE-2021-0070-TS-0019_TTCN3_Test_cases_R2<br />TDE-2022-0001-TS-0019_Update_Test_components_variables_R2 |
 
 
diff --git a/media/image2bis.png b/media/image2bis.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c7741582a5829f377c93dc30c4b2226fe9e5501
Binary files /dev/null and b/media/image2bis.png differ
diff --git a/media/image5.png b/media/image5.png
index 5cbe262e726ebda36bf5dcc9306c1a349b4e7640..2f233d66080dc34cc886239d42d181dce07f6f21 100644
Binary files a/media/image5.png and b/media/image5.png differ
diff --git a/media/image6.png b/media/image6.png
index 20fd8a6f6955368a74cf55640dce246a884014b5..8735717ee482fc0c2d58f49c2ae60dbccdec3cf1 100644
Binary files a/media/image6.png and b/media/image6.png differ
diff --git a/media/image8.png b/media/image8.png
index 105bffbc32bf3377222b63efd2d247134484b9b7..efd8ceb0b313410bf35ef1a49940820021932cba 100644
Binary files a/media/image8.png and b/media/image8.png differ
diff --git a/media/image9.png b/media/image9.png
index a7938a3ceb2b3d8888a3a873a44929482bcdcf02..6e4699cce9f300c419d822b0a970f2c648f4f688 100644
Binary files a/media/image9.png and b/media/image9.png differ