diff --git a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
index 53e193fb60daee17ea9d0909ff61f877fee57bd1..badf0b4553bfbbb23e20c7cc4e191d01563a151a 100644
--- a/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
+++ b/ttcn/AtsCAM/ItsCam_TpFunctions.ttcn
@@ -3069,7 +3069,6 @@ module ItsCam_TpFunctions {
     
             function f_CAM_MSD_SSP_BO_01() runs on ItsCam {
                 
-                // TODO: make template for tolling
                 log("*** " & testcasename() & ": This TC is not implemented yet ***");
                 setverdict(inconc);
                 stop;
@@ -3229,7 +3228,6 @@ module ItsCam_TpFunctions {
     
             function f_CAM_MSP_SSP_BV_01() runs on ItsCam {
                 
-                // TODO: make template for tolling
                 log("*** " & testcasename() & ": This TC is not implemented yet ***");
                 setverdict(inconc);
                 stop;
diff --git a/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn b/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn
index ca555a825744512e9b50f4c716c00523b0dc19f6..63d2310c55dc4dc97ed45bdf10c92a3a15e1f568 100644
--- a/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn
+++ b/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn
@@ -1688,7 +1688,6 @@ module ItsIpv6OverGeoNetworking_TestCases {
              * @see         ETSI TS 102 859-2 v2.1.1 TP/IPv6GEO/MR/GVL/BV/07
              * @reference   ETSI EN 302 636-6-1 clauses, 8.2.2
              */
-            //TODO check the used addresses!!!
             testcase TC_IPV6GEO_MR_GVL_BV_07() runs on ItsIpv6OverGeoNetworking system ItsIpv6OverGeoNetworkingSystem {
                 
                 // Local variables
@@ -1906,7 +1905,6 @@ module ItsIpv6OverGeoNetworking_TestCases {
              * @see         ETSI TS 102 859-2 v2.1.1 TP/IPv6GEO/MR/GVL/BV/09
              * @reference   ETSI EN 302 636-6-1 clauses, 8.2.2
              */
-            //TODO check the used addresses!!!
             testcase TC_IPV6GEO_MR_GVL_BV_09() runs on ItsIpv6OverGeoNetworking system ItsIpv6OverGeoNetworkingSystem {
                 
                 // Local variables
diff --git a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
index 90dfbb6e3a17ed07bfaef99f5e3679c3a3ac428d..86669b6331d3eb8222dbb5d095237fea10620ad7 100644
--- a/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
+++ b/ttcn/AtsIVIM/ItsIvim_TestCases.ttcn
@@ -47,7 +47,7 @@ module ItsIvim_TestCases {
              *     }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_MSGF_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_MSGF_BV_01
              * @reference ETSI TS 103 301 v1.1.1, clause 7.3
              */
             testcase TC_IS_IVI_MSGF_BV_01() runs on ItsIvim system ItsIvimSystem {
@@ -79,7 +79,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVGN_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVGN_BV_01
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.1
              */
             testcase TC_IS_IVI_EVGN_BV_01() runs on ItsIvim system ItsIvimSystem {
@@ -112,7 +112,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVGN_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVGN_BV_02
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.1
              */
             testcase TC_IS_IVI_EVGN_BV_02() runs on ItsIvim system ItsIvimSystem {
@@ -151,7 +151,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVGN_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVGN_BV_03
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.1
              */
             testcase TC_IS_IVI_EVGN_BV_03() runs on ItsIvim system ItsIvimSystem {
@@ -183,7 +183,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVGN_BV_04
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVGN_BV_04
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVGN_BV_04() runs on ItsIvim system ItsIvimSystem {
@@ -216,7 +216,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVGN_BV_05@reference 
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVGN_BV_05@reference 
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVGN_BV_05() runs on ItsIvim system ItsIvimSystem {
@@ -259,7 +259,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVUP_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVUP_BV_01
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVUP_BV_01() runs on ItsIvim system ItsIvimSystem {
@@ -299,7 +299,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVUP_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVUP_BV_02
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVUP_BV_02() runs on ItsIvim system ItsIvimSystem {
@@ -339,7 +339,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVUP_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVUP_BV_03
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVUP_BV_03() runs on ItsIvim system ItsIvimSystem {
@@ -379,7 +379,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVUP_BV_04
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVUP_BV_04
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVUP_BV_04() runs on ItsIvim system ItsIvimSystem {
@@ -420,7 +420,7 @@ module ItsIvim_TestCases {
              *  }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVUP_BV_05
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVUP_BV_05
              * @reference ETSI TS 103 301 v1.1.1, clause 7.4.2
              */
             testcase TC_IS_IVI_EVUP_BV_05() runs on ItsIvim system ItsIvimSystem {
@@ -461,7 +461,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVTR_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVTR_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.2
              */
             testcase TC_IS_IVI_EVTR_BV_01 () runs on ItsIvim system ItsIvimSystem {
@@ -497,7 +497,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVTR_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVTR_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.2
              */
             testcase TC_IS_IVI_EVTR_BV_02 () runs on ItsIvim system ItsIvimSystem {
@@ -538,7 +538,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVRP_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVRP_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.2
              */
             testcase TC_IS_IVI_EVRP_BV_01 () runs on ItsIvim system ItsIvimSystem {
@@ -571,7 +571,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_EVRP_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_EVRP_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.2
              */
             testcase TC_IS_IVI_EVRP_BV_02 () runs on ItsIvim system ItsIvimSystem {
@@ -604,7 +604,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_GFQ_TI_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_GFQ_TI_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.2
              */
             testcase TC_IS_IVI_GFQ_TI_01 () runs on ItsIvim system ItsIvimSystem {
@@ -633,7 +633,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_GFQ_TI_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_GFQ_TI_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.2
              */
             testcase TC_IS_IVI_GFQ_TI_02 () runs on ItsIvim system ItsIvimSystem {
@@ -667,7 +667,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_COMM_BV_01_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_COMM_BV_01_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.3.2
              */
             testcase TC_IS_IVI_COMM_BV_01_01 () runs on ItsIvim system ItsIvimSystem {
@@ -699,7 +699,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_COMM_BV_01_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_COMM_BV_01_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.3.2
              */
             testcase TC_IS_IVI_COMM_BV_01_02 () runs on ItsIvim system ItsIvimSystem {
@@ -732,7 +732,7 @@ module ItsIvim_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_COMM_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_COMM_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.3.2
              */
             testcase TC_IS_IVI_COMM_BV_02 () runs on ItsIvim system ItsIvimSystem {
@@ -769,7 +769,7 @@ module ItsIvim_TestCases {
          *     }
          * </pre>
          * 
-         * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_IVI_MSGF_BV_02
+         * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_IVI_MSGF_BV_02
          * @reference ETSI TS 103 301 v1.1.1 Clause 7.4.3.2
          */
         testcase TC_IS_IVI_MSP_BV_01() runs on ItsIvim system ItsIvimSystem {
diff --git a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
index ad6f57414c7305cd72ad9e0238c719dd68c1fc78..243d048dbc7fff05122069006bc969d1c6382a7a 100644
--- a/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsMapem_TestCases.ttcn
@@ -49,7 +49,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_MSGF_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_MSGF_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.3
              */
             testcase TC_IS_RLT_MSGF_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -83,7 +83,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_EVGN_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_EVGN_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.1
              */
             testcase TC_IS_RLT_EVGN_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -123,7 +123,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_EVGN_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_EVGN_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.1
              */
             testcase TC_IS_RLT_EVGN_BV_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -163,7 +163,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_EVGN_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_EVGN_BV_03
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.1
              */
             testcase TC_IS_RLT_EVGN_BV_03 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -199,7 +199,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_COMM_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_COMM_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.3.1
              */
             testcase TC_IS_RLT_COMM_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -230,7 +230,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_COMM_BV_02_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_COMM_BV_02_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.3.2
              */
             testcase TC_IS_RLT_COMM_BV_02_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -263,7 +263,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_COMM_BV_02_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_COMM_BV_02_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.3.2
              */
             testcase TC_IS_RLT_COMM_BV_02_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -297,7 +297,7 @@ module ItsMapem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_COMM_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_COMM_BV_03
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.4.3.1
              */
             testcase TC_IS_RLT_COMM_BV_03 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -334,7 +334,7 @@ module ItsMapem_TestCases {
          * </pre>
          * 
          * @version   1.1.1
-         * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_MSGF_BV_02
+         * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_MSGF_BV_02
          * @reference ETSI TS 103 301 v1.1.1 Clause 6.3
          */
         testcase TC_IS_RLT_MSGF_BV_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
diff --git a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
index a470261ee0c924e2de911823e4061543608a98a4..6c3c6c25e3a688771b4d2872fa8e3ec2814c155a 100644
--- a/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
+++ b/ttcn/AtsMapemSpatem/ItsSpatem_TestCases.ttcn
@@ -49,7 +49,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_MSGF_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_MSGF_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.3
              */
             testcase TC_IS_TLM_MSGF_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -83,7 +83,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_EVGN_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.2
              */
             testcase TC_IS_TLM_EVGN_BV_01() runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -113,7 +113,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_EVGN_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.2
              */
             testcase TC_IS_TLM_EVGN_BV_02() runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -143,7 +143,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_EVGN_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_03
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.2
              */
             testcase TC_IS_TLM_EVGN_BV_03() runs on ItsMapemSpatem system ItsMapemSpatemSystem { 
@@ -173,7 +173,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_EVGN_BV_04
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_EVGN_BV_04
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.2
              */
             testcase TC_IS_TLM_EVGN_BV_04() runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -212,7 +212,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_COMM_BV_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_COMM_BV_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.3.2
              */
             testcase TC_IS_TLM_COMM_BV_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -243,7 +243,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_COMM_BV_02_01
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_COMM_BV_02_01
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.3.2
              */
             testcase TC_IS_TLM_COMM_BV_02_01 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -276,7 +276,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_COMM_BV_02_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_COMM_BV_02_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.3.2
              */
             testcase TC_IS_TLM_COMM_BV_02_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -310,7 +310,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_COMM_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_COMM_BV_03
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.4.3.2
              */
             testcase TC_IS_TLM_COMM_BV_03 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
@@ -347,7 +347,7 @@ module ItsSpatem_TestCases {
              * </pre>
              * 
              * @version   1.1.1
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLM_MSGF_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLM_MSGF_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 5.3
              */
             testcase TC_IS_TLM_MSGF_BV_02 () runs on ItsMapemSpatem system ItsMapemSpatemSystem {
diff --git a/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn
index 3ee346b22bca2f5820b1ad688a966dde421e57d9..db5119f02836b597c16715122374edc99c70d3c3 100644
--- a/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn
+++ b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn
@@ -7982,11 +7982,6 @@ module ItsSecurity_TestCases {
 //                        if (not match(v_aid_ssp_list[v_counter], (all from v_aid_list))) {
 //                            log("*** " & testcasename() & ": FAIL: ITS-AID " & int2str(v_aid_ssp_list[v_counter].its_aid) & " is not exist in AA certificate ***");
 //                            f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
-//                        }
-                        // TODO Not possible due to typing To be removed
-//                        if (lengthof(v_aid_ssp_list[v_counter].service_specific_permissions.sspContainer) > 31) {
-//                            log("*** " & testcasename() & ": FAIL: ITS-AID " & int2str(v_aid_ssp_list[v_counter].its_aid) & " has too long service_specific_permissions ***");
-//                            f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
 //                        }
                     } // End of 'for' statement
                     
diff --git a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
index 4f966c5aca6f50326d8026a2f1881692a35da018..25019ed04d2fb2adc63e63092fdb71b727a021b0 100644
--- a/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
+++ b/ttcn/AtsSremSsem/ItsSrem_TestCases.ttcn
@@ -47,7 +47,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_RLT_MSGF_BV_01
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_RLT_MSGF_BV_01
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.3
                  */
                 testcase TC_IS_RLT_MSGF_BV_01 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -79,7 +79,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_EVGN_BV_01
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_EVGN_BV_01
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.4.1
                  */
                 testcase TC_IS_TLC_EVGN_BV_01 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -112,7 +112,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_EVGN_BV_02
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_EVGN_BV_02
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.4.1
                  */
                 testcase TC_IS_TLC_EVGN_BV_02 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -159,7 +159,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_EVUP_BV_01
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_EVUP_BV_01
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.4.1
                  */
                 testcase TC_IS_TLC_EVUP_BV_01 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -193,7 +193,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_COMM_BV_01_01
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_COMM_BV_01_01
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.4.3.3
                  */
                 testcase TC_IS_TLC_COMM_BV_01_01 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -225,7 +225,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_COMM_BV_01_02
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_COMM_BV_01_02
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.4.3.3
                  */
                 testcase TC_IS_TLC_COMM_BV_01_02 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -261,7 +261,7 @@ module ItsSrem_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_MSGF_BV_03
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_MSGF_BV_03
              * @reference ETSI TS 103 301 v1.1.1 Clause 8.3
              */
             testcase TC_IS_TLC_MSGF_BV_03 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -304,7 +304,7 @@ module ItsSrem_TestCases {
                  *    }
                  * </pre>
                  * 
-                 * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_MSGF_BV_04
+                 * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_MSGF_BV_04
                  * @reference ETSI TS 103 301 v1.1.1 Clause 8.3
                  */
                 testcase TC_IS_TLC_MSGF_BV_04 () runs on ItsSremSsem system ItsSremSsemSystem {
@@ -343,7 +343,7 @@ module ItsSrem_TestCases {
              *    }
              * </pre>
              * 
-             * @see       ETSI TS 103 191-2 v1.3.1 TP_IS_TLC_MSGF_BV_02
+             * @see       ETSI TS 103 191-2 v1.2.1 TP_IS_TLC_MSGF_BV_02
              * @reference ETSI TS 103 301 v1.1.1 Clause 6.3
              */
             testcase TC_IS_TLC_MSGF_BV_02 () runs on ItsSremSsem system ItsSremSsemSystem {