diff --git a/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script b/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script
index 43538e9b21a95cdfab577126969a12ebc58d8d55..b2ed01feff3c4d358c937b77e3624ad64ab53a1a 100644
--- a/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script
+++ b/conformance_test/core_language_tests/negative_tests/05_basic_language_elements.script
@@ -55,7 +55,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 05_basic_lang
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that when the IUT loads a module containing some definitions before the module declaration then the module is rejected. >
+<TC - 05_001 Ensure that when the IUT loads a module containing some definitions before the module declaration then the module is rejected. >
 
 <COMPILE>
 
@@ -89,7 +89,7 @@ error: Cannot recognize file `NegSyn_05_TopLevel_001.ttcn' as an ASN.1 or TTCN-3
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that cannot pass a charstring value to an integer variable.  >
+<TC - 0501_001 Ensure that cannot pass a charstring value to an integer variable.  >
 
 <COMPILE>
 
@@ -127,7 +127,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that when the IUT loads a module containing an identifier named with a keyword then the module is rejected.  >
+<TC - 0501_001 Ensure that when the IUT loads a module containing an identifier named with a keyword then the module is rejected.  >
 
 <COMPILE>
 
@@ -169,7 +169,7 @@ error: at or before token `component': syntax error, unexpected ComponentKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles definitions of local scope  >
+<TC - 0502_001 Ensure that the IUT correctly handles definitions of local scope  >
 
 <COMPILE>
 
@@ -216,7 +216,7 @@ error: There is no local or imported definition with name `v_function'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles definitions of local scope  >
+<TC - 0502_002 Ensure that the IUT correctly handles definitions of local scope  >
 
 <COMPILE>
 
@@ -262,7 +262,7 @@ error: There is no local or imported definition with name `v_control'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles definitions of local scope  >
+<TC - 0502_003 Ensure that the IUT correctly handles definitions of local scope  >
 
 <COMPILE>
 
@@ -311,7 +311,7 @@ error: There is no local or imported definition with name `v_statement'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_001 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -347,7 +347,7 @@ error: Definition with identifier `cl_int' is not unique in the scope hierarchy
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_004 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -387,7 +387,7 @@ error: Definition with identifier `c_int' is not unique in the scope hierarchy
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_005 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -428,7 +428,7 @@ error: Definition with identifier `c_int' is not unique in the scope hierarchy
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_006 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -464,7 +464,7 @@ error: Definition with identifier `repeatedIdentifier' is not unique in the scop
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_007 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -544,7 +544,7 @@ error: Definition with identifier `repeatedIdentifier' is not unique in the scop
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_009 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -584,7 +584,7 @@ error: Definition with identifier `repeatedIdentifier' is not unique in the scop
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
+<TC - 050202_010 Ensure that the IUT correctly handles the uniqueness of variable names in its scope  >
 
 <COMPILE>
 
@@ -629,7 +629,7 @@ error: Definition with identifier `repeatedIdentifier' is not unique in the scop
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that declarations are in the allowed ordering >
+<TC - 0503_001 Ensure that declarations are in the allowed ordering >
 
 <COMPILE>
 
@@ -684,7 +684,7 @@ error: There is no local or imported definition with name `v_nested_statement'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles received testcase parametrization type incompatibility. >
+<TC - 0504_001 Ensure that the IUT correctly handles received testcase parametrization type incompatibility. >
 
 <COMPILE>
 
@@ -763,7 +763,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects forbidden module parametrization types. >
+<TC - 0504_002 Ensure that the IUT rejects forbidden module parametrization types. >
 
 <COMPILE>
 
@@ -804,7 +804,7 @@ error: at or before token `timer': syntax error, unexpected TimerKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated for incompatible actual value of in parameter >
+<TC - 050401_001 verify that error is generated for incompatible actual value of in parameter >
 
 <COMPILE>
 
@@ -865,7 +865,7 @@ error: Type mismatch: `@NegSem_050401_top_level_001.R2.option2' of type `integer
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated for incompatible actual value of out parameter >
+<TC - 050401_002 verify that error is generated for incompatible actual value of out parameter >
 
 <COMPILE>
 
@@ -925,7 +925,7 @@ error: Type mismatch: `@NegSem_050401_top_level_002.R2.option2' of type `integer
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that in value formal parameters of template cannot used dash as default value >
+<TC - 05040101_001 verify that in value formal parameters of template cannot used dash as default value >
 
 <COMPILE>
 
@@ -971,7 +971,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that modified template cannot used dash as default value when original value parameter had no default value >
+<TC - 05040101_002 verify that modified template cannot used dash as default value when original value parameter had no default value >
 
 <COMPILE>
 
@@ -1081,7 +1081,7 @@ error: A template cannot have `out' value parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template definitions cannot contain inout value formal parameters >
+<TC - 05040101_004 verify that template definitions cannot contain inout value formal parameters >
 
 <COMPILE>
 
@@ -1140,7 +1140,7 @@ error: A template cannot have `inout' value parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that out value formal parameters cannot have default values >
+<TC - 05040101_005 verify that out value formal parameters cannot have default values >
 
 <COMPILE>
 
@@ -1187,7 +1187,7 @@ error: Reference to a variable or value parameter was expected for an `out' valu
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that inout value formal parameters cannot have default values >
+<TC - 05040101_006 verify that inout value formal parameters cannot have default values >
 
 <COMPILE>
 
@@ -1234,7 +1234,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that incompatible value in default value assignment of value formal parameters causes error >
+<TC - 05040101_007 verify that incompatible value in default value assignment of value formal parameters causes error >
 
 <COMPILE>
 
@@ -1279,7 +1279,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that default value of value formal parameters cannot reference component variables >
+<TC - 05040101_008 verify that default value of value formal parameters cannot reference component variables >
 
 <COMPILE>
 
@@ -1325,7 +1325,7 @@ error: Reference to a static value was expected instead of variable `@NegSem_050
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that default value of value formal parameters cannot reference other parameters >
+<TC - 05040101_009 verify that default value of value formal parameters cannot reference other parameters >
 
 <COMPILE>
 
@@ -1370,7 +1370,7 @@ error: There is no local or imported definition with name `p_int'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that default value of value formal parameters cannot invoke functions with runs on clause >
+<TC - 05040101_010 verify that default value of value formal parameters cannot invoke functions with runs on clause >
 
 <COMPILE>
 
@@ -1421,7 +1421,7 @@ error: Reference to a static value was expected instead of the return value of f
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated if formal value parameter of function contains dash >
+<TC - 05040101_011 verify that error is generated if formal value parameter of function contains dash >
 
 <COMPILE>
 
@@ -1468,7 +1468,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated if formal value parameter of altstep contains dash >
+<TC - 05040101_012 verify that error is generated if formal value parameter of altstep contains dash >
 
 <COMPILE>
 
@@ -1516,7 +1516,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated if formal value parameter of test case contains dash >
+<TC - 05040101_013 verify that error is generated if formal value parameter of test case contains dash >
 
 <COMPILE>
 
@@ -1559,7 +1559,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that out formal value parameters cannot have lazy modifier >
+<TC - 05040101_014 verify that out formal value parameters cannot have lazy modifier >
 
 <COMPILE>
 
@@ -1607,7 +1607,7 @@ error: at or before token `@lazy': syntax error, unexpected LazyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that out formal value parameters cannot have fuzzy modifier >
+<TC - 05040101_015 verify that out formal value parameters cannot have fuzzy modifier >
 
 <COMPILE>
 
@@ -1655,7 +1655,7 @@ error: at or before token `@fuzzy': syntax error, unexpected FuzzyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that inout formal value parameters cannot have lazy modifier >
+<TC - 05040101_016 verify that inout formal value parameters cannot have lazy modifier >
 
 <COMPILE>
 
@@ -1703,7 +1703,7 @@ error: at or before token `@lazy': syntax error, unexpected LazyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that inout formal value parameters cannot have fuzzy modifier >
+<TC - 05040101_017 verify that inout formal value parameters cannot have fuzzy modifier >
 
 <COMPILE>
 
@@ -1751,7 +1751,7 @@ error: at or before token `@fuzzy': syntax error, unexpected FuzzyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that const definition cannot be parameterized >
+<TC - 05040101_001 verify that const definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1785,7 +1785,7 @@ error: at or before token `\(': syntax error, unexpected '\(', expecting := or '
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that var definition cannot be parameterized >
+<TC - 05040101_002 verify that var definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1821,7 +1821,7 @@ error: at or before token `\(': syntax error, unexpected '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variable definition cannot be parameterized >
+<TC - 05040101_003 verify that template variable definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1857,7 +1857,7 @@ error: at or before token `\(': syntax error, unexpected '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that timer definition cannot be parameterized >
+<TC - 05040101_004 verify that timer definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1893,7 +1893,7 @@ error: at or before token `\(': syntax error, unexpected '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that control definition cannot be parameterized >
+<TC - 05040101_005 verify that control definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1929,7 +1929,7 @@ error: at or before token `\(': syntax error, unexpected '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that record of definition cannot be parameterized >
+<TC - 05040101_006 verify that record of definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1963,7 +1963,7 @@ error: at or before token `integer': syntax error, unexpected IntegerKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that set of definition cannot be parameterized >
+<TC - 05040101_007 verify that set of definition cannot be parameterized >
 
 <COMPILE>
 
@@ -1997,7 +1997,7 @@ error: at or before token `integer': syntax error, unexpected IntegerKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that enumerated definition cannot be parameterized >
+<TC - 05040101_008 verify that enumerated definition cannot be parameterized >
 
 <COMPILE>
 
@@ -2031,7 +2031,7 @@ error: at or before token `\(': syntax error, unexpected '\(', expecting '\{'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that port definition cannot be parameterized >
+<TC - 05040101_009 verify that port definition cannot be parameterized >
 
 <COMPILE>
 
@@ -2068,7 +2068,7 @@ error: at or before token `map': syntax error, unexpected MapKeyword, expecting
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that component definition cannot be parameterized >
+<TC - 05040101_010 verify that component definition cannot be parameterized >
 
 <COMPILE>
 
@@ -2104,7 +2104,7 @@ error: at or before token `\(': syntax error, unexpected '\(', expecting Extends
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that subtype definition cannot be parameterized >
+<TC - 05040101_011 verify that subtype definition cannot be parameterized >
 
 <COMPILE>
 
@@ -2138,7 +2138,7 @@ error: at or before token `integer': syntax error, unexpected IntegerKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that group definition cannot be parameterized >
+<TC - 05040101_012 verify that group definition cannot be parameterized >
 
 <COMPILE>
 
@@ -2174,7 +2174,7 @@ error: at or before token `\(': syntax error, unexpected '\(', expecting '\{'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that import definition cannot be parameterized >
+<TC - 05040101_013 verify that import definition cannot be parameterized >
 
 <COMPILE>
 
@@ -2208,7 +2208,7 @@ error: at or before token `\(': syntax error, unexpected '\(', expecting AllKeyw
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that in template formal parameters of template cannot used dash as default value >
+<TC - 05040102_001 verify that in template formal parameters of template cannot used dash as default value >
 
 <COMPILE>
 
@@ -2254,7 +2254,7 @@ error: Only modified templates are allowed to use the not used symbol \(`-'\) as
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that modified template cannot used dash as default value when original template parameter had no default value >
+<TC - 05040102_002 that modified template cannot used dash as default value when original template parameter had no default value >
 
 <COMPILE>
 
@@ -2305,7 +2305,7 @@ error: Not used symbol \(`-'\) doesn't have the corresponding default parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template definitions cannot contain out template formal parameters >
+<TC - 05040102_003 verify that template definitions cannot contain out template formal parameters >
 
 <COMPILE>
 
@@ -2364,7 +2364,7 @@ error: A template cannot have `out' template parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template definitions cannot contain inout template formal parameters >
+<TC - 05040102_004 verify that template definitions cannot contain inout template formal parameters >
 
 <COMPILE>
 
@@ -2423,7 +2423,7 @@ error: A template cannot have `inout' template parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that out template formal parameters cannot have default values >
+<TC - 05040102_005 verify that out template formal parameters cannot have default values >
 
 <COMPILE>
 
@@ -2470,7 +2470,7 @@ error: Reference to a template variable or template parameter was expected for a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that inout template formal parameters cannot have default values >
+<TC - 05040102_006 verify that inout template formal parameters cannot have default values >
 
 <COMPILE>
 
@@ -2517,7 +2517,7 @@ error: Reference to a template variable or template parameter was expected for a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that incompatible template instance in default template assignment of template formal parameters causes error >
+<TC - 05040102_007 verify that incompatible template instance in default template assignment of template formal parameters causes error >
 
 <COMPILE>
 
@@ -2562,7 +2562,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that default template instance of template formal parameters cannot reference component elements >
+<TC - 05040102_008 verify that default template instance of template formal parameters cannot reference component elements >
 
 <COMPILE>
 
@@ -2610,7 +2610,7 @@ Dynamic test case error: Copying an uninitialized/unsupported integer template.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that default template instance of template formal parameters cannot reference component elements >
+<TC - 05040102_009 verify that default template instance of template formal parameters cannot reference component elements >
 
 <COMPILE>
 
@@ -2655,7 +2655,7 @@ error: There is no local or imported definition with name `p_int'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that default template instance of template formal parameters cannot reference component elements >
+<TC - 05040102_010 verify that default template instance of template formal parameters cannot reference component elements >
 
 <COMPILE>
 
@@ -2708,7 +2708,7 @@ Dynamic test case error: Unbound left operand of integer addition.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that out formal template parameters cannot have lazy modifier >
+<TC - 05040102_014 verify that out formal template parameters cannot have lazy modifier >
 
 <COMPILE>
 
@@ -2756,7 +2756,7 @@ error: at or before token `@lazy': syntax error, unexpected LazyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that out formal template parameters cannot have fuzzy modifier >
+<TC - 05040102_015 verify that out formal template parameters cannot have fuzzy modifier >
 
 <COMPILE>
 
@@ -2804,7 +2804,7 @@ error: at or before token `@fuzzy': syntax error, unexpected FuzzyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that inout formal template parameters cannot have lazy modifier >
+<TC - 05040102_016 verify that inout formal template parameters cannot have lazy modifier >
 
 <COMPILE>
 
@@ -2852,7 +2852,7 @@ error: at or before token `@lazy': syntax error, unexpected LazyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that inout formal template parameters cannot have fuzzy modifier >
+<TC - 05040102_017 verify that inout formal template parameters cannot have fuzzy modifier >
 
 <COMPILE>
 
@@ -2900,7 +2900,7 @@ error: at or before token `@fuzzy': syntax error, unexpected FuzzyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as in formal value parameters of functions >
+<TC - 050402_001 verify that template parameters cannot be used as in formal value parameters of functions >
 
 <COMPILE>
 
@@ -2951,7 +2951,7 @@ error: Reference to a value was expected instead of template `@NegSem_050402_act
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as in formal value parameters of functions >
+<TC - 050402_002 verify that template variables cannot be used as in formal value parameters of functions >
 
 <COMPILE>
 
@@ -3001,7 +3001,7 @@ error: Reference to a value was expected instead of template variable `vm_msg'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as in formal value parameters of functions >
+<TC - 050402_003 verify that template in parameters cannot be used as in formal value parameters of functions >
 
 <COMPILE>
 
@@ -3055,7 +3055,7 @@ error: Reference to a value was expected instead of template parameter `p_val'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as in formal value parameters of functions >
+<TC - 050402_004 verify that template out parameters cannot be used as in formal value parameters of functions >
 
 <COMPILE>
 
@@ -3111,7 +3111,7 @@ error: Reference to a value was expected instead of `out' template parameter `p_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as in formal value parameters of functions >
+<TC - 050402_005 verify that template inout parameters cannot be used as in formal value parameters of functions >
 
 <COMPILE>
 
@@ -3166,7 +3166,7 @@ error: Reference to a value was expected instead of `inout' template parameter `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as in formal value parameters of templates >
+<TC - 050402_006 verify that template parameters cannot be used as in formal value parameters of templates >
 
 <COMPILE>
 
@@ -3218,7 +3218,7 @@ error: Reference to a value was expected instead of template `@NegSem_050402_act
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as in formal value parameters of templates >
+<TC - 050402_007 verify that template variables cannot be used as in formal value parameters of templates >
 
 <COMPILE>
 
@@ -3269,7 +3269,7 @@ error: Reference to a value was expected instead of template variable `vm_msg'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as in formal value parameters of templates >
+<TC - 050402_008 verify that template in parameters cannot be used as in formal value parameters of templates >
 
 <COMPILE>
 
@@ -3324,7 +3324,7 @@ error: Reference to a value was expected instead of template parameter `p_val'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as in formal value parameters of templates >
+<TC - 050402_009 verify that template out parameters cannot be used as in formal value parameters of templates >
 
 <COMPILE>
 
@@ -3381,7 +3381,7 @@ error: Reference to a value was expected instead of `out' template parameter `p_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as in formal value parameters of templates >
+<TC - 050402_010 verify that template out parameters cannot be used as in formal value parameters of templates >
 
 <COMPILE>
 
@@ -3437,7 +3437,7 @@ error: Reference to a value was expected instead of `inout' template parameter `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as in formal value parameters of altsteps >
+<TC - 050402_011 verify that template parameters cannot be used as in formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -3492,7 +3492,7 @@ error: Reference to a value was expected instead of template `@NegSem_050402_act
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as in formal value parameters of altsteps >
+<TC - 050402_012 verify that template variables cannot be used as in formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -3546,7 +3546,7 @@ error: Reference to a value was expected instead of template variable `vm_msg'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as in formal value parameters of altsteps >
+<TC - 050402_014 verify that template out parameters cannot be used as in formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -3606,7 +3606,7 @@ error: Reference to a value was expected instead of `out' template parameter `p_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as in formal value parameters of altsteps >
+<TC - 050402_015 verify that template inout parameters cannot be used as in formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -3665,7 +3665,7 @@ error: Reference to a value was expected instead of `inout' template parameter `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as in formal value parameters of altsteps >
+<TC - 050402_016 verify that template inout parameters cannot be used as in formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -3712,7 +3712,7 @@ error: Reference to a value was expected instead of template `@NegSem_050402_act
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as in formal value parameters of test cases >
+<TC - 050402_017 verify that template variables cannot be used as in formal value parameters of test cases >
 
 <COMPILE>
 
@@ -3758,7 +3758,7 @@ error: Reference to a value was expected instead of template variable `vm_msg'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as in formal value parameters of test cases >
+<TC - 050402_018 verify that template in parameters cannot be used as in formal value parameters of test cases >
 
 <COMPILE>
 
@@ -3807,7 +3807,7 @@ error: Reference to a value was expected instead of template parameter `p_val'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as in formal value parameters of test cases >
+<TC - 050402_019 verify that template out parameters cannot be used as in formal value parameters of test cases >
 
 <COMPILE>
 
@@ -3858,7 +3858,7 @@ error: Reference to a value was expected instead of `out' template parameter `p_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as in formal value parameters of test cases >
+<TC - 050402_020 verify that template inout parameters cannot be used as in formal value parameters of test cases >
 
 <COMPILE>
 
@@ -3908,7 +3908,7 @@ error: Reference to a value was expected instead of `inout' template parameter `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal value parameters of functions >
+<TC - 050402_021 verify that literals cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -3956,7 +3956,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal value parameters of functions >
+<TC -050402_022 verify that literals cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4006,7 +4006,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as inout formal value parameters of functions >
+<TC - 050402_023 verify that constants cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4056,7 +4056,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as inout formal value parameters of functions >
+<TC - 050402_024 verify that function calls cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4108,7 +4108,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as inout formal value parameters of functions >
+<TC - 050402_025 verify that expressions cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4161,7 +4161,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as inout formal value parameters of functions >
+<TC - 050402_026 verify that template parameters cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4211,7 +4211,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as inout formal value parameters of functions >
+<TC - 050402_027 verify that template variables cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4260,7 +4260,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as inout formal value parameters of functions >
+<TC - 050402_028 verify that template in parameters cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4313,7 +4313,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as inout formal value parameters of functions >
+<TC - 050402_029 verify that template out parameters cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4368,7 +4368,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as inout formal value parameters of functions >
+<TC - 050402_030 verify that template inout parameters cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4422,7 +4422,7 @@ error: Reference to a value was expected instead of `inout' template parameter `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variable element reference cannot be used as inout formal value parameters of functions >
+<TC - 050402_031 verify that template variable element reference cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4475,7 +4475,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that reference to elements of formal value parameters cannot be used as inout formal value parameters of functions >
+<TC - 050402_032 verify that reference to elements of formal value parameters cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -4531,7 +4531,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_033 verify that literals cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4583,7 +4583,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_034 verify that module parameters cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4637,7 +4637,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_035 verify that constants cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4691,7 +4691,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_036 verify that function calls cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4747,7 +4747,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_037 verify that expressions cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4804,7 +4804,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_038 verify that template parameters cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4858,7 +4858,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_039 verify that template variables cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4911,7 +4911,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_040 verify that template in parameters cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -4968,7 +4968,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template out parameters cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_041 verify that template out parameters cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -5027,7 +5027,7 @@ error: Reference to a variable or value parameter was expected for an `inout' va
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_042 verify that template inout parameters cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -5085,7 +5085,7 @@ module NegSem_050402_actual_parameters_042 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variable element reference cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_043 verify that template variable element reference cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -5142,7 +5142,7 @@ module NegSem_050402_actual_parameters_043 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that reference to elements of formal value parameters cannot be used as inout formal value parameters of altsteps >
+<TC - 050402_044 verify that reference to elements of formal value parameters cannot be used as inout formal value parameters of altsteps >
 
 <COMPILE>
 
@@ -5202,7 +5202,7 @@ module NegSem_050402_actual_parameters_044 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal value parameters of test cases >
+<TC - 050402_045 verify that literals cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5246,7 +5246,7 @@ module NegSem_050402_actual_parameters_045 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as inout formal value parameters of test cases >
+<TC - 050402_046 verify that module parameters cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5292,7 +5292,7 @@ module NegSem_050402_actual_parameters_046 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as inout formal value parameters of test cases >
+<TC - 050402_047 verify that constants cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5338,7 +5338,7 @@ module NegSem_050402_actual_parameters_047 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as inout formal value parameters of test cases >
+<TC - 050402_048 verify that function calls cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5386,7 +5386,7 @@ module NegSem_050402_actual_parameters_048 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as inout formal value parameters of test cases >
+<TC - 050402_049 verify that expressions cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5435,7 +5435,7 @@ module NegSem_050402_actual_parameters_049 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as inout formal value parameters of test cases >
+<TC - 050402_050 verify that template parameters cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5481,7 +5481,7 @@ module NegSem_050402_actual_parameters_050 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variables cannot be used as inout formal value parameters of test cases >
+<TC - 050402_051 verify that template variables cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5525,7 +5525,7 @@ module NegSem_050402_actual_parameters_051 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as inout formal value parameters of test cases >
+<TC - 050402_052 verify that template in parameters cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5573,7 +5573,7 @@ module NegSem_050402_actual_parameters_052 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template in parameters cannot be used as inout formal value parameters of test cases >
+<TC - 050402_053 verify that template in parameters cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5623,7 +5623,7 @@ module NegSem_050402_actual_parameters_053 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template inout parameters cannot be used as inout formal value parameters of test cases >
+<TC - 050402_054 verify that template inout parameters cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5672,7 +5672,7 @@ module NegSem_050402_actual_parameters_054 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template variable element reference cannot be used as inout formal value parameters of test cases >
+<TC - 050402_055 verify that template variable element reference cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5721,7 +5721,7 @@ module NegSem_050402_actual_parameters_055 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that reference to elements of formal value parameters cannot be used as inout formal value parameters of test cases >
+<TC - 050402_056 verify that reference to elements of formal value parameters cannot be used as inout formal value parameters of test cases >
 
 <COMPILE>
 
@@ -5773,7 +5773,7 @@ module NegSem_050402_actual_parameters_056 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as out formal template parameters of functions >
+<TC - 050402_057 verify that literals cannot be used as out formal template parameters of functions >
 
 <COMPILE>
 
@@ -5822,7 +5822,7 @@ module NegSem_050402_actual_parameters_057 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as out formal template parameters of functions >
+<TC - 050402_058 verify that module parameters cannot be used as out formal template parameters of functions >
 
 <COMPILE>
 
@@ -5873,7 +5873,7 @@ module NegSem_050402_actual_parameters_058 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as out formal template parameters of functions >
+<TC - 050402_059 verify that constants cannot be used as out formal template parameters of functions >
 
 <COMPILE>
 
@@ -5924,7 +5924,7 @@ module NegSem_050402_actual_parameters_059 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as out formal template parameters of functions >
+<TC - 050402_060 verify that function calls cannot be used as out formal template parameters of functions >
 
 <COMPILE>
 
@@ -5977,7 +5977,7 @@ module NegSem_050402_actual_parameters_060 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as out formal template parameters of functions >
+<TC - 050402_061 verify that expressions cannot be used as out formal template parameters of functions >
 
 <COMPILE>
 
@@ -6031,7 +6031,7 @@ module NegSem_050402_actual_parameters_061 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as out formal template parameters of functions >
+<TC - 050402_062 verify that template parameters cannot be used as out formal template parameters of functions >
 
 <COMPILE>
 
@@ -6082,7 +6082,7 @@ module NegSem_050402_actual_parameters_062 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as out formal template parameters of altsteps >
+<TC - 050402_063 verify that literals cannot be used as out formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -6135,7 +6135,7 @@ module NegSem_050402_actual_parameters_063 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as out formal template parameters of altsteps >
+<TC - 050402_064 verify that module parameters cannot be used as out formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -6190,7 +6190,7 @@ module NegSem_050402_actual_parameters_064 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as out formal template parameters of altsteps >
+<TC - 050402_065 verify that constants cannot be used as out formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -6245,7 +6245,7 @@ module NegSem_050402_actual_parameters_065 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as out formal template parameters of altsteps >
+<TC - 050402_066 verify that function calls cannot be used as out formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -6302,7 +6302,7 @@ module NegSem_050402_actual_parameters_066 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as out formal template parameters of altsteps >
+<TC - 050402_067 verify that expressions cannot be used as out formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -6360,7 +6360,7 @@ module NegSem_050402_actual_parameters_067 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as out formal template parameters of altsteps >
+<TC - 050402_068 verify that template parameters cannot be used as out formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -6415,7 +6415,7 @@ module NegSem_050402_actual_parameters_068 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as out formal template parameters of test cases >
+<TC - 050402_069 verify that literals cannot be used as out formal template parameters of test cases >
 
 <COMPILE>
 
@@ -6460,7 +6460,7 @@ module NegSem_050402_actual_parameters_069 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as out formal template parameters of test cases >
+<TC - 050402_070 verify that module parameters cannot be used as out formal template parameters of test cases >
 
 <COMPILE>
 
@@ -6507,7 +6507,7 @@ module NegSem_050402_actual_parameters_070 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as out formal template parameters of test cases >
+<TC - 050402_071 verify that constants cannot be used as out formal template parameters of test cases >
 
 <COMPILE>
 
@@ -6554,7 +6554,7 @@ module NegSem_050402_actual_parameters_071 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as out formal template parameters of test cases >
+<TC - 050402_072 verify that function calls cannot be used as out formal template parameters of test cases >
 
 <COMPILE>
 
@@ -6603,7 +6603,7 @@ module NegSem_050402_actual_parameters_072 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as out formal template parameters of test cases >
+<TC - 050402_073 verify that expressions cannot be used as out formal template parameters of test cases >
 
 <COMPILE>
 
@@ -6653,7 +6653,7 @@ module NegSem_050402_actual_parameters_073 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as out formal template parameters of test cases >
+<TC - 050402_074 verify that template parameters cannot be used as out formal template parameters of test cases >
 
 <COMPILE>
 
@@ -6700,7 +6700,7 @@ module NegSem_050402_actual_parameters_074 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal template parameters of functions >
+<TC - 050402_075 verify that literals cannot be used as inout formal template parameters of functions >
 
 <COMPILE>
 
@@ -6749,7 +6749,7 @@ module NegSem_050402_actual_parameters_075 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as inout formal template parameters of functions >
+<TC - 050402_076 verify that module parameters cannot be used as inout formal template parameters of functions >
 
 <COMPILE>
 
@@ -6800,7 +6800,7 @@ module NegSem_050402_actual_parameters_076 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as inout formal template parameters of functions >
+<TC - 050402_077 verify that constants cannot be used as inout formal template parameters of functions >
 
 <COMPILE>
 
@@ -6851,7 +6851,7 @@ module NegSem_050402_actual_parameters_077 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as inout formal template parameters of functions >
+<TC - 050402_078 verify that constants cannot be used as inout formal template parameters of functions >
 
 <COMPILE>
 
@@ -6904,7 +6904,7 @@ module NegSem_050402_actual_parameters_078 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as inout formal template parameters of functions >
+<TC - 050402_079 verify that expressions cannot be used as inout formal template parameters of functions >
 
 <COMPILE>
 
@@ -6958,7 +6958,7 @@ module NegSem_050402_actual_parameters_079 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as inout formal template parameters of functions >
+<TC - 050402_080 verify that template parameters cannot be used as inout formal template parameters of functions >
 
 <COMPILE>
 
@@ -7009,7 +7009,7 @@ module NegSem_050402_actual_parameters_080 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal template parameters of altsteps >
+<TC - 050402_081 verify that literals cannot be used as inout formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -7061,7 +7061,7 @@ module NegSem_050402_actual_parameters_081 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as inout formal template parameters of altsteps >
+<TC - 050402_082 verify that module parameters cannot be used as inout formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -7115,7 +7115,7 @@ module NegSem_050402_actual_parameters_082 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as inout formal template parameters of altsteps >
+<TC - 050402_083 verify that module parameters cannot be used as inout formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -7170,7 +7170,7 @@ module NegSem_050402_actual_parameters_083 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as inout formal template parameters of altsteps >
+<TC - 050402_084 verify that function calls cannot be used as inout formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -7227,7 +7227,7 @@ module NegSem_050402_actual_parameters_084 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as inout formal template parameters of altsteps >
+<TC - 050402_085 verify that expressions cannot be used as inout formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -7285,7 +7285,7 @@ module NegSem_050402_actual_parameters_085 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as inout formal template parameters of altsteps >
+<TC - 050402_086 verify that template parameters cannot be used as inout formal template parameters of altsteps >
 
 <COMPILE>
 
@@ -7340,7 +7340,7 @@ module NegSem_050402_actual_parameters_086 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that literals cannot be used as inout formal template parameters of test cases >
+<TC - 050402_087 verify that literals cannot be used as inout formal template parameters of test cases >
 
 <COMPILE>
 
@@ -7385,7 +7385,7 @@ module NegSem_050402_actual_parameters_087 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that module parameters cannot be used as inout formal template parameters of test cases >
+<TC - 050402_088 verify that module parameters cannot be used as inout formal template parameters of test cases >
 
 <COMPILE>
 
@@ -7432,7 +7432,7 @@ module NegSem_050402_actual_parameters_088 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that constants cannot be used as inout formal template parameters of test cases >
+<TC - 050402_089 verify that constants cannot be used as inout formal template parameters of test cases >
 
 <COMPILE>
 
@@ -7479,7 +7479,7 @@ module NegSem_050402_actual_parameters_089 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that function calls cannot be used as inout formal template parameters of test cases >
+<TC - 050402_090 verify that function calls cannot be used as inout formal template parameters of test cases >
 
 <COMPILE>
 
@@ -7528,7 +7528,7 @@ module NegSem_050402_actual_parameters_090 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that expressions cannot be used as inout formal template parameters of test cases >
+<TC - 050402_091 verify that expressions cannot be used as inout formal template parameters of test cases >
 
 <COMPILE>
 
@@ -7578,7 +7578,7 @@ module NegSem_050402_actual_parameters_091 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that template parameters cannot be used as inout formal template parameters of test cases >
+<TC - 050402_092 verify that template parameters cannot be used as inout formal template parameters of test cases >
 
 <COMPILE>
 
@@ -7625,7 +7625,7 @@ module NegSem_050402_actual_parameters_092 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that referencing errors are detected in actual parameters passed to in formal value parameters >
+<TC - 050402_093 verify that referencing errors are detected in actual parameters passed to in formal value parameters >
 
 <COMPILE>
 
@@ -7687,7 +7687,7 @@ Dynamic test case error: Using the value of an optional field containing omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that referencing errors are detected in actual parameters passed to in formal template parameters >
+<TC - 050402_094 verify that referencing errors are detected in actual parameters passed to in formal template parameters >
 
 <COMPILE>
 
@@ -7748,7 +7748,7 @@ error: Reference to field `subfield1' of any or omit `@NegSem_050402_actual_para
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that referencing errors are detected in actual parameters passed to in formal template parameters >
+<TC - 050402_095 verify that referencing errors are detected in actual parameters passed to in formal template parameters >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -7811,7 +7811,7 @@ Dynamic test case error: Matching with an uninitialized/unsupported integer temp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that referencing rules are correctly applied to actual parameters of inout formal template parameters >
+<TC - 050402_096 verify that referencing rules are correctly applied to actual parameters of inout formal template parameters >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -7875,7 +7875,7 @@ Dynamic test case error: Matching with an uninitialized/unsupported integer temp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that string item references cannot be used as inout formal value parameters of functions >
+<TC - 050402_097 verify that string item references cannot be used as inout formal value parameters of functions >
 
 <COMPILE>
 
@@ -7926,7 +7926,7 @@ error: Reference to a string element of type `charstring' cannot be used in this
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that ordinary values cannot be passed to timer parameters >
+<TC - 050402_098 verify that ordinary values cannot be passed to timer parameters >
 
 <COMPILE>
 
@@ -7974,7 +7974,7 @@ error: Reference to a timer or timer parameter was expected for a timer paramete
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that values cannot be passed to port parameters >
+<TC - 050402_099 verify that values cannot be passed to port parameters >
 
 <COMPILE>
 
@@ -8027,7 +8027,7 @@ error: Reference to a port or port parameter was expected for a port parameter i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that list notation containing actual parameters in wrong order is not accepted >
+<TC - 050402_100 verify that list notation containing actual parameters in wrong order is not accepted >
 
 <COMPILE>
 
@@ -8076,7 +8076,7 @@ error: character string value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that list notation containing less actual parameters than required is not accepted >
+<TC - 050402_101 verify that list notation containing less actual parameters than required is not accepted >
 
 <COMPILE>
 
@@ -8122,7 +8122,7 @@ error: Too few parameters: 2 was expected instead of 1
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that parameter without default value cannot be skipped >
+<TC - 050402_102 verify that parameter without default value cannot be skipped >
 
 <COMPILE>
 
@@ -8168,7 +8168,7 @@ error: Not used symbol \(`-'\) cannot be used for parameter that does not have d
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that mixing list and assignment notation is not allowed in parameterized calls (value as actual parameter) >
+<TC - 050402_103 verify that mixing list and assignment notation is not allowed in parameterized calls (value as actual parameter) >
 
 <COMPILE>
 
@@ -8215,7 +8215,7 @@ error: at or before token `"': syntax error, unexpected Cstring
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that mixing list and assignment notation is not allowed in parameterized calls (skipped actual parameter) >
+<TC - 050402_104 verify that mixing list and assignment notation is not allowed in parameterized calls (skipped actual parameter) >
 
 <COMPILE>
 
@@ -8262,7 +8262,7 @@ error: at or before token `-': syntax error, unexpected '-'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that parameters cannot be assigned more than once in assignment notation >
+<TC - 050402_105 verify that parameters cannot be assigned more than once in assignment notation >
 
 <COMPILE>
 
@@ -8309,7 +8309,7 @@ error: at or before token `\)': syntax error, unexpected '\)'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that assignment notation that doesn't contain all parameters is not accepted >
+<TC - 050402_106 verify that assignment notation that doesn't contain all parameters is not accepted >
 
 <COMPILE>
 
@@ -8355,7 +8355,7 @@ error: Parameter not specified
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that incompatible values cannot be passed to in formal parameters >
+<TC - 050402_107 verify that incompatible values cannot be passed to in formal parameters >
 
 <COMPILE>
 
@@ -8413,7 +8413,7 @@ error: Type mismatch: `@NegSem_050402_actual_parameters_107.R1.field2' of type `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that incompatible values cannot be passed from out formal parameters >
+<TC - 050402_108 verify that incompatible values cannot be passed from out formal parameters >
 
 <COMPILE>
 
@@ -8473,7 +8473,7 @@ error: Type mismatch: `@NegSem_050402_actual_parameters_108.R1.field2' of type `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that incompatible values cannot be passed to inout formal parameters >
+<TC - 050402_109 verify that incompatible values cannot be passed to inout formal parameters >
 
 <COMPILE>
 
@@ -8530,7 +8530,7 @@ error: Type mismatch: `@NegSem_050402_actual_parameters_109.R1.field2' of type `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that incompatible templates cannot be passed to template parameters with omit restriction >
+<TC - 050402_111 verify that incompatible templates cannot be passed to template parameters with omit restriction >
 
 <COMPILE>
 
@@ -8577,7 +8577,7 @@ error: Restriction on template formal parameter does not allow usage of value ra
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that compatible templates can be passed to template parameters with value restriction >
+<TC - 050402_112 verify that compatible templates can be passed to template parameters with value restriction >
 
 <COMPILE>
 
@@ -8624,7 +8624,7 @@ error: Restriction on template formal parameter does not allow usage of value li
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that compatible templates can be passed to template parameters with present restriction >
+<TC - 050402_113 verify that compatible templates can be passed to template parameters with present restriction >
 
 <COMPILE>
 
@@ -8671,7 +8671,7 @@ error: Restriction on template formal parameter does not allow usage of any or o
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that compatible templates can be passed to template parameters with present restriction >
+<TC - 050402_114 verify that compatible templates can be passed to template parameters with present restriction >
 
 <COMPILE>
 
@@ -8728,7 +8728,7 @@ error: Reference to parameterized definition `mw_rec' without actual parameter l
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated when no actual parameter list is used for functions with no parameters >
+<TC - 050402_115 verify that error is generated when no actual parameter list is used for functions with no parameters >
 
 <COMPILE>
 
@@ -8777,7 +8777,7 @@ error: Reference to parameterized definition `f_test' without actual parameter l
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated when no actual parameter list is used for test cases with no parameters >
+<TC - 050402_116 verify that error is generated when no actual parameter list is used for test cases with no parameters >
 
 <COMPILE>
 
@@ -8821,7 +8821,7 @@ error: at or before token `\)': syntax error, unexpected '\)', expecting '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated when no actual parameter list is used for altsteps with no parameters >
+<TC - 050402_117 verify that error is generated when no actual parameter list is used for altsteps with no parameters >
 
 <COMPILE>
 
@@ -8879,7 +8879,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated when empty actual parameter list is used for templates with no parameters >
+<TC - 050402_118 verify that error is generated when empty actual parameter list is used for templates with no parameters >
 
 <COMPILE>
 
@@ -8931,7 +8931,7 @@ error: The referenced template `@NegSem_050402_actual_parameters_118.mw_allInt'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that an error is detected when two constants reference each other >
+<TC - 0505_001 Verify that an error is detected when two constants reference each other >
 
 <COMPILE>
 
@@ -8977,7 +8977,7 @@ error: While searching referenced value: Circular reference: `@NegSem_0505_cycli
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that an error is detected when a forbidded cyclic reference occurs in cyclic import >
+<TC - 0505_002 Verify that an error is detected when a forbidded cyclic reference occurs in cyclic import >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
index 7769e4ebf97431c43236179263151430c30f9a7f..53a4b2712c4a90e599300b1fcc9cab672f599e0f 100644
--- a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
+++ b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
@@ -54,7 +54,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 06_types_and_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign float to integer values >
+<TC - 060100_001 Assign float to integer values >
 
 <COMPILE>
 
@@ -81,7 +81,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign boolean to integer values >
+<TC - 060100_002 Assign boolean to integer values >
 
 <COMPILE>
 
@@ -108,7 +108,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign integer to float values >
+<TC - 060100_003 Assign integer to float values >
 
 <COMPILE>
 
@@ -135,7 +135,7 @@ error: float value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign boolean to float values >
+<TC - 060100_004 Assign boolean to float values >
 
 <COMPILE>
 
@@ -162,7 +162,7 @@ error: float value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign verdicttype to float values >
+<TC - 060100_005 Assign verdicttype to float values >
 
 <COMPILE>
 
@@ -189,7 +189,7 @@ error: float value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign integer to verdicttype values >
+<TC - 060100_006 Assign integer to verdicttype values >
 
 <COMPILE>
 
@@ -216,7 +216,7 @@ error: verdict value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid bitstring value >
+<TC - 060101_001 Assign invalid bitstring value >
 
 <COMPILE>
 
@@ -243,7 +243,7 @@ error: Bitstring value contains invalid character
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign string to bitstring values >
+<TC - 060101_002 Assign string to bitstring values >
 
 <COMPILE>
 
@@ -270,7 +270,7 @@ error: bitstring value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign octetstring to bitstring values >
+<TC - 060101_003 Assign octetstring to bitstring values >
 
 <COMPILE>
 
@@ -297,7 +297,7 @@ error: bitstring value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid hexstring value >
+<TC - 060101_004 Assign invalid hexstring value >
 
 <COMPILE>
 
@@ -324,7 +324,7 @@ error: Invalid character `H' \(0x48\) in binary string
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign string to hexstring values >
+<TC - 060101_005 Assign string to hexstring values >
 
 <COMPILE>
 
@@ -351,7 +351,7 @@ error: hexstring value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign octetstring to hexstring values >
+<TC - 060101_006 Assign octetstring to hexstring values >
 
 <COMPILE>
 
@@ -378,7 +378,7 @@ error: hexstring value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid octetstring value >
+<TC - 060101_007 Assign invalid octetstring value >
 
 <COMPILE>
 
@@ -405,7 +405,7 @@ error: Octetstring value contains odd number of hexadecimal digits
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign string to octetstring values >
+<TC - 060101_008 Assign string to octetstring values >
 
 <COMPILE>
 
@@ -432,7 +432,7 @@ error: octetstring value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign hexstring to octetstring values >
+<TC - 060101_009 Assign hexstring to octetstring values >
 
 <COMPILE>
 
@@ -459,7 +459,7 @@ error: octetstring value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid hexstring value >
+<TC - 060101_010 Assign invalid hexstring value >
 
 <COMPILE>
 
@@ -486,7 +486,7 @@ error: Invalid character `H' \(0x48\) in binary string
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to restricted bitstring. >
+<TC - 06010201_001 Assign values to restricted bitstring. >
 
 <COMPILE>
 
@@ -524,7 +524,7 @@ error: '00'B is not a valid value for type `bitstring' which has subtype length\
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to restricted hexstring. >
+<TC - 06010201_002 Assign values to restricted hexstring. >
 
 <COMPILE>
 
@@ -562,7 +562,7 @@ error: '00'H is not a valid value for type `hexstring' which has subtype \('01'H
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to restricted octetstring. >
+<TC - 06010201_003 Assign values to restricted octetstring. >
 
 <COMPILE>
 
@@ -600,7 +600,7 @@ error: '00'O is not a valid value for type `octetstring' which has subtype \('01
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to restricted charstring. >
+<TC - 06010201_004 Assign values to restricted charstring. >
 
 <COMPILE>
 
@@ -638,7 +638,7 @@ error: "d" is not a valid value for type `charstring' which has subtype \("a","a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to restricted integer. >
+<TC - 06010201_005 Assign values to restricted integer. >
 
 <COMPILE>
 
@@ -676,7 +676,7 @@ error: 2 is not a valid value for type `integer' which has subtype \(1,5\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to restricted float. >
+<TC - 06010201_006 Assign values to restricted float. >
 
 <COMPILE>
 
@@ -714,7 +714,7 @@ error: 2.0e0 is not a valid value for type `float' which has subtype \(1.0e0,5.0
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted bitstring. >
+<TC - 06010202_001 Assign invalid values to list of types restricted bitstring. >
 
 <COMPILE>
 
@@ -754,7 +754,7 @@ error: '11'B is not a valid value for type `bitstring' which has subtype length\
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted hexstring. >
+<TC - 06010202_002 Assign invalid values to list of types restricted hexstring. >
 
 <COMPILE>
 
@@ -795,7 +795,7 @@ error: 'FE70'H is not a valid value for type `hexstring' which has subtype \('00
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted octetstring. >
+<TC - 06010202_003 Assign invalid values to list of types restricted octetstring. >
 
 <COMPILE>
 
@@ -836,7 +836,7 @@ error: '0014'O is not a valid value for type `octetstring' which has subtype \('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted charstring. >
+<TC - 06010202_004 Assign invalid values to list of types restricted charstring. >
 
 <COMPILE>
 
@@ -877,7 +877,7 @@ error: "xyz" is not a valid value for type `charstring' which has subtype \("abc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted universal charstrings. >
+<TC - 06010202_005 Assign invalid values to list of types restricted universal charstrings. >
 
 <COMPILE>
 
@@ -917,7 +917,7 @@ error: "\?" is not a valid value for type `universal charstring' which has subty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted integers. >
+<TC - 06010202_006 Assign invalid values to list of types restricted integers. >
 
 <COMPILE>
 
@@ -958,7 +958,7 @@ error: 15 is not a valid value for type `integer' which has subtype \(0..9,20..3
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted floats. >
+<TC - 06010202_007 Assign invalid values to list of types restricted floats. >
 
 <COMPILE>
 
@@ -999,7 +999,7 @@ error: 1.55e1 is not a valid value for type `float' which has subtype \(1.0e0..9
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted boolean value. >
+<TC - 06010202_008 Assign invalid values to list of types restricted boolean value. >
 
 <COMPILE>
 
@@ -1040,7 +1040,7 @@ error: true is not a valid value for type `boolean' which has subtype \(false\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to list of types restricted verdicttype. >
+<TC - 06010202_009 Assign invalid values to list of types restricted verdicttype. >
 
 <COMPILE>
 
@@ -1081,7 +1081,7 @@ error: fail is not a valid value for type `verdicttype' which has subtype \(none
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to restricted integer. >
+<TC - 06010203_001 Assign invalid values to restricted integer. >
 
 <COMPILE>
 
@@ -1119,7 +1119,7 @@ error: -1 is not a valid value for type `integer' which has subtype \(0..255\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to restricted integer. >
+<TC - 06010203_002 Assign invalid values to restricted integer. >
 
 <COMPILE>
 
@@ -1157,7 +1157,7 @@ error: 1 is not a valid value for type `integer' which has subtype \(-infinity..
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assure that not_a_number is not allowed in float range subtyping. >
+<TC - 06010203_003 Assure that not_a_number is not allowed in float range subtyping. >
 
 <COMPILE>
 
@@ -1196,7 +1196,7 @@ error: upper boundary cannot be not_a_number in float subtype range
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to restricted integer with exclusive bounds. >
+<TC - 06010203_004 Assign invalid values to restricted integer with exclusive bounds. >
 
 <COMPILE>
 
@@ -1234,7 +1234,7 @@ error: -3 is not a valid value for type `integer' which has subtype \(-2..0\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to restricted integer with exclusive bounds. >
+<TC - 06010203_005 Assign invalid values to restricted integer with exclusive bounds. >
 
 <COMPILE>
 
@@ -1272,7 +1272,7 @@ error: 0 is not a valid value for type `integer' which has subtype \(-infinity..
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign range to boolean not permitted. >
+<TC - 06010203_006 Assign range to boolean not permitted. >
 
 <COMPILE>
 
@@ -1313,7 +1313,7 @@ error: Range subtyping is not allowed for type `boolean'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid value to range constrained charstring. >
+<TC - 06010203_007 Assign invalid value to range constrained charstring. >
 
 <COMPILE>
 
@@ -1352,7 +1352,7 @@ error: "a" is not a valid value for type `charstring' which has subtype from\("b
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid value to range constrained charstring. >
+<TC - 06010203_008 Assign invalid value to range constrained charstring. >
 
 <COMPILE>
 
@@ -1391,7 +1391,7 @@ error: "f" is not a valid value for type `charstring' which has subtype from\("a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid value to range constrained charstring. >
+<TC - 06010203_009 Assign invalid value to range constrained charstring. >
 
 <COMPILE>
 
@@ -1430,7 +1430,7 @@ error: "g" is not a valid value for type `charstring' which has subtype from\("a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to restricted float. >
+<TC - 06010203_010 Assign invalid values to restricted float. >
 
 <COMPILE>
 
@@ -1468,7 +1468,7 @@ error: 1.0e0 is not a valid value for type `float' which has subtype \(-INF..0.0
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to restricted float. >
+<TC - 06010203_011 Assign invalid values to restricted float. >
 
 <COMPILE>
 
@@ -1506,7 +1506,7 @@ error: 1.0e1 is not a valid value for type `float' which has subtype \(-5.0e0..0
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to range excluded restricted float. >
+<TC - 06010203_012 Assign invalid values to range excluded restricted float. >
 
 <COMPILE>
 
@@ -1544,7 +1544,7 @@ error: 1.0e1 is not a valid value for type `float' which has subtype \(-1.0e0..!
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid value to range constrained universal charstring. >
+<TC - 06010203_013 Assign invalid value to range constrained universal charstring. >
 
 <COMPILE>
 
@@ -1583,7 +1583,7 @@ error: char\(0, 0, 1, 100\) is not a valid value for type `universal charstring'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid value to range constrained universal charstring with mixed bounds. >
+<TC - 06010203_014 Assign invalid value to range constrained universal charstring with mixed bounds. >
 
 <COMPILE>
 
@@ -1622,7 +1622,7 @@ error: char\(0, 0, 1, 113\) is not a valid value for type `universal charstring'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid value to range constrained charstring. >
+<TC - 06010203_015 Assign invalid value to range constrained charstring. >
 
 <COMPILE>
 
@@ -1661,7 +1661,7 @@ error: "abcgef" is not a valid value for type `charstring' which has subtype fro
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Invalid value infinity for range constrained charstring. >
+<TC - 06010203_016 Invalid value infinity for range constrained charstring. >
 
 <COMPILE>
 
@@ -1700,7 +1700,7 @@ error: upper boundary of a charstring subtype range cannot be infinity
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Invalid value -infinity for range constrained charstring. >
+<TC - 06010203_017 Invalid value -infinity for range constrained charstring. >
 
 <COMPILE>
 
@@ -1739,7 +1739,7 @@ error: lower boundary of a charstring subtype range cannot be -infinity
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Invalid value -infinity for range constrained charstring. >
+<TC - 06010204_001 Invalid value -infinity for range constrained charstring. >
 
 <COMPILE>
 
@@ -1777,7 +1777,7 @@ error: '111'B is not a valid value for type `bitstring' which has subtype length
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted bitstring. >
+<TC - 06010204_002 Assign invalid values to length restricted bitstring. >
 
 <COMPILE>
 
@@ -1815,7 +1815,7 @@ error: '111'B is not a valid value for type `bitstring' which has subtype length
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted hexstring >
+<TC - 06010204_003 Assign invalid values to length restricted hexstring >
 
 <COMPILE>
 
@@ -1854,7 +1854,7 @@ error: 'FE00'H is not a valid value for type `hexstring' which has subtype lengt
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted hexstring >
+<TC - 06010204_004 Assign invalid values to length restricted hexstring >
 
 <COMPILE>
 
@@ -1893,7 +1893,7 @@ error: 'A'H is not a valid value for type `hexstring' which has subtype length\(
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted octetstring >
+<TC - 06010204_005 Assign invalid values to length restricted octetstring >
 
 <COMPILE>
 
@@ -1932,7 +1932,7 @@ error: 'FE8001'O is not a valid value for type `octetstring' which has subtype l
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted octetstring >
+<TC - 06010204_006 Assign invalid values to length restricted octetstring >
 
 <COMPILE>
 
@@ -1971,7 +1971,7 @@ error: 'FE'O is not a valid value for type `octetstring' which has subtype lengt
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted charstring >
+<TC - 06010204_007 Assign invalid values to length restricted charstring >
 
 <COMPILE>
 
@@ -2010,7 +2010,7 @@ error: "a" is not a valid value for type `charstring' which has subtype length\(
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to length restricted charstring >
+<TC - 06010204_008 Assign invalid values to length restricted charstring >
 
 <COMPILE>
 
@@ -2049,7 +2049,7 @@ error: "abc" is not a valid value for type `charstring' which has subtype length
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - upper boundary should be greater than lower boundary in string length restictions >
+<TC - 06010204_001 upper boundary should be greater than lower boundary in string length restictions >
 
 <COMPILE>
 
@@ -2077,7 +2077,7 @@ error: The upper boundary of the length restriction \(1\) cannot be smaller than
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - boundary integers should be non negative integers >
+<TC - 06010204_002 boundary integers should be non negative integers >
 
 <COMPILE>
 
@@ -2105,7 +2105,7 @@ error: The upper boundary of the length restriction must be a non-negative integ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to pattern restricted character strings. >
+<TC - 06010205_001 Assign invalid values to pattern restricted character strings. >
 
 <COMPILE>
 
@@ -2143,7 +2143,7 @@ error: "abcyz" is not a valid value for type `charstring' which has subtype patt
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign values to pattern restricted character strings without @nocase modifier. >
+<TC - 06010205_001 Assign values to pattern restricted character strings without @nocase modifier. >
 
 <COMPILE>
 
@@ -2182,7 +2182,7 @@ error: "ABc1234xYz" is not a valid value for type `charstring' which has subtype
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign quadruple values to pattern restricted character strings. >
+<TC - 06010205_002 Assign quadruple values to pattern restricted character strings. >
 
 <COMPILE>
 
@@ -2221,7 +2221,7 @@ error: char\(0, 0, 0, 197\) & char\(0, 0, 0, 180\) \& "abc" is not a valid value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted floats. >
+<TC - 0601020601_001 Assign invalid values to mixed restricted floats. >
 
 <COMPILE>
 
@@ -2259,7 +2259,7 @@ error: 4.0e0 is not a valid value for type `float' which has subtype \(-INF..3.1
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted integers. >
+<TC - 0601020601_002 Assign invalid values to mixed restricted integers. >
 
 <COMPILE>
 
@@ -2297,7 +2297,7 @@ error: 6 is not a valid value for type `integer' which has subtype \(1,5,10,100.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted character strings. >
+<TC - 0601020602_001 Assign invalid values to mixed restricted character strings. >
 
 <COMPILE>
 
@@ -2335,7 +2335,7 @@ error: "abcyz" is not a valid value for type `charstring' which has subtype \(pa
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted character strings. >
+<TC - 0601020602_002 Assign invalid values to mixed restricted character strings. >
 
 <COMPILE>
 
@@ -2373,7 +2373,7 @@ error: "abc123xyz" is not a valid value for type `charstring' which has subtype
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted character strings. >
+<TC - 0601020602_003 Assign invalid values to mixed restricted character strings. >
 
 <COMPILE>
 
@@ -2411,7 +2411,7 @@ error: "abc1xyz" is not a valid value for type `charstring' which has subtype \(
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted bit strings. >
+<TC - 0601020602_004 Assign invalid values to mixed restricted bit strings. >
 
 <COMPILE>
 
@@ -2449,7 +2449,7 @@ error: '111'B is not a valid value for type `bitstring' which has subtype \('101
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign invalid values to mixed restricted hex strings. >
+<TC - 0601020602_005 Assign invalid values to mixed restricted hex strings. >
 
 <COMPILE>
 
@@ -2487,7 +2487,7 @@ error: '1F1'H is not a valid value for type `hexstring' which has subtype \('103
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -Assign invalid values to mixed restricted octet strings. >
+<TC - 0601020602_006 Assign invalid values to mixed restricted octet strings. >
 
 <COMPILE>
 
@@ -2529,7 +2529,7 @@ error: 'FF1111'O is not a valid value for type `octetstring' which has subtype \
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that value list notation can not be used for a union type. >
+<TC - 0602_001 Ensure that value list notation can not be used for a union type. >
 
 <COMPILE>
 
@@ -2574,7 +2574,7 @@ error: union value was expected for type `@NegSem_0602_TopLevel_001.MyUnion'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that indexed notation can not be used for a record type. >
+<TC - 0602_002 Ensure that indexed notation can not be used for a record type. >
 
 <COMPILE>
 
@@ -2626,7 +2626,7 @@ error: Type `@NegSem_0602_TopLevel_002.MyRecord' cannot be indexed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that indexed notation can not be used for a set type.  >
+<TC - 0602_003 Ensure that indexed notation can not be used for a set type.  >
 
 <COMPILE>
 
@@ -2678,7 +2678,7 @@ error: Type `@NegSem_0602_TopLevel_003.MySet' cannot be indexed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that indexed notation can not be used for a union type. >
+<TC - 0602_004 Ensure that indexed notation can not be used for a union type. >
 
 <COMPILE>
 
@@ -2728,7 +2728,7 @@ error: Type `@NegSem_0602_TopLevel_004.MyUnion' cannot be indexed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Invalid recursive union type definition causing an error >
+<TC - 0602_001 Invalid recursive union type definition causing an error >
 
 <COMPILE>
 
@@ -2762,7 +2762,7 @@ error: While checking embedded recursions: Circular reference: `@NegSyn_0602_Top
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Invalid recursive record type definition causing an error >
+<TC - 0602_002 Invalid recursive record type definition causing an error >
 
 <COMPILE>
 
@@ -2794,7 +2794,7 @@ error: While checking embedded recursions: Circular reference: `@NegSyn_0602_Top
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Combined value list and assignment notation not allowed in the same (immediate) context. >
+<TC - 0602_003 Combined value list and assignment notation not allowed in the same (immediate) context. >
 
 <COMPILE>
 
@@ -2830,7 +2830,7 @@ error: at or before token `"': syntax error, unexpected Cstring
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 060201_001 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -2867,7 +2867,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 060201_002 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -2904,7 +2904,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 06020101_001 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -2954,7 +2954,7 @@ error: 11 is not a valid value for type `integer' which has subtype \(1..10\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 06020101_002 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -3007,7 +3007,7 @@ error: While checking referenced type: Circular reference: `@NegSem_06020101_Ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 06020101_003 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -3065,7 +3065,7 @@ Dynamic test case error: Unbound left operand of integer comparison.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 06020101_004 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -3124,7 +3124,7 @@ Dynamic test case error: Using the value of an optional field containing omit.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 060202_001 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -3175,7 +3175,7 @@ error: 11 is not a valid value for type `integer' which has subtype \(1..10\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 060202_001 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -3212,7 +3212,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The omit keyword shall not be used for mandatory fields. >
+<TC - 060202_002 The omit keyword shall not be used for mandatory fields. >
 
 <COMPILE>
 
@@ -3249,7 +3249,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that the inner type referencing is correctly handled >
+<TC - 060203_001 ensure that the inner type referencing is correctly handled >
 
 <COMPILE>
 
@@ -3292,7 +3292,7 @@ error: 11 is not a valid value for type `integer' which has subtype \(1..10\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that the inner type referencing is correctly handled >
+<TC - 060203_002 ensure that the inner type referencing is correctly handled >
 
 <COMPILE>
 
@@ -3336,7 +3336,7 @@ error: \{ 8, 1, 2, 3, 4, 5, 6, 7 \} is not a valid value for type `@NegSem_06020
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - negative index applied to a record of value on the right hand side of an assignment >
+<TC - 060203_003 negative index applied to a record of value on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -3383,7 +3383,7 @@ error: A non-negative integer value was expected for indexing type `@NegSem_0602
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - negative index applied to a set of value on the right hand side of an assignment >
+<TC - 060203_004 negative index applied to a set of value on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -3430,7 +3430,7 @@ error: A non-negative integer value was expected for indexing type `@NegSem_0602
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -negative index applied to a record of value on the left hand side of an assignment >
+<TC - 060203_005 negative index applied to a record of value on the left hand side of an assignment >
 
 <COMPILE>
 
@@ -3477,7 +3477,7 @@ error: A non-negative integer value was expected for indexing type `@NegSem_0602
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -negative index applied to a set of value on the left hand side of an assignment >
+<TC - 060203_006 negative index applied to a set of value on the left hand side of an assignment >
 
 <COMPILE>
 
@@ -3524,7 +3524,7 @@ error: A non-negative integer value was expected for indexing type `@NegSem_0602
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -wrong index type applied to a record of value on the right hand side of an assignment >
+<TC - 060203_007 wrong index type applied to a record of value on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -3571,7 +3571,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to a set of value on the right hand side of an assignment >
+<TC - 060203_008 wrong index type applied to a set of value on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -3618,7 +3618,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to a record of value on the left hand side of an assignment >
+<TC - 060203_009 wrong index type applied to a record of value on the left hand side of an assignment >
 
 <COMPILE>
 
@@ -3665,7 +3665,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to a set of value on the left hand side of an assignment >
+<TC - 060203_010 wrong index type applied to a set of value on the left hand side of an assignment >
 
 <COMPILE>
 
@@ -3712,7 +3712,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to a record of value on the right hand side of an assignment >
+<TC - 060203_013 wrong index type applied to a record of value on the right hand side of an assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -3761,7 +3761,7 @@ Dynamic test case error: Index overflow in a value of type @PreGenRecordOf.PREGE
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to a record of value on the right hand side of an assignment >
+<TC - 060203_014 wrong index type applied to a record of value on the right hand side of an assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -3810,7 +3810,7 @@ Dynamic test case error: Index overflow in a value of type @PreGenRecordOf.PREGE
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify than an error is generated when sending a partially initialized record of value >
+<TC - 060203_015 verify than an error is generated when sending a partially initialized record of value >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -3864,7 +3864,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - array as a record-of value index on right hand side (less items than record-of dimension) >
+<TC - 060203_016 array as a record-of value index on right hand side (less items than record-of dimension) >
 
 <COMPILE>
 
@@ -3917,7 +3917,7 @@ error: The type `integer\[3\]' contains too many indexes \(3\) in the short-hand
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - array as a record-of value index on left hand side (less items than record-of dimension) >
+<TC - 060203_017 array as a record-of value index on left hand side (less items than record-of dimension) >
 
 <COMPILE>
 
@@ -3971,7 +3971,7 @@ error: The type `integer\[3\]' contains too many indexes \(3\) in the short-hand
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - fixed-size record-of as a record-of value index on right hand side (less items than record-of dimension) >
+<TC - 060203_018 fixed-size record-of as a record-of value index on right hand side (less items than record-of dimension) >
 
 <COMPILE>
 
@@ -4025,7 +4025,7 @@ error: The type `@NegSem_060203_records_and_sets_of_single_types_018.Indexer' co
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - fixed-size record-of as a record-of value index on left hand side (less items than record-of dimension) >
+<TC - 060203_019 fixed-size record-of as a record-of value index on left hand side (less items than record-of dimension) >
 
 <COMPILE>
 
@@ -4080,7 +4080,7 @@ error: The type `@NegSem_060203_records_and_sets_of_single_types_019.Indexer' co
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - fixed-size set-of as a record-of value index on right hand side >
+<TC - 060203_020 fixed-size set-of as a record-of value index on right hand side >
 
 <COMPILE>
 
@@ -4137,7 +4137,7 @@ error: The operands of operation `==' should be of compatible types
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - fixed-size set-of as a record-of value index on left hand side >
+<TC - 060203_021 fixed-size set-of as a record-of value index on left hand side >
 
 <COMPILE>
 
@@ -4195,7 +4195,7 @@ error: record of value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - variable-size record-of as a record-of value index on right hand side >
+<TC - 060203_022 variable-size record-of as a record-of value index on right hand side >
 
 <COMPILE>
 
@@ -4249,7 +4249,7 @@ error: The type `@NegSem_060203_records_and_sets_of_single_types_022.Indexer' mu
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - variable-size record-of as a record-of value index on left hand side (less items than record-of dimension) >
+<TC - 060203_023 variable-size record-of as a record-of value index on left hand side (less items than record-of dimension) >
 
 <COMPILE>
 
@@ -4304,7 +4304,7 @@ error: The type `@NegSem_060203_records_and_sets_of_single_types_023.Indexer' mu
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that value list cannot contain an empty assignment >
+<TC - 060203_001 ensure that value list cannot contain an empty assignment >
 
 <COMPILE>
 
@@ -4350,7 +4350,7 @@ error: at or before token `,': syntax error, unexpected ','
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - not unique identifiers in enumerated type declaration >
+<TC - 060204_001 not unique identifiers in enumerated type declaration >
 
 <COMPILE>
 
@@ -4386,7 +4386,7 @@ error: Duplicate enumeration identifier `Monday'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - two equal user-assigned enumerated values >
+<TC - 060204_002 two equal user-assigned enumerated values >
 
 <COMPILE>
 
@@ -4421,7 +4421,7 @@ error: Duplicate numeric value 2 for enumeration `Wednesday'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using enumerated value number directly (left hand side of assignments) >
+<TC - 060204_003 using enumerated value number directly (left hand side of assignments) >
 
 <COMPILE>
 
@@ -4475,7 +4475,7 @@ error: enumerated value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using enumerated value number directly (right hand side of assignments) >
+<TC - 060204_004 using enumerated value number directly (right hand side of assignments) >
 
 <COMPILE>
 
@@ -4530,7 +4530,7 @@ error: Type mismatch: a value of type `integer' was expected instead of `@NegSem
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using enumerated value without implicit or explicit type reference >
+<TC - 060204_005 using enumerated value without implicit or explicit type reference >
 
 <COMPILE>
 
@@ -4580,7 +4580,7 @@ error: Cannot determine the type of the operands in operation `!='
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - assignment notation for union values with two items >
+<TC - 060205_001 assignment notation for union values with two items >
 
 <COMPILE>
 
@@ -4628,7 +4628,7 @@ error: Only one field was expected in union value instead of 2
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - assignment notation for union values with unknown alternative >
+<TC - 060205_002 assignment notation for union values with unknown alternative >
 
 <COMPILE>
 
@@ -4677,7 +4677,7 @@ error: Reference to non-existent field `option3' in union value for type `@NegSe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - "not used" symbol in union value notations >
+<TC - 060205_003 "not used" symbol in union value notations >
 
 <COMPILE>
 
@@ -4724,7 +4724,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - omit symbol in union value notations >
+<TC - 060205_004 omit symbol in union value notations >
 
 <COMPILE>
 
@@ -4771,7 +4771,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value list notation used for union value definition >
+<TC - 060205_005 value list notation used for union value definition >
 
 <COMPILE>
 
@@ -4817,7 +4817,7 @@ error: union value was expected for type `@NegSem_060205_top_level_005.U'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - union type declaration with two equal identifiers >
+<TC - 060205_001 union type declaration with two equal identifiers >
 
 <COMPILE>
 
@@ -4855,7 +4855,7 @@ error: Duplicate union field name `option1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - unknown union alternative in value dot notation >
+<TC - 06020501_001 unknown union alternative in value dot notation >
 
 <COMPILE>
 
@@ -4907,7 +4907,7 @@ error: Reference to non-existent field `option3' in type `@NegSem_06020501_refer
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - unknown union alternative in extended type reference >
+<TC - 06020501_002 unknown union alternative in extended type reference >
 
 <COMPILE>
 
@@ -4960,7 +4960,7 @@ error: Reference to non-existent field `option3' in type `@NegSem_06020501_refer
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - union alternative referencing itself >
+<TC - 06020501_003 union alternative referencing itself >
 
 <COMPILE>
 
@@ -5007,7 +5007,7 @@ error: While checking referenced type: Circular reference: `@NegSem_06020501_ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - union alternative referencing indirectly itself >
+<TC - 06020501_004 union alternative referencing indirectly itself >
 
 <COMPILE>
 
@@ -5055,7 +5055,7 @@ error: While checking referenced type: Circular reference: `@NegSem_06020501_ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - union alternative costraint passed through extended type reference >
+<TC - 06020501_005 union alternative costraint passed through extended type reference >
 
 <COMPILE>
 
@@ -5107,7 +5107,7 @@ error: 100 is not a valid value for type `integer' which has subtype \(1..10\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - referencing not chosen alternative on right hand side of assignment >
+<TC - 06020501_006 referencing not chosen alternative on right hand side of assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5158,7 +5158,7 @@ Dynamic test case error: Using non-selected field option2 in a value of union ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - referencing not chosen alternative on right hand side of assignment >
+<TC - 06020501_007 referencing not chosen alternative on right hand side of assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5215,7 +5215,7 @@ Dynamic test case error: Using non-selected field option1 in a value of union ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - referencing alternative of omitted union on right hand side of assignment >
+<TC - 06020501_008 referencing alternative of omitted union on right hand side of assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5273,7 +5273,7 @@ Dynamic test case error: Using the value of an optional field containing omit.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - referencing alternative of omitted union on right hand side of assignment >
+<TC - 06020502_001 referencing alternative of omitted union on right hand side of assignment >
 
 <COMPILE>
 
@@ -5308,7 +5308,7 @@ error: at or before token `optional': syntax error, unexpected OptionalKeyword,
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that after redeclaration of an anytype value the old type and value are lost >
+<TC - 060206_001 ensure that after redeclaration of an anytype value the old type and value are lost >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5364,7 +5364,7 @@ Dynamic test case error: Using non-selected field integer in a value of union ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that anytype can not be address type if not explicitly declareted in the module >
+<TC - 060206_002 Ensure that anytype can not be address type if not explicitly declareted in the module >
 
 <COMPILE>
 
@@ -5417,7 +5417,7 @@ error: Type `address' is not defined in this module
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that anytype cannot be port type >
+<TC - 060206_002 ensure that anytype cannot be port type >
 
 <COMPILE>
 
@@ -5471,7 +5471,7 @@ error: Reference to a value was expected instead of port `@NegSyn_060206_anytype
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that the value limitation is correctly handled within array >
+<TC - 060207_001 ensure that the value limitation is correctly handled within array >
 
 <COMPILE>
 
@@ -5514,7 +5514,7 @@ error: 11 is not a valid value for type `integer' which has subtype \(1..10\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that the inner type referencing is correctly handled >
+<TC - 060207_002 ensure that the inner type referencing is correctly handled >
 
 <COMPILE>
 
@@ -5557,7 +5557,7 @@ error: Too many elements in the array value: 5 was expected instead of 7
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - negative index applied to an array on the right hand side of an assignment >
+<TC - 060207_003 negative index applied to an array on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -5606,7 +5606,7 @@ error: Array index underflow: the index value must be at least `0' instead of `-
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - negative index applied to an array on the left hand side of an assignment >
+<TC - 060207_004 negative index applied to an array on the left hand side of an assignment >
 
 <COMPILE>
 
@@ -5655,7 +5655,7 @@ error: Array index underflow: the index value must be at least `0' instead of `-
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to an array on the right hand side of an assignment >
+<TC - 060207_005 wrong index type applied to an array on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -5710,7 +5710,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to an array on the left hand side of an assignment >
+<TC - 060207_006 wrong index type applied to an array on the left hand side of an assignment >
 
 <COMPILE>
 
@@ -5765,7 +5765,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - array index greater than the upper bound (left-hand side) >
+<TC - 060207_007 array index greater than the upper bound (left-hand side) >
 
 <COMPILE>
 
@@ -5813,7 +5813,7 @@ error: Array index overflow: the index value must be at most `4' instead of `5'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - wrong index type applied to an array on the right hand side of an assignment >
+<TC - 060207_008 wrong index type applied to an array on the right hand side of an assignment >
 
 <COMPILE>
 
@@ -5861,7 +5861,7 @@ error: Array index overflow: the index value must be at most `4' instead of `5'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify than an error is generated when sending a partially initialized array >
+<TC - 060207_009 verify than an error is generated when sending a partially initialized array >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5912,7 +5912,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that the value limitation is correctly handled within array >
+<TC - 060207_010 ensure that the value limitation is correctly handled within array >
 
 <COMPILE>
 
@@ -5965,7 +5965,7 @@ error: 0 is not a valid value for type `integer' which has subtype \(1..10\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - runtime resolved constant in array type declaration >
+<TC - 060207_011 runtime resolved constant in array type declaration >
 
 <COMPILE>
 
@@ -6019,7 +6019,7 @@ error: Reference to a constant value was expected instead of the return value of
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - runtime resolved constant in array variable declaration >
+<TC - 060207_012 runtime resolved constant in array variable declaration >
 
 <COMPILE>
 
@@ -6072,7 +6072,7 @@ error: Reference to a constant value was expected instead of the return value of
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - variable in array variable declaration >
+<TC - 060207_013 variable in array variable declaration >
 
 <COMPILE>
 
@@ -6124,7 +6124,7 @@ error: Reference to a constant value was expected instead of variable `v_dimensi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - modulepar in array variable declaration >
+<TC - 060207_014 modulepar in array variable declaration >
 
 <COMPILE>
 
@@ -6177,7 +6177,7 @@ error: Reference to an \(evaluable\) constant value was expected instead of modu
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - zero dimension array >
+<TC - 060207_015 zero dimension array >
 
 <COMPILE>
 
@@ -6222,7 +6222,7 @@ error: A positive integer value was expected as array size instead of `0'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - array with negative dimension >
+<TC - 060207_016 array with negative dimension >
 
 <COMPILE>
 
@@ -6267,7 +6267,7 @@ error: A positive integer value was expected as array size instead of `-1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - float instead of integer in array dimension >
+<TC - 060207_019 float instead of integer in array dimension >
 
 <COMPILE>
 
@@ -6312,7 +6312,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - integer array with too many items as multidimensional array index >
+<TC - 060207_020 integer array with too many items as multidimensional array index >
 
 <COMPILE>
 
@@ -6360,7 +6360,7 @@ error: The type `integer\[3\]' contains too many indexes \(3\) in the short-hand
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - variable-size record of integer as multidimensional array index >
+<TC - 060207_021 variable-size record of integer as multidimensional array index >
 
 <COMPILE>
 
@@ -6411,7 +6411,7 @@ error: The type `@NegSem_060207_arrays_021.RI' must have single size length rest
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using lower than allowed custom array index on the right hand side of assignments >
+<TC - 060207_022 using lower than allowed custom array index on the right hand side of assignments >
 
 <COMPILE>
 
@@ -6457,7 +6457,7 @@ error: Array index underflow: the index value must be at least `2' instead of `0
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using lower than allowed custom array index on the left hand side of assignments >
+<TC - 060207_023 using lower than allowed custom array index on the left hand side of assignments >
 
 <COMPILE>
 
@@ -6503,7 +6503,7 @@ error: Array index underflow: the index value must be at least `2' instead of `0
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using greater than allowed custom array index on the right hand side of assignments >
+<TC - 060207_024 using greater than allowed custom array index on the right hand side of assignments >
 
 <COMPILE>
 
@@ -6548,7 +6548,7 @@ error: Array index overflow: the index value must be at most `5' instead of `6'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using greater than allowed custom array index on the left hand side of assignments >
+<TC - 060207_025 using greater than allowed custom array index on the left hand side of assignments >
 
 <COMPILE>
 
@@ -6593,7 +6593,7 @@ error: Array index overflow: the index value must be at most `5' instead of `6'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using greater than allowed custom array index on the left hand side of assignments >
+<TC - 060207_026 using greater than allowed custom array index on the left hand side of assignments >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6647,7 +6647,7 @@ Dynamic test case error: Assignment of an unbound integer value.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using greater than allowed custom array index on the left hand side of assignments >
+<TC - 060207_027 using greater than allowed custom array index on the left hand side of assignments >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6700,7 +6700,7 @@ Dynamic test case error: Copying an unbound integer value.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - using greater than allowed custom array index on the left hand side of assignments >
+<TC - 060207_028 using greater than allowed custom array index on the left hand side of assignments >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6753,7 +6753,7 @@ Dynamic test case error: Using the value of an optional field containing omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that array cannot contain an empty assignment >
+<TC - 060207_001 ensure that array cannot contain an empty assignment >
 
 <COMPILE>
 
@@ -6796,7 +6796,7 @@ error: at or before token `,': syntax error, unexpected ','
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that array field cannot contain an empty index >
+<TC - 060207_002 ensure that array field cannot contain an empty index >
 
 <COMPILE>
 
@@ -6839,7 +6839,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that array field cannot contain an empty index >
+<TC - 060207_003 ensure that array field cannot contain an empty index >
 
 <COMPILE>
 
@@ -6883,7 +6883,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - infinity in array variable dimension >
+<TC - 060207_004 infinity in array variable dimension >
 
 <COMPILE>
 
@@ -6922,7 +6922,7 @@ error: A value or expression of type integer was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that an error is generated when a message port type definition contains no message typess >
+<TC - 060209_004 Verify that an error is generated when a message port type definition contains no message typess >
 
 <COMPILE>
 
@@ -6975,7 +6975,7 @@ error: at or before token `\}': syntax error, unexpected '\}', expecting InOutPa
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that an error is generated when a procedure port type definition contains no signatures >
+<TC - 060209_005 Verify that an error is generated when a procedure port type definition contains no signatures >
 
 <COMPILE>
 
@@ -7028,7 +7028,7 @@ error: at or before token `\}': syntax error, unexpected '\}', expecting InOutPa
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that cyclic extension is not allowed >
+<TC - 060210_001 Ensure that cyclic extension is not allowed >
 
 <COMPILE>
 
@@ -7088,7 +7088,7 @@ error: While checking component type extensions: Circular reference: `@NegSyn_06
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that cyclic extension is not allowed >
+<TC - 060210_002 Ensure that cyclic extension is not allowed >
 
 <COMPILE>
 
@@ -7149,7 +7149,7 @@ error: Local definition `MyInt' collides with definition inherited from componen
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that cyclic extension is not allowed >
+<TC - 060210_003 Ensure that cyclic extension is not allowed >
 
 <COMPILE>
 
@@ -7208,7 +7208,7 @@ error: Local definition `MyInt' collides with definition inherited from componen
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The length subtyping check for 'record of' or 'set of' types >
+<TC - 06021301_001 The length subtyping check for 'record of' or 'set of' types >
 
 <COMPILE>
 
@@ -7239,7 +7239,7 @@ error: The subtype restriction is not a subset of the restriction on the parent
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The length subtyping check for 'record of' or 'set of' types >
+<TC - 06021301_002 The length subtyping check for 'record of' or 'set of' types >
 
 <COMPILE>
 
@@ -7270,7 +7270,7 @@ error: The subtype restriction is not a subset of the restriction on the parent
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The length subtyping check for 'record of' or 'set of' types >
+<TC - 06021301_003 The length subtyping check for 'record of' or 'set of' types >
 
 <COMPILE>
 
@@ -7300,7 +7300,7 @@ error: at or before token `!': syntax error, unexpected '!'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - The length subtyping check for 'record of' or 'set of' types >
+<TC - 06021301_004 The length subtyping check for 'record of' or 'set of' types >
 
 <COMPILE>
 
@@ -7330,7 +7330,7 @@ error: at or before token `!': syntax error, unexpected '!'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that list subtyping check for record types is properly handled >
+<TC - 06021302_001 ensure that list subtyping check for record types is properly handled >
 
 <COMPILE>
 
@@ -7372,7 +7372,7 @@ error: The subtype restriction is not a subset of the restriction on the parent
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - ensure that list subtyping check for record types is properly handled >
+<TC - 06021302_002 ensure that list subtyping check for record types is properly handled >
 
 <COMPILE>
 
@@ -7418,7 +7418,7 @@ error: The subtype restriction is not a subset of the restriction on the parent
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles assignments from compatible size restrictions  >
+<TC - 060301_007 Ensure that the IUT correctly handles assignments from compatible size restrictions  >
 
 <COMPILE>
 
@@ -7463,7 +7463,7 @@ error: Type mismatch: `integer\[1\]' and `integer\[2\]' are not compatible: Arra
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles assignments from compatible size restrictions  >
+<TC - 060301_008 Ensure that the IUT correctly handles assignments from compatible size restrictions  >
 
 <COMPILE>
 
@@ -7508,7 +7508,7 @@ error: Type mismatch: `float\[1\]' and `float\[2\]' are not compatible: Array ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Reject assignment of other enumerated types since they are only compatible to synonym types  >
+<TC - 060302_001 Reject assignment of other enumerated types since they are only compatible to synonym types  >
 
 <COMPILE>
 
@@ -7555,7 +7555,7 @@ error: Type mismatch: a value of type `@NegSem_060302_structured_types_001.Enume
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments from incompatible types or type ranges  >
+<TC - 060302_002 Ensure that the IUT rejects assignments from incompatible types or type ranges  >
 
 <COMPILE>
 
@@ -7610,7 +7610,7 @@ error: Type mismatch: `@NegSem_060302_structured_types_002.RecordType2.f' of typ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments from incompatible types or type ranges >
+<TC - 060302_004 Ensure that the IUT rejects assignments from incompatible types or type ranges >
 
 <COMPILE>
 
@@ -7666,7 +7666,7 @@ error: Type mismatch: `@NegSem_060302_structured_types_004.SetType.b' of type `i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments from incompatible types or type ranges >
+<TC - 060302_009 Ensure that the IUT rejects assignments from incompatible types or type ranges >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -7725,7 +7725,7 @@ Dynamic test case error: Values or templates of types `@NegSem_060302_structured
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments from incompatible types or type ranges >
+<TC - 060302_010 Ensure that the IUT rejects assignments from incompatible types or type ranges >
 
 <COMPILE>
 
@@ -7785,7 +7785,7 @@ error: Type mismatch: `@NegSem_060302_structured_types_010.UnionType' and `@NegS
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments from structures having incompatible anytypes >
+<TC - 060302_011 Ensure that the IUT rejects assignments from structures having incompatible anytypes >
 
 <COMPILE>
 
@@ -7858,7 +7858,7 @@ error: Type mismatch: `@NegSem_060302_structured_types_011_importA.anytype' and
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments between incompatible structures >
+<TC - 060302_016 Ensure that the IUT rejects assignments between incompatible structures >
 
 <COMPILE>
 
@@ -7912,7 +7912,7 @@ error: Type mismatch: `integer\[2\]' and `@NegSem_060302_structured_types_016.Se
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT rejects assignments between incompatible structures >
+<TC - 060302_018 Ensure that the IUT rejects assignments between incompatible structures >
 
 <COMPILE>
 
@@ -7962,7 +7962,7 @@ error: Type mismatch: `integer\[3\]' and `@NegSem_060302_structured_types_018.Se
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles component incompatibility due to differing list of constant definitions >
+<TC - 060303_001 Ensure that the IUT correctly handles component incompatibility due to differing list of constant definitions >
 
 <COMPILE>
 
@@ -8023,7 +8023,7 @@ error: Runs on clause mismatch: A definition that runs on component type `@NegSe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles component incompatibility due to differing list of constant definitions >
+<TC - 060303_002 Ensure that the IUT correctly handles component incompatibility due to differing list of constant definitions >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/07-14_folder.script b/conformance_test/core_language_tests/negative_tests/07-14_folder.script
index 21265f338788e9f1210a5cadc5085a8289ce7b43..9a80171cff8055dfdac0e38496ff3669b86b5c49 100644
--- a/conformance_test/core_language_tests/negative_tests/07-14_folder.script
+++ b/conformance_test/core_language_tests/negative_tests/07-14_folder.script
@@ -53,7 +53,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 07_expression
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - function without return clause in expression  >
+<TC - 07_001 function without return clause in expression  >
 
 <COMPILE>
 
@@ -100,7 +100,7 @@ error: Reference to a value was expected instead of a call of function `@NegSem_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - template used as expression operand  >
+<TC - 07_002 template used as expression operand  >
 
 <COMPILE>
 
@@ -150,7 +150,7 @@ error: Reference to a value was expected instead of template variable `vm_num'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - uninitialized value in an expression >
+<TC - 07_003 uninitialized value in an expression >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -202,7 +202,7 @@ Dynamic test case error: Using the value of an optional field containing omit.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that Arithmetic operators are for integer and float values  >
+<TC - 070101_001 Ensure that Arithmetic operators are for integer and float values  >
 
 <COMPILE>
 
@@ -251,7 +251,7 @@ error: The operands of operation `\*' should be of same type
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that arithmetic operators can handle same type of variables  >
+<TC - 070101_002 Ensure that arithmetic operators can handle same type of variables  >
 
 <COMPILE>
 
@@ -295,7 +295,7 @@ error: The operands of operation `\*' should be of same type
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that mod arithmetic operator can handle integer variables >
+<TC - 070101_003 Ensure that mod arithmetic operator can handle integer variables >
 
 <COMPILE>
 
@@ -341,7 +341,7 @@ error: Right operand of operation `mod' should be integer value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that rem arithmetic operator can handle integer variables >
+<TC - 070101_004 Ensure that rem arithmetic operator can handle integer variables >
 
 <COMPILE>
 
@@ -387,7 +387,7 @@ error: Right operand of operation `rem' should be integer value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that in x mod y arithmetic operator y is non-zero positive number >
+<TC - 070101_008 Ensure that in x mod y arithmetic operator y is non-zero positive number >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -432,7 +432,7 @@ Dynamic test case error: The right operand of mod operator is zero.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that in x rem y arithmetic operator y is non-zero positive number >
+<TC - 070101_009 Ensure that in x rem y arithmetic operator y is non-zero positive number >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -477,7 +477,7 @@ Dynamic test case error: Integer division by zero.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that in x rem y arithmetic operator y is non-zero positive number >
+<TC - 070101_010 Ensure that in x rem y arithmetic operator y is non-zero positive number >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -523,7 +523,7 @@ Dynamic test case error: Integer division by zero.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the equals operator on records is evaluated correctly. >
+<TC - 070103_002 Ensure that the equals operator on records is evaluated correctly. >
 
 <COMPILE>
 
@@ -594,7 +594,7 @@ error: Right operand of operation `&' should be a string, `record of' or `set of
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the equals operator on records is evaluated correctly. >
+<TC - 070103_003 Ensure that the equals operator on records is evaluated correctly. >
 
 <COMPILE>
 
@@ -666,7 +666,7 @@ error: Right operand of operation `&' should be a string, `record of' or `set of
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the equals operator on records is evaluated correctly. >
+<TC - 070103_004 Ensure that the equals operator on records is evaluated correctly. >
 
 <COMPILE>
 
@@ -741,7 +741,7 @@ error: Right operand of operation `&' should be a string, `record of' or `set of
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with multiple language specifications is rejected.  >
+<TC - 0801_001 Ensure that a module definition with multiple language specifications is rejected.  >
 
 <COMPILE>
 
@@ -769,7 +769,7 @@ error: at or before token `,': syntax error, unexpected ',', expecting '\{'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that name handling of imported enumerations is properly handled  >
+<TC - 08020301_002 Ensure that name handling of imported enumerations is properly handled  >
 
 <COMPILE>
 
@@ -809,7 +809,7 @@ error: Type mismatch: a value of type `@NegSem_08020301_GeneralFormatOfImport_00
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that name handling of imported enumerations is properly handled  >
+<TC - 08020301_003 Ensure that name handling of imported enumerations is properly handled  >
 
 <COMPILE>
 
@@ -870,7 +870,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that transitive import rules are properly handled  >
+<TC - 08020301_004 Ensure that transitive import rules are properly handled  >
 
 <COMPILE>
 
@@ -929,7 +929,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Make sure that the identifier of the current module cannot be used for prefixing imported entities >
+<TC - 08020301_005 Make sure that the identifier of the current module cannot be used for prefixing imported entities >
 
 <COMPILE>
 
@@ -985,7 +985,7 @@ error: There is no definition with name `c_test' in module `NegSem_08020301_Gene
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the only top-level visible definitions of a module may be imported.  >
+<TC - 08020301_006 Ensure that the only top-level visible definitions of a module may be imported.  >
 
 <COMPILE>
 
@@ -1041,7 +1041,7 @@ error: There is no local or imported definition with name `c_test'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that information about message types is imported together with port type  >
+<TC - 08020301_007 Verify that information about message types is imported together with port type  >
 
 <COMPILE>
 
@@ -1104,7 +1104,7 @@ error: Incompatible explicit type specification: `integer' was expected instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that definition from inside an imported function cannot be referenced  >
+<TC - 08020301_038 Verify that definition from inside an imported function cannot be referenced  >
 
 <COMPILE>
 
@@ -1152,7 +1152,7 @@ error: There is no local or imported definition with name `c_test'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that import statement cannot be used in test case blocks  >
+<TC - 08020301_001 Ensure that import statement cannot be used in test case blocks  >
 
 <COMPILE>
 
@@ -1205,7 +1205,7 @@ error: at or before token `import': syntax error, unexpected ImportKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that import statement cannot be used in module control part  >
+<TC - 08020301_002 Ensure that import statement cannot be used in module control part  >
 
 <COMPILE>
 
@@ -1258,7 +1258,7 @@ error: at or before token `import': syntax error, unexpected ImportKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the import of import statements works for import all.  >
+<TC - 08020307_001 Ensure that the import of import statements works for import all.  >
 
 <COMPILE>
 
@@ -1320,7 +1320,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the import of import statements works for import all.  >
+<TC - 08020307_002 Ensure that the import of import statements works for import all.  >
 
 <COMPILE>
 
@@ -1384,7 +1384,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the import of import statements works for import all.  >
+<TC - 080204_001 Ensure that the import of import statements works for import all.  >
 
 <COMPILE>
 
@@ -1436,7 +1436,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that private definitions are not made visible by friend declarations (for a constant sample definition). >
+<TC - 080204_002 Ensure that private definitions are not made visible by friend declarations (for a constant sample definition). >
 
 <COMPILE>
 
@@ -1489,7 +1489,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that private definition (in this case a sample constant) is not visible using a normal import. >
+<TC - 080205_001 Ensure that private definition (in this case a sample constant) is not visible using a normal import. >
 
 <COMPILE>
 
@@ -1541,7 +1541,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that private definition (in this case a sample constant) is not visible using an import of a friend module. >
+<TC - 080205_002 Ensure that private definition (in this case a sample constant) is not visible using an import of a friend module. >
 
 <COMPILE>
 
@@ -1596,7 +1596,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that friend definition (in this case a sample constant) is not visible using a group import of a non-friend module. >
+<TC - 080205_003 Ensure that friend definition (in this case a sample constant) is not visible using a group import of a non-friend module. >
 
 <COMPILE>
 
@@ -1651,7 +1651,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that friend definition (in this case a sample constant) is not visible using a group import of a non-friend module. >
+<TC - 080205_004 Ensure that friend definition (in this case a sample constant) is not visible using a group import of a non-friend module. >
 
 <COMPILE>
 
@@ -1706,7 +1706,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that private definition (in this case a sample constant) is not visible using a group import of a friend module. >
+<TC - 080205_005 Ensure that private definition (in this case a sample constant) is not visible using a group import of a friend module. >
 
 <COMPILE>
 
@@ -1763,7 +1763,7 @@ error: There is no local or imported definition with name `c_myconst'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there is not more than one control part. >
+<TC - 0803_001 Ensure that there is not more than one control part. >
 
 <COMPILE>
 
@@ -1803,7 +1803,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that it is not possible to connect a mapped port  >
+<TC - 0901_002 Ensure that it is not possible to connect a mapped port  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1863,7 +1863,7 @@ Dynamic test case error: Connect operation cannot be performed on a mapped port
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that it is not possible to map a connected port  >
+<TC - 0901_004 Verify that it is not possible to map a connected port  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1926,7 +1926,7 @@ Dynamic test case error: Map operation is not allowed on a connected port \(p1\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that a two TSI port cannot be connected  >
+<TC - 0901_007 Verify that a two TSI port cannot be connected  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1977,7 +1977,7 @@ Dynamic test case error: Both arguments of map operation refer to system ports.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that connections within the test system interface are not allowed  >
+<TC - 0901_009 Verify that connections within the test system interface are not allowed  >
 
 <COMPILE>
 
@@ -2025,7 +2025,7 @@ error: Both endpoints of the mapping are system ports
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that a two TSI port cannot be connected  >
+<TC - 0901_001 Verify that a two TSI port cannot be connected  >
 
 <COMPILE>
 
@@ -2080,7 +2080,7 @@ error: The `system' component reference shall not be used in `connect' operation
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the two system interf. port cannot connect   >
+<TC - 0901_003 Ensure that the two system interf. port cannot connect   >
 
 <COMPILE>
 
@@ -2133,7 +2133,7 @@ error: Both endpoints of the mapping are system ports
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Assign rnd to constant used in type, not allowed since constant expressions used in types have to be known at compile-time.  >
+<TC - 10_001 Assign rnd to constant used in type, not allowed since constant expressions used in types have to be known at compile-time.  >
 
 <COMPILE>
 
@@ -2174,7 +2174,7 @@ error: An evaluable constant value was expected instead of operation `rnd \(seed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - A value is assigned only once to a constant.  >
+<TC - 10_002 A value is assigned only once to a constant.  >
 
 <COMPILE>
 
@@ -2213,7 +2213,7 @@ error: Reference to a variable or template variable was expected instead of cons
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Constant shall not be of port type  >
+<TC - 10_003 Constant shall not be of port type  >
 
 <COMPILE>
 
@@ -2261,7 +2261,7 @@ error: Constant cannot be defined for port type `@NegSem_10_Constants_003.MyMess
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Variables should be assigned only by values  >
+<TC - 1101_001 Variables should be assigned only by values  >
 
 <COMPILE>
 
@@ -2297,7 +2297,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Define variables in module scope >
+<TC - 1101_001 Define variables in module scope >
 
 <COMPILE>
 
@@ -2324,7 +2324,7 @@ error: at or before token `var': syntax error, unexpected VarKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Template variables should be assigned with unitialized variables >
+<TC - 1102_001 Template variables should be assigned with unitialized variables >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2363,7 +2363,7 @@ Dynamic test case error: Copying an uninitialized/unsupported integer template.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Define template variables in module scope >
+<TC - 1102_001 Define template variables in module scope >
 
 <COMPILE>
 
@@ -2394,7 +2394,7 @@ error: at or before token `var': syntax error, unexpected VarKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer can not be initialized with negative duration >
+<TC - 12_001 Ensure timer can not be initialized with negative duration >
 
 <COMPILE>
 
@@ -2437,7 +2437,7 @@ error: A non-negative float value was expected as timer duration instead of `-1.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer in array can not be initialized with negative duration >
+<TC - 12_002 Ensure timer in array can not be initialized with negative duration >
 
 <COMPILE>
 
@@ -2480,7 +2480,7 @@ error: A non-negative float value was expected as timer duration instead of `-1.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure uninitialized timer can't be started >
+<TC - 12_003 Ensure uninitialized timer can't be started >
 
 <COMPILE>
 
@@ -2523,7 +2523,7 @@ error: Missing duration: timer `@NegSem_12_toplevel_timer_003.TComp.t_timer' doe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure uninitialized timer in array can't be started >
+<TC - 12_004 Ensure uninitialized timer in array can't be started >
 
 <COMPILE>
 
@@ -2565,7 +2565,7 @@ error: Missing duration: timer `@NegSem_12_toplevel_timer_004.TComp.t_timer' doe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure uninitialized timer in array can't be started >
+<TC - 12_005 Ensure uninitialized timer in array can't be started >
 
 <COMPILE>
 
@@ -2608,7 +2608,7 @@ error: Missing duration: timer `@NegSem_12_toplevel_timer_005.TComp.t_timer' doe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax - reject single timer instance initialized with array >
+<TC - 12_006 Ensure timer declaration syntax - reject single timer instance initialized with array >
 
 <COMPILE>
 
@@ -2654,7 +2654,7 @@ error: Reference to single timer `@NegSem_12_toplevel_timer_006.TComp.t_timer' c
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax -- reject array initialization with wrong number of initializers >
+<TC - 12_007 Ensure timer declaration syntax -- reject array initialization with wrong number of initializers >
 
 <COMPILE>
 
@@ -2696,7 +2696,7 @@ error: Too few elements in the default duration of timer array: 4 was expected i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax -- reject array of timers initizlized with a single float value >
+<TC - 12_008 Ensure timer declaration syntax -- reject array of timers initizlized with a single float value >
 
 <COMPILE>
 
@@ -2739,7 +2739,7 @@ error: An array value \(with 4 elements\) was expected as default duration of ti
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer can`t be used in module control parts when declared in components >
+<TC - 12_001 Ensure timer can`t be used in module control parts when declared in components >
 
 <COMPILE>
 
@@ -2795,7 +2795,7 @@ error: There is no local or imported definition with name `t_timer'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax >
+<TC - 12_002 Ensure timer declaration syntax >
 
 <COMPILE>
 
@@ -2837,7 +2837,7 @@ error: at or before token `:=': syntax error, unexpected :=, expecting Identifie
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax >
+<TC - 12_003 Ensure timer declaration syntax >
 
 <COMPILE>
 
@@ -2879,7 +2879,7 @@ error: at or before token `;': syntax error, unexpected ';'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax >
+<TC - 12_004 Ensure timer declaration syntax >
 
 <COMPILE>
 
@@ -2922,7 +2922,7 @@ error: at or before token `0.0': syntax error, unexpected FloatValue
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer declaration syntax >
+<TC - 12_005 Ensure timer declaration syntax >
 
 <COMPILE>
 
@@ -2965,7 +2965,7 @@ error: A value or expression of type float was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer array declaration syntax >
+<TC - 12_006 Ensure timer array declaration syntax >
 
 <COMPILE>
 
@@ -3009,7 +3009,7 @@ error: at or before token `1.0': syntax error, unexpected FloatValue, expecting
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer array declaration syntax >
+<TC - 12_007 Ensure timer array declaration syntax >
 
 <COMPILE>
 
@@ -3055,7 +3055,7 @@ error: at or before token `1.0': syntax error, unexpected FloatValue, expecting
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that nonblocking signature contains in parameter >
+<TC - 1400_001 Ensure that nonblocking signature contains in parameter >
 
 <COMPILE>
 
@@ -3125,7 +3125,7 @@ error: A non-blocking signature cannot have `out' parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that blocking calls needs response or exception handling >
+<TC - 1400_002 Ensure that blocking calls needs response or exception handling >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/08_empty_modules.script b/conformance_test/core_language_tests/negative_tests/08_empty_modules.script
index bcc7f63961b46553131867852bb2317745cea565..7674cc94474d14e4e95d03c81a0ed5ac0730f1ef 100644
--- a/conformance_test/core_language_tests/negative_tests/08_empty_modules.script
+++ b/conformance_test/core_language_tests/negative_tests/08_empty_modules.script
@@ -53,7 +53,7 @@ This TD contains syntactic tests with empty modules from ETSI TTCN3 Conformance
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a "plain" module definition is accepted. >
+<TC - 0801_001 Ensure that a "plain" module definition is accepted. >
 
 <COMPILE>
 
@@ -81,7 +81,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with language specification is accepted. >
+<TC - 0801_002 Ensure that a module definition with language specification is accepted. >
 
 <COMPILE>
 
@@ -109,7 +109,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with package and without language is accepted. >
+<TC - 0801_004 Ensure that a module definition with package and without language is accepted. >
 
 <COMPILE>
 
@@ -137,7 +137,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with ed4.3.1 language and package is accepted. >
+<TC - 0801_005 Ensure that a module definition with ed4.3.1 language and package is accepted. >
 
 <COMPILE>
 
@@ -165,7 +165,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with ed4.4.1 language and package is accepted. >
+<TC - 0801_006 Ensure that a module definition with ed4.4.1 language and package is accepted. >
 
 <COMPILE>
 
@@ -193,7 +193,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with ed4.5.1 language and package is accepted. >
+<TC - 0801_007 Ensure that a module definition with ed4.5.1 language and package is accepted. >
 
 <COMPILE>
 
@@ -221,7 +221,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with ed4.6.1 language and package is accepted. >
+<TC - 0801_008 Ensure that a module definition with ed4.6.1 language and package is accepted. >
 
 <COMPILE>
 
@@ -249,7 +249,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a module definition with ed4.7.1 language and package is accepted. >
+<TC - 0801_009 Ensure that a module definition with ed4.7.1 language and package is accepted. >
 
 <COMPILE>
 
@@ -277,7 +277,7 @@ error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that an empty control part is accepted. >
+<TC - 0803_003 Ensure that an empty control part is accepted. >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/15_templates.script b/conformance_test/core_language_tests/negative_tests/15_templates.script
index 9fb9c5e93839f3274816101beea9f3ee12e7d261..541ed90f724e5d226f94b3a6def421846ef9e813 100644
--- a/conformance_test/core_language_tests/negative_tests/15_templates.script
+++ b/conformance_test/core_language_tests/negative_tests/15_templates.script
@@ -53,7 +53,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 15_templates
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error for re-assignment of a global non-parameterized template >
+<TC - 1503_001 Ensure that there's an error for re-assignment of a global non-parameterized template >
 
 <COMPILE>
 
@@ -94,7 +94,7 @@ error: Reference to a variable or template variable was expected instead of temp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error for re-assignment of a global non-parameterized template >
+<TC - 1503_002 Ensure that there's an error for re-assignment of a global non-parameterized template >
 
 <COMPILE>
 
@@ -135,7 +135,7 @@ error: Reference to a variable or template variable was expected instead of temp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error for re-assignment of a global parameterized template >
+<TC - 1503_003 Ensure that there's an error for re-assignment of a global parameterized template >
 
 <COMPILE>
 
@@ -178,7 +178,7 @@ error: Reference to parameterized definition `t' without actual parameter list
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error for re-assignment of a local parameterized template >
+<TC - 1503_004 Ensure that there's an error for re-assignment of a local parameterized template >
 
 <COMPILE>
 
@@ -221,7 +221,7 @@ error: Reference to parameterized definition `t' without actual parameter list
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error if no value is assigned in a global non-parameterized template declaration >
+<TC - 1503_001 Ensure that there's an error if no value is assigned in a global non-parameterized template declaration >
 
 <COMPILE>
 
@@ -256,7 +256,7 @@ error: at or before token `;': syntax error, unexpected ';', expecting ModifiesK
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error if no value is assigned in a local non-parameterized template declaration >
+<TC - 1503_002 Ensure that there's an error if no value is assigned in a local non-parameterized template declaration >
 
 <COMPILE>
 
@@ -295,7 +295,7 @@ error: at or before token `;': syntax error, unexpected ';', expecting ModifiesK
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error if no value is assigned in a global parameterized template declaration >
+<TC - 1503_003 Ensure that there's an error if no value is assigned in a global parameterized template declaration >
 
 <COMPILE>
 
@@ -330,7 +330,7 @@ error: at or before token `;': syntax error, unexpected ';', expecting :=
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that there's an error if no value is assigned in a local parameterized template declaration >
+<TC - 1503_004 Ensure that there's an error if no value is assigned in a local parameterized template declaration >
 
 <COMPILE>
 
@@ -373,7 +373,7 @@ error: at or before token `;': syntax error, unexpected ';', expecting :=
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a modified template does not refer to itself. >
+<TC - 1505_001 Ensure that a modified template does not refer to itself. >
 
 <COMPILE>
 
@@ -410,7 +410,7 @@ error: While checking the chain of base templates: Circular reference: `@NegSem_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a modified template does not omit possible parameters of the base >
+<TC - 1505_002 Ensure that a modified template does not omit possible parameters of the base >
 
 <COMPILE>
 
@@ -456,7 +456,7 @@ error: The modified template has fewer formal parameters than base template `@Ne
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a modified template does not omit possible parameters introduced in any modification step. >
+<TC - 1505_003 Ensure that a modified template does not omit possible parameters introduced in any modification step. >
 
 <COMPILE>
 
@@ -506,7 +506,7 @@ error: The modified template has fewer formal parameters than base template `@Ne
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that parameter names in modified templates are the same. >
+<TC - 1505_004 Ensure that parameter names in modified templates are the same. >
 
 <COMPILE>
 
@@ -553,7 +553,7 @@ error: The name of parameter is not the same as in base template `@NegSem_1505_M
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the dash in default parameter values of a modified templates is only accepted when the base template actually has a default value. >
+<TC - 1505_005 Ensure that the dash in default parameter values of a modified templates is only accepted when the base template actually has a default value. >
 
 <COMPILE>
 
@@ -603,7 +603,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the same parameter name is used when modifying the base template. >
+<TC - 1505_006 Ensure that the same parameter name is used when modifying the base template. >
 
 <COMPILE>
 
@@ -656,7 +656,7 @@ error: Not used symbol \(`-'\) doesn't have the corresponding default parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the same parameter type is used when modifying the base template. >
+<TC - 1505_007 Ensure that the same parameter type is used when modifying the base template. >
 
 <COMPILE>
 
@@ -703,7 +703,7 @@ error: The type of parameter is not the same as in base template `@NegSem_1505_M
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the base template and modified template cannot be the same >
+<TC - 1505_001 Ensure that the base template and modified template cannot be the same >
 
 <COMPILE>
 
@@ -761,7 +761,7 @@ error: Duplicate definition with name `m_templateTwo'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the referencing of individual string elements inside templates or template fields is forbidden. >
+<TC - 150601_001 Ensure that the referencing of individual string elements inside templates or template fields is forbidden. >
 
 <COMPILE>
 
@@ -810,7 +810,7 @@ error: Reference to template variable `m_char1' can not be indexed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that fields with omit values on the right-hand side of an assignment are rejected. >
+<TC - 150602_001 Ensure that fields with omit values on the right-hand side of an assignment are rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -867,7 +867,7 @@ Dynamic test case error: Copying an uninitialized/unsupported record/set templat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that fields with omit values on the right-hand side of an assignment are rejected. >
+<TC - 150602_003 Ensure that fields with omit values on the right-hand side of an assignment are rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -945,7 +945,7 @@ Dynamic test case error: Copying an uninitialized/unsupported record/set templat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that complement lists on the right-hand side of an assignment are not accepted. >
+<TC - 150602_004 Ensure that complement lists on the right-hand side of an assignment are not accepted. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1022,7 +1022,7 @@ Dynamic test case error: Copying an uninitialized/unsupported record/set templat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing a template field with the ifpresent attribute causes a rejection. >
+<TC - 150602_005 Ensure that referencing a template field with the ifpresent attribute causes a rejection. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1071,7 +1071,7 @@ Dynamic test case error: Accessing field f1 of a non-specific template of type @
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing an element within a value list causes an error in the context of record of. >
+<TC - 150603_001 Ensure that referencing an element within a value list causes an error in the context of record of. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1120,7 +1120,7 @@ Dynamic test case error: Accessing an element of a non-specific template for typ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that access to unitialized fields in the context of record of is rejected. >
+<TC - 150603_002 Ensure that access to unitialized fields in the context of record of is rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1168,7 +1168,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that anyvalueornone fields in the context of record of is rejected. >
+<TC - 150603_003 Ensure that anyvalueornone fields in the context of record of is rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1215,7 +1215,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that complement value lists in the context of record of are rejected. >
+<TC - 150603_004 Ensure that complement value lists in the context of record of are rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1262,7 +1262,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that subset in the context of record of are rejected. >
+<TC - 150603_005 Ensure that subset in the context of record of are rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1317,7 +1317,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that superset in the context of record of are rejected. >
+<TC - 150603_006 Ensure that superset in the context of record of are rejected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1370,7 +1370,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that access to record of indexes is forbidden when a previous index entry is a permutation with a *. >
+<TC - 150603_008 Ensure that access to record of indexes is forbidden when a previous index entry is a permutation with a *. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1417,7 +1417,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that access to ifpresent fields is not allowed. >
+<TC - 150603_009 Ensure that access to ifpresent fields is not allowed. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1466,7 +1466,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing AnyValueOrNone fields is not allowed. >
+<TC - 150603_010 Ensure that referencing AnyValueOrNone fields is not allowed. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1525,7 +1525,7 @@ Dynamic test case error: Matching with an uninitialized/unsupported integer temp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing uninitialized fields is not allowed. >
+<TC - 150603_011 Ensure that referencing uninitialized fields is not allowed. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1583,7 +1583,7 @@ Dynamic test case error: Copying an uninitialized/unsupported integer template.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing uninitialized fields is not allowed. >
+<TC - 150603_012 Ensure that referencing uninitialized fields is not allowed. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1641,7 +1641,7 @@ Dynamic test case error: Copying an uninitialized/unsupported integer template.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing uninitialized fields is not allowed. >
+<TC - 150603_013 Ensure that referencing uninitialized fields is not allowed. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1698,7 +1698,7 @@ Dynamic test case error: Assignment of an unbound integer value.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that referencing an element within a value list causes an error in the context of set of. >
+<TC - 150603_014 Ensure that referencing an element within a value list causes an error in the context of set of. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1747,7 +1747,7 @@ Dynamic test case error: Accessing an element of a non-specific template for typ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template variables does not allow referencing alternatives inside an union with omit >
+<TC - 150605_001 Ensure that template variables does not allow referencing alternatives inside an union with omit >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1815,7 +1815,7 @@ Dynamic test case error: Accessing field u1 in a non-specific template of union
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template variables does not allow referencing alternatives inside an union with AnyValueOrNone >
+<TC - 150605_002 Ensure that template variables does not allow referencing alternatives inside an union with AnyValueOrNone >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1884,7 +1884,7 @@ Dynamic test case error: Accessing field u1 in a non-specific template of union
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with anyvalue(?). >
+<TC - 1508_001 Ensure that template(omit) is rejected with anyvalue(?). >
 
 <COMPILE>
 
@@ -1919,7 +1919,7 @@ error: Restriction on template definition does not allow usage of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with setof template. >
+<TC - 1508_002 Ensure that template(omit) is rejected with setof template. >
 
 <COMPILE>
 
@@ -1954,7 +1954,7 @@ error: Restriction on template definition does not allow usage of value list mat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with anyvalueornone(*). >
+<TC - 1508_003 Ensure that template(omit) is rejected with anyvalueornone(*). >
 
 <COMPILE>
 
@@ -1989,7 +1989,7 @@ error: Restriction on template definition does not allow usage of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with value ranges. >
+<TC - 1508_004 Ensure that template(omit) is rejected with value ranges. >
 
 <COMPILE>
 
@@ -2024,7 +2024,7 @@ error: Restriction on template definition does not allow usage of value range ma
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with supersets. >
+<TC - 1508_005 Ensure that template(omit) is rejected with supersets. >
 
 <COMPILE>
 
@@ -2059,7 +2059,7 @@ error: Restriction on template definition does not allow usage of superset match
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with supersets. >
+<TC - 1508_006 Ensure that template(omit) is rejected with supersets. >
 
 <COMPILE>
 
@@ -2094,7 +2094,7 @@ error: Restriction on template definition does not allow usage of subset match
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with patterns. >
+<TC - 1508_007 Ensure that template(omit) is rejected with patterns. >
 
 <COMPILE>
 
@@ -2129,7 +2129,7 @@ error: Restriction on template definition does not allow usage of character stri
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with anyelement inside values. >
+<TC - 1508_008 Ensure that template(omit) is rejected with anyelement inside values. >
 
 <COMPILE>
 
@@ -2164,7 +2164,7 @@ error: Restriction on template definition does not allow usage of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with anyelementornone inside values. >
+<TC - 1508_009 Ensure that template(omit) is rejected with anyelementornone inside values. >
 
 <COMPILE>
 
@@ -2199,7 +2199,7 @@ error: Restriction on template definition does not allow usage of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with permutation inside values. >
+<TC - 1508_010 Ensure that template(omit) is rejected with permutation inside values. >
 
 <COMPILE>
 
@@ -2234,7 +2234,7 @@ error: Restriction on template definition does not allow usage of permutation ma
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with length restrictions. >
+<TC - 1508_011 Ensure that template(omit) is rejected with length restrictions. >
 
 <COMPILE>
 
@@ -2268,7 +2268,7 @@ error: Restriction on template definition does not allow usage of length restric
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with length restrictions. >
+<TC - 1508_012 Ensure that template(omit) is rejected with length restrictions. >
 
 <COMPILE>
 
@@ -2305,7 +2305,7 @@ error: `ifpresent' is not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) is rejected with length restrictions. >
+<TC - 1508_013 Ensure that template(omit) is rejected with length restrictions. >
 
 <COMPILE>
 
@@ -2339,7 +2339,7 @@ error: Restriction on template definition does not allow usage of complemented l
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with anyvalue(?). >
+<TC - 1508_014 Ensure that template(value) is rejected with anyvalue(?). >
 
 <COMPILE>
 
@@ -2374,7 +2374,7 @@ error: Restriction on template definition does not allow usage of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with valuelist. >
+<TC - 1508_015 Ensure that template(value) is rejected with valuelist. >
 
 <COMPILE>
 
@@ -2409,7 +2409,7 @@ error: Restriction on template definition does not allow usage of value list mat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with anyvalueornone(*). >
+<TC - 1508_016 Ensure that template(value) is rejected with anyvalueornone(*). >
 
 <COMPILE>
 
@@ -2444,7 +2444,7 @@ error: Restriction on template definition does not allow usage of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with value ranges. >
+<TC - 1508_017 Ensure that template(value) is rejected with value ranges. >
 
 <COMPILE>
 
@@ -2479,7 +2479,7 @@ error: Restriction on template definition does not allow usage of value range ma
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with supersets. >
+<TC - 1508_018 Ensure that template(value) is rejected with supersets. >
 
 <COMPILE>
 
@@ -2514,7 +2514,7 @@ error: Restriction on template definition does not allow usage of superset match
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with supersets. >
+<TC - 1508_019 Ensure that template(value) is rejected with supersets. >
 
 <COMPILE>
 
@@ -2549,7 +2549,7 @@ error: Restriction on template definition does not allow usage of subset match
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with patterns. >
+<TC - 1508_020 Ensure that template(value) is rejected with patterns. >
 
 <COMPILE>
 
@@ -2584,7 +2584,7 @@ error: Restriction on template definition does not allow usage of character stri
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with anyelement inside values. >
+<TC - 1508_021 Ensure that template(value) is rejected with anyelement inside values. >
 
 <COMPILE>
 
@@ -2620,7 +2620,7 @@ error: Restriction on template definition does not allow usage of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with permutation inside values. >
+<TC - 1508_022 Ensure that template(value) is rejected with permutation inside values. >
 
 <COMPILE>
 
@@ -2655,7 +2655,7 @@ error: Restriction on template definition does not allow usage of permutation ma
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with length restrictions. >
+<TC - 1508_023 Ensure that template(value) is rejected with length restrictions. >
 
 <COMPILE>
 
@@ -2689,7 +2689,7 @@ error: Restriction on template definition does not allow usage of length restric
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with length restrictions. >
+<TC - 1508_024 Ensure that template(value) is rejected with length restrictions. >
 
 <COMPILE>
 
@@ -2726,7 +2726,7 @@ error: `ifpresent' is not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) is rejected with length restrictions. >
+<TC - 1508_025 Ensure that template(value) is rejected with length restrictions. >
 
 <COMPILE>
 
@@ -2761,7 +2761,7 @@ error: Restriction on template definition does not allow usage of omit value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(value) refuses omit as a whole. >
+<TC - 1508_026 Ensure that template(value) refuses omit as a whole. >
 
 <COMPILE>
 
@@ -2796,7 +2796,7 @@ error: Restriction on template definition does not allow usage of omit value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the template(present) with anyvalue(?) can't be assigned to an omit restricted variable template >
+<TC - 1508_029 Ensure that the template(present) with anyvalue(?) can't be assigned to an omit restricted variable template >
 
 <COMPILE>
 
@@ -2854,7 +2854,7 @@ error: Restriction on template does not allow usage of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that unrestricted template with anyvalue(?) can't be assigned to an omit restricted variable template >
+<TC - 1508_030 Ensure that unrestricted template with anyvalue(?) can't be assigned to an omit restricted variable template >
 
 <COMPILE>
 
@@ -2913,7 +2913,7 @@ error: Restriction on template does not allow usage of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(omit) can't be assigned to a variable template(value) if omit >
+<TC - 1508_031 Ensure that template(omit) can't be assigned to a variable template(value) if omit >
 
 <COMPILE>
 
@@ -2969,7 +2969,7 @@ error: Restriction on template does not allow usage of omit value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that template(present) can't be assigned to a template(value) variable if contains anyvalueornone(*) >
+<TC - 1508_032 Ensure that template(present) can't be assigned to a template(value) variable if contains anyvalueornone(*) >
 
 <COMPILE>
 
@@ -3027,7 +3027,7 @@ error: Restriction on template does not allow usage of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that an unrestricted template can't be assigned to a template(value) variable if contains anyvalueornone(*) >
+<TC - 1508_033 Ensure that an unrestricted template can't be assigned to a template(value) variable if contains anyvalueornone(*) >
 
 <COMPILE>
 
@@ -3085,7 +3085,7 @@ error: Restriction on template does not allow usage of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that a template with omit restriction can't be assigned to a template(present)variable if omit >
+<TC - 1508_034 Ensure that a template with omit restriction can't be assigned to a template(present)variable if omit >
 
 <COMPILE>
 
@@ -3139,7 +3139,7 @@ error: Restriction on template does not allow usage of omit value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that an unrestricted template can't be assigned to a template(present)variable if omit >
+<TC - 1508_035 Ensure that an unrestricted template can't be assigned to a template(present)variable if omit >
 
 <COMPILE>
 
@@ -3193,7 +3193,7 @@ error: Restriction on template does not allow usage of omit value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that template(present) can't be parameter to a template(omit) if contains anyvalueornone(*) >
+<TC - 1508_036 Ensure that template(present) can't be parameter to a template(omit) if contains anyvalueornone(*) >
 
 <COMPILE>
 
@@ -3249,7 +3249,7 @@ error: Formal parameter with template restriction `present' not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that template(present) can't be parameter to template(omit) if contains anyvalue(?) >
+<TC - 1508_037 Ensure that template(present) can't be parameter to template(omit) if contains anyvalue(?) >
 
 <COMPILE>
 
@@ -3303,7 +3303,7 @@ error: Formal parameter with template restriction `present' not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that template(present) can't be parameter to template(value) if it contains anyvalueornone(*) >
+<TC - 1508_038 Ensure that template(present) can't be parameter to template(value) if it contains anyvalueornone(*) >
 
 <COMPILE>
 
@@ -3359,7 +3359,7 @@ error: Formal parameter with template restriction `present' not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that unrestricted template can't be parameter to template(value) if it contains anyvalueornone(*) >
+<TC - 1508_039 Ensure that unrestricted template can't be parameter to template(value) if it contains anyvalueornone(*) >
 
 <COMPILE>
 
@@ -3412,7 +3412,7 @@ error: Formal parameter without template restriction not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that template(present) can't be parameter to a template(omit) >
+<TC - 1508_040 Ensure that template(present) can't be parameter to a template(omit) >
 
 <COMPILE>
 
@@ -3464,7 +3464,7 @@ error: Formal parameter with template restriction `present' not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that unrestricted template cannot be parameter to template(value) >
+<TC - 1508_041 Ensure that unrestricted template cannot be parameter to template(value) >
 
 <COMPILE>
 
@@ -3518,7 +3518,7 @@ error: Formal parameter without template restriction not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that template(present) cannot be parameter to template(value) >
+<TC - 1508_042 Ensure that template(present) cannot be parameter to template(value) >
 
 <COMPILE>
 
@@ -3572,7 +3572,7 @@ error: Formal parameter with template restriction `present' not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that template(present) can be parameter to template(omit) >
+<TC - 1508_043 Ensure that template(present) can be parameter to template(omit) >
 
 <COMPILE>
 
@@ -3622,15 +3622,15 @@ error: Formal parameter without template restriction not allowed here
 :exmp
 
 *---------------------------------------------------------------------*
-:h3. NegSem_1508_TemplateRestrictions_045 negative test
+:h3. NegSem_1508_TemplateRestrictions_044 negative test
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that the restrictiveness of parameters template(value)->template(present) is handled correctly. >
+<TC - 1508_044 Ensure that the restrictiveness of parameters template(value)->template(present) is handled correctly. >
 
 <COMPILE>
 
-<MODULE TTCN NegSem_1508_TemplateRestrictions_045 NegSem_1508_TemplateRestrictions_045.ttcn >
+<MODULE TTCN NegSem_1508_TemplateRestrictions_044 NegSem_1508_TemplateRestrictions_044.ttcn >
 /******************************************************************************
  ** @version  0.0.1
  ** @purpose  1:15.8, Ensure that the restrictiveness of parameters template(value)->template(present) is handled correctly.
@@ -3685,7 +3685,7 @@ error: The restriction of parameter is not the same or more restrictive as in ba
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that the restrictiveness of parameters template(value)->template(omit) is handled correctly. >
+<TC - 1508_045 Ensure that the restrictiveness of parameters template(value)->template(omit) is handled correctly. >
 
 <COMPILE>
 
@@ -3745,7 +3745,7 @@ error: The restriction of parameter is not the same or more restrictive as in ba
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the restrictiveness of parameters template(value)->template is handled correctly. >
+<TC - 1508_046 Ensure that the restrictiveness of parameters template(value)->template is handled correctly. >
 
 <COMPILE>
 
@@ -3805,7 +3805,7 @@ error: The restriction of parameter is not the same or more restrictive as in ba
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the restrictiveness of parameters template(omit)->template(present) is handled correctly. >
+<TC - 1508_047 Ensure that the restrictiveness of parameters template(omit)->template(present) is handled correctly. >
 
 <COMPILE>
 
@@ -3864,7 +3864,7 @@ error: The restriction of parameter is not the same or more restrictive as in ba
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the restrictiveness of parameters template(omit)->template(present) is handled correctly. >
+<TC - 1508_048 Ensure that the restrictiveness of parameters template(omit)->template(present) is handled correctly. >
 
 <COMPILE>
 
@@ -3924,7 +3924,7 @@ error: The restriction of parameter is not the same or more restrictive as in ba
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the restrictiveness of parameters template(omit)->template(present) is handled correctly. >
+<TC - 1508_049 Ensure that the restrictiveness of parameters template(omit)->template(present) is handled correctly. >
 
 <COMPILE>
 
@@ -3984,7 +3984,7 @@ error: The restriction of parameter is not the same or more restrictive as in ba
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that decoded content match is not allowed for omit template restriction >
+<TC - 1508_050 Ensure that decoded content match is not allowed for omit template restriction >
 
 <COMPILE>
 
@@ -4068,7 +4068,7 @@ error: Restriction on template definition does not allow usage of decoded conten
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that decoded content match is not allowed for omit template restriction >
+<TC - 1508_051 Ensure that decoded content match is not allowed for omit template restriction >
 
 <COMPILE>
 
@@ -4152,7 +4152,7 @@ error: Restriction on template definition does not allow usage of decoded conten
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC -  Ensure that the match operation refuses two templates as actual parameters. >
+<TC - 1509_001 Ensure that the match operation refuses two templates as actual parameters. >
 
 <COMPILE>
 
@@ -4201,7 +4201,7 @@ error: Reference to a value was expected instead of template `@NegSem_1509_Match
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the valueof function works correctly on omit. >
+<TC - 1510_001 Ensure that the valueof function works correctly on omit. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4245,7 +4245,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the valueof function works correctly on templates with wildcards. >
+<TC - 1510_002 Ensure that the valueof function works correctly on templates with wildcards. >
 
 <COMPILE>
 
@@ -4301,7 +4301,7 @@ error: A specific value was expected instead of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the valueof function works correctly on regular value templates. >
+<TC - 1510_003 Ensure that the valueof function works correctly on regular value templates. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4353,7 +4353,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the valueof function works correctly on range templates. >
+<TC - 1510_004 Ensure that the valueof function works correctly on range templates. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4398,7 +4398,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the valueof function works correctly on range templates. >
+<TC - 1510_005 Ensure that the valueof function works correctly on range templates. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4447,7 +4447,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that concatenation of octetstring types yields an even number of digits. >
+<TC - 1511_001 Ensure that concatenation of octetstring types yields an even number of digits. >
 
 <COMPILE>
 
@@ -4492,7 +4492,7 @@ error: at or before token `'O': syntax error, unexpected OctetStringMatch
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that a simple concatenation of non-wildcard octetstring must not yield in a non-even number of hexadecimals. >
+<TC - 1511_003 Ensure that a simple concatenation of non-wildcard octetstring must not yield in a non-even number of hexadecimals. >
 
 <COMPILE>
 
@@ -4534,7 +4534,7 @@ error: Octetstring value contains odd number of hexadecimal digits
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the inline template definitions are correctly concatenated. >
+<TC - 1511_004 Ensure that the inline template definitions are correctly concatenated. >
 
 <COMPILE>
 
@@ -4591,7 +4591,7 @@ error: Operands of charstring template concatenation must be specific value temp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the inline template definitions are correctly concatenated. >
+<TC - 1511_005 Ensure that the inline template definitions are correctly concatenated. >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/16-20_folders.script b/conformance_test/core_language_tests/negative_tests/16-20_folders.script
index 221404665442bfdbaa453aa9734bf6dca2f59110..0589099a88cc8c145fbf92e67c8fa803c8160bce 100644
--- a/conformance_test/core_language_tests/negative_tests/16-20_folders.script
+++ b/conformance_test/core_language_tests/negative_tests/16-20_folders.script
@@ -53,7 +53,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 16_functions_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles function definitions >
+<TC - 1601_001 Ensure that the IUT correctly handles function definitions >
 
 <COMPILE>
 
@@ -109,7 +109,7 @@ error: Incompatible value: `float' value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles function definitions >
+<TC - 1601_002 Ensure that the IUT correctly handles function definitions >
 
 <COMPILE>
 
@@ -155,7 +155,7 @@ error: Reference to a value was expected instead of template parameter `p_ostrin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles function definitions >
+<TC - 1601_003 Ensure that the IUT correctly handles function definitions >
 
 <COMPILE>
 
@@ -213,7 +213,7 @@ error: A definition without `runs on' clause cannot call function `@NegSem_1601_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles function definitions >
+<TC - 1601_004 Ensure that the IUT correctly handles function definitions >
 
 <COMPILE>
 
@@ -266,7 +266,7 @@ error: A definition without `runs on' clause cannot call function `@NegSem_1601_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles function definitions >
+<TC - 1601_005 Ensure that the IUT correctly handles function definitions >
 
 <COMPILE>
 
@@ -322,7 +322,7 @@ error: The function has return type, but control might leave it without reaching
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles function definitions >
+<TC - 1601_006 Ensure that the IUT correctly handles function definitions >
 
 <COMPILE>
 
@@ -378,7 +378,7 @@ error: There is no local or imported definition with name `v_comp'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_001 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -417,7 +417,7 @@ error: The operand of operation `int2char\(\)' should be in range 0..127
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_002 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -456,7 +456,7 @@ error: The operand of operation `int2char\(\)' should be in range 0..127
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_003 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -499,7 +499,7 @@ error: The operand of operation `int2char\(\)' should be in range 0..127
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_004 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -542,7 +542,7 @@ error: Value 256 does not fit in length 2
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_005 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -585,7 +585,7 @@ error: The operand of operation `char2int\(\)' should be of length 1
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_006 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -629,7 +629,7 @@ Dynamic test case error: Performing lengthof\(\) operation on a hexstring templa
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_007 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -672,7 +672,7 @@ error: There are fewer \(1\) elements in the string than it is allowed by the le
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_008 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -717,7 +717,7 @@ Dynamic test case error: Performing lengthof\(\) operation on a bitstring templa
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_010 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -762,7 +762,7 @@ error: There are more \(at least 3\) elements in the template than it is allowed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_017 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -807,7 +807,7 @@ Dynamic test case error: The third argument \(groupno\) of function regexp\(\) i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_018 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -851,7 +851,7 @@ error: Third operand of operation `regexp\(\)' should not be negative
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_019 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -895,7 +895,7 @@ error: at or before token `\)': syntax error, unexpected '\)', expecting ','
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_021 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -938,7 +938,7 @@ error: Second operand of operation `substr\(\)' should not be negative
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_022 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -981,7 +981,7 @@ error: Third operand of operation `substr\(\)' should not be negative
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_023 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1024,7 +1024,7 @@ error: The sum of second operand `index' \(3\) and third operand `returncount' \
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_024 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1067,7 +1067,7 @@ error: Second operand of operation `replace\(\)' should not be negative
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_025 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1110,7 +1110,7 @@ error: Third operand of operation `replace\(\)' should not be negative
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_026 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1153,7 +1153,7 @@ error: The sum of second operand `index' \(1\) and third operand `len' \(13\) is
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_027 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1196,7 +1196,7 @@ error: Fourth operand of operation `replace\(\)' is of type `hexstring', but a v
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_029 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1263,7 +1263,7 @@ error: Reference to a value was expected instead of type `@NegSem_160102_predefi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_030 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1334,7 +1334,7 @@ Dynamic test case error: Assigning invalid numeric value 4 to a variable of enum
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_031 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 
@@ -1383,7 +1383,7 @@ error: The operand of operation `rnd \(seed\)' cannot be INF, it must be a numer
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that an error is generated when the parameter of the encvalue function contains a matching symbol >
+<TC - 160102_032 Ensure that an error is generated when the parameter of the encvalue function contains a matching symbol >
 
 <COMPILE>
 
@@ -1433,7 +1433,7 @@ error: A specific value was expected instead of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that an error is detected when the parameter of the encvalue function contains an unitialized value >
+<TC - 160102_033 Ensure that an error is detected when the parameter of the encvalue function contains an unitialized value >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1482,7 +1482,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that an error is detected when the parameter of the encvalue function contains a partially initialized value >
+<TC - 160102_034 Ensure that an error is detected when the parameter of the encvalue function contains a partially initialized value >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1536,7 +1536,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that an error is detected when the first parameter of the decvalue function contains an uninitialized value >
+<TC - 160102_035 Ensure that an error is detected when the first parameter of the decvalue function contains an uninitialized value >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1582,7 +1582,7 @@ Dynamic test case error: The argument of function bit2oct\(\) is an unbound bits
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_036 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1637,7 +1637,7 @@ Dynamic test case error: The first argument of function substr\(\) is a template
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
+<TC - 160102_037 Ensure that the IUT recognizes predefined functions and correctly evaluates them (as specified by Annex C) >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1692,7 +1692,7 @@ Dynamic test case error: The first argument of function substr\(\) is a template
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
+<TC - 1602_005 Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
 
 <COMPILE>
 
@@ -1762,7 +1762,7 @@ error: There is no local or imported definition with name `messagePort'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
+<TC - 1602_006 Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
 
 <COMPILE>
 
@@ -1843,7 +1843,7 @@ error: A definition without `runs on' clause cannot call function `@NegSem_1602_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
+<TC - 1602_001 Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
 
 <COMPILE>
 
@@ -1920,7 +1920,7 @@ error: at or before token `var': syntax error, unexpected VarKeyword, expecting
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
+<TC - 160201_001 Ensure that the IUT recognizes altstep definitions and correctly evaluates them >
 
 <COMPILE>
 
@@ -2011,7 +2011,7 @@ error: Runs on clause mismatch: A definition that runs on component type `@NegSe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates invocation of testcases >
+<TC - 1603_001 Ensure that the IUT properly evaluates invocation of testcases >
 
 <COMPILE>
 
@@ -2056,7 +2056,7 @@ error: A definition that has `runs on' clause cannot execute testcases
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates invocation of testcases >
+<TC - 1603_002 Ensure that the IUT properly evaluates invocation of testcases >
 
 <COMPILE>
 
@@ -2103,7 +2103,7 @@ error: Reference to a function or altstep was expected instead of testcase `@Neg
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates assignment statements >
+<TC - 1901_001 Ensure that the IUT properly evaluates assignment statements >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2148,7 +2148,7 @@ Dynamic test case error: Assignment of an unbound integer value.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates assignment statements >
+<TC - 1901_002 Ensure that the IUT properly evaluates assignment statements >
 
 <COMPILE>
 
@@ -2191,7 +2191,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates assignment statements >
+<TC - 1901_003 Ensure that the IUT properly evaluates assignment statements >
 
 <COMPILE>
 
@@ -2234,7 +2234,7 @@ error: A template body with matching symbols cannot be assigned to a variable
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that omit assignment to a record non-optional value is not allowed >
+<TC - 1901_004 Ensure that omit assignment to a record non-optional value is not allowed >
 
 <COMPILE>
 
@@ -2291,7 +2291,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that omit assignment to set of non-optional value is not allowed >
+<TC - 1901_005 Ensure that omit assignment to set of non-optional value is not allowed >
 
 <COMPILE>
 
@@ -2345,7 +2345,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that omit assignment to an array is not allowed  >
+<TC - 1901_006 Ensure that omit assignment to an array is not allowed  >
 
 <COMPILE>
 
@@ -2399,7 +2399,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - nsure that the IUT properly evaluates assignment statements  >
+<TC - 1901_001 Ensure that the IUT properly evaluates assignment statements  >
 
 <COMPILE>
 
@@ -2434,7 +2434,7 @@ module NegSyn_1901_assignments_001 {
 <END_MODULE>
 
 <RESULT COUNT 1>
-error: at or before token `:=': syntax error, unexpected :=, expecting ')' or ','
+error: at or before token `:=': syntax error, unexpected :=, expecting ','
 <END_RESULT>
 
 <END_TC>
@@ -2445,7 +2445,7 @@ error: at or before token `:=': syntax error, unexpected :=, expecting ')' or ',
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates assignment statements >
+<TC - 1902_001 Ensure that the IUT properly evaluates assignment statements >
 
 <COMPILE>
 
@@ -2490,7 +2490,7 @@ error: at or before token `setverdict': syntax error, unexpected SetVerdictKeywo
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that header part of select-union statements cannot contain anything else than union instances >
+<TC - 190302_001 verify that header part of select-union statements cannot contain anything else than union instances >
 
 <COMPILE>
 
@@ -2548,7 +2548,7 @@ error: The head must be of a union type or anytype
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that uninitialized value cannot be used in select union header >
+<TC - 190302_002 verify that uninitialized value cannot be used in select union header >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2615,7 +2615,7 @@ Dynamic test case error: The union in the head shall be initialized
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that unknown alternatives cannot be use in case statements >
+<TC - 190302_003 verify that unknown alternatives cannot be use in case statements >
 
 <COMPILE>
 
@@ -2678,7 +2678,7 @@ error: In the 4. branch: 'boolOption' is not an alternative of union type '@NegS
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that the same alternative cannot be used in two case statements (simple case) >
+<TC - 190302_004 verify that the same alternative cannot be used in two case statements (simple case) >
 
 <COMPILE>
 
@@ -2740,7 +2740,7 @@ error: The 'intOption' is already present in the 1. branch of select union
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that the same alternative cannot be used in two case statements (list item) >
+<TC - 190302_005 verify that the same alternative cannot be used in two case statements (list item) >
 
 <COMPILE>
 
@@ -2797,7 +2797,7 @@ error: The 'intOption' is already present in the 1. branch of select union
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates for statements >
+<TC - 1904_001 Ensure that the IUT properly evaluates for statements >
 
 <COMPILE>
 
@@ -2841,7 +2841,7 @@ error: There is no local or imported definition with name `v_i'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates while statements >
+<TC - 1905_001 Ensure that the IUT properly evaluates while statements >
 
 <COMPILE>
 
@@ -2889,7 +2889,7 @@ error: There is no local or imported definition with name `v_j'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates do-while statements >
+<TC - 1906_001 Ensure that the IUT properly evaluates do-while statements >
 
 <COMPILE>
 
@@ -2938,7 +2938,7 @@ error: There is no local or imported definition with name `v_j'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles label naming uniqueness. >
+<TC - 1907_001 Ensure that the IUT correctly handles label naming uniqueness. >
 
 <COMPILE>
 
@@ -3029,7 +3029,7 @@ error: Duplicate label `L1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles label syntax. >
+<TC - 1907_001 Ensure that the IUT correctly handles label syntax. >
 
 <COMPILE>
 
@@ -3124,7 +3124,7 @@ error: at or before token `label': syntax error, unexpected LabelKeyword, expect
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles label syntax. >
+<TC - 1907_002 Ensure that the IUT correctly handles label syntax. >
 
 <COMPILE>
 
@@ -3218,7 +3218,7 @@ error: at or before token `label': syntax error, unexpected LabelKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles goto statements. >
+<TC - 1908_001 Ensure that the IUT correctly handles goto statements. >
 
 <COMPILE>
 
@@ -3311,7 +3311,7 @@ error: Label `L2' is used, but not defined
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles goto statements. >
+<TC - 1908_002 Ensure that the IUT correctly handles goto statements. >
 
 <COMPILE>
 
@@ -3358,7 +3358,7 @@ error: Label `L1' is used, but not defined
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles goto statements. >
+<TC - 1908_003 Ensure that the IUT correctly handles goto statements. >
 
 <COMPILE>
 
@@ -3409,7 +3409,7 @@ error: Label `L1' is used, but not defined
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles return statements. >
+<TC - 1910_001 Ensure that the IUT correctly handles return statements. >
 
 <COMPILE>
 
@@ -3451,7 +3451,7 @@ error: Return statement cannot be used in a testcase. It is allowed only in func
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT properly evaluates log statements. >
+<TC - 1911_001 Ensure that the IUT properly evaluates log statements. >
 
 <COMPILE>
 
@@ -3505,7 +3505,7 @@ error: Reference to a value, template, timer or port was expected instead of a c
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - dynamic error if a test component is completely blocked >
+<TC - 2002_001 dynamic error if a test component is completely blocked >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -3570,7 +3570,7 @@ Dynamic test case error: None of the branches can be chosen in the alt statement
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly processes repeat statements >
+<TC - 2003_001 Ensure that the IUT correctly processes repeat statements >
 
 <COMPILE>
 
@@ -3631,7 +3631,7 @@ error: Repeat statement cannot be used outside alt statements, altsteps or respo
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - goto inside interleave >
+<TC - 2004_004 goto inside interleave >
 
 <COMPILE>
 
@@ -3694,7 +3694,7 @@ error: Goto statement is not allowed within an interleave statement
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - repeat inside interleave >
+<TC - 2004_008 repeat inside interleave >
 
 <COMPILE>
 
@@ -3756,7 +3756,7 @@ error: Repeat statement is not allowed within an interleave statement
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - return inside interleave >
+<TC - 2004_009 return inside interleave >
 
 <COMPILE>
 
@@ -3821,7 +3821,7 @@ error: Return statement is not allowed within an interleave statement
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - explicit altstep call inside interleave >
+<TC - 2004_010 explicit altstep call inside interleave >
 
 <COMPILE>
 
@@ -3889,7 +3889,7 @@ error: Invocation of an altstep is not allowed within an interleave statement
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Validate that interleave statements are properly handled. >
+<TC - 2004_001 Validate that interleave statements are properly handled. >
 
 <COMPILE>
 
@@ -3973,7 +3973,7 @@ error: at or before token `else': syntax error, unexpected ElseKeyword, expectin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Validate that interleave statements are properly handled. >
+<TC - 2004_002 Validate that interleave statements are properly handled. >
 
 <COMPILE>
 
@@ -4056,7 +4056,7 @@ error: at or before token `v': syntax error, unexpected Identifier, expecting '\
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify unsuccessful default termination >
+<TC - 200501_004 verify unsuccessful default termination >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4141,7 +4141,7 @@ Dynamic test case error: None of the branches can be chosen in the alt statement
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify error is generated if activated alstep runs on incompatible component >
+<TC - 200502_001 verify error is generated if activated alstep runs on incompatible component >
 
 <COMPILE>
 
@@ -4197,7 +4197,7 @@ error: Runs on clause mismatch: A definition that runs on component type `@NegSe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify error is generated when passing local timer >
+<TC - 200502_002 verify error is generated when passing local timer >
 
 <COMPILE>
 
@@ -4248,7 +4248,7 @@ error: Parameter #1 of altstep `@NegSem_200502_the_activate_operation_002.a' ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify error is generated when activating function >
+<TC - 200502_005 verify error is generated when activating function >
 
 <COMPILE>
 
@@ -4297,7 +4297,7 @@ error: Reference to an altstep was expected in the argument instead of function
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - local timer as a parameter of activated altstep in module control >
+<TC - 200502_006 local timer as a parameter of activated altstep in module control >
 
 <COMPILE>
 
@@ -4362,7 +4362,7 @@ error: Parameter #1 of altstep `@NegSem_200502_the_activate_operation_006.a' ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - local timer (referenced through timer parameter) as a parameter of activated altstep in module control >
+<TC - 200502_007 local timer (referenced through timer parameter) as a parameter of activated altstep in module control >
 
 <COMPILE>
 
@@ -4432,7 +4432,7 @@ error: Parameter #1 of altstep `@NegSem_200502_the_activate_operation_007.a' ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that deactivate uninitialized default causes error >
+<TC - 200503_002 verify that deactivate uninitialized default causes error >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4501,7 +4501,7 @@ Dynamic test case error: Performing a deactivate operation on an unbound default
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - verify that error is generated when deactivated reference is on incorrect type >
+<TC - 200503_003 verify that error is generated when deactivated reference is on incorrect type >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/21_configuration_operations.script b/conformance_test/core_language_tests/negative_tests/21_configuration_operations.script
index 68f161c6fa9bb08596fb7eee46179dceecd9fe17..b78dc42ab7275de8887ae380ef8a4fe371492c2b 100644
--- a/conformance_test/core_language_tests/negative_tests/21_configuration_operations.script
+++ b/conformance_test/core_language_tests/negative_tests/21_configuration_operations.script
@@ -53,7 +53,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 21_configurat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that connect operation cannot contain a system port >
+<TC - 2101_001 Verify that connect operation cannot contain a system port >
 
 <COMPILE>
 
@@ -99,7 +99,7 @@ error: The `system' component reference shall not be used in `connect' operation
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that map operation fails if both operands are component ports >
+<TC - 2101_002 Verify that map operation fails if both operands are component ports >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -147,7 +147,7 @@ Dynamic test case error: Both arguments of map operation refer to test component
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that connect operation rejects ports with incompatible message type lists >
+<TC - 210101_001 Verify that connect operation rejects ports with incompatible message type lists >
 
 <COMPILE>
 
@@ -223,7 +223,7 @@ error: The connection between port types `@NegSem_210101_connect_and_map_operati
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that connect operation rejects ports with only partially compatible message type lists >
+<TC - 210101_002 Verify that connect operation rejects ports with only partially compatible message type lists >
 
 <COMPILE>
 
@@ -306,7 +306,7 @@ error: The connection between port types `@NegSem_210101_connect_and_map_operati
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that map operation rejects ports with incompatible message type lists >
+<TC - 210101_003 Verify that map operation rejects ports with incompatible message type lists >
 
 <COMPILE>
 
@@ -378,7 +378,7 @@ error: The mapping between system port type `@NegSem_210101_connect_and_map_oper
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that connect operation rejects ports with only partially compatible message type lists >
+<TC - 210101_004 Verify that connect operation rejects ports with only partially compatible message type lists >
 
 <COMPILE>
 
@@ -457,7 +457,7 @@ error: The mapping between system port type `@NegSem_210101_connect_and_map_oper
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - violation of strong typing rules for local ports in connect operations >
+<TC - 210101_008 violation of strong typing rules for local ports in connect operations >
 
 <COMPILE>
 
@@ -517,7 +517,7 @@ error: Component type `@NegSem_210101_connect_and_map_operations_008.GeneralComp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - violation of strong typing rules for PTC ports in connect operations >
+<TC - 210101_010 violation of strong typing rules for PTC ports in connect operations >
 
 <COMPILE>
 
@@ -574,7 +574,7 @@ error: Component type `@NegSem_210101_connect_and_map_operations_010.GeneralComp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - violation of strong typing rules for PTC ports in map operations >
+<TC - 210101_013 violation of strong typing rules for PTC ports in map operations >
 
 <COMPILE>
 
@@ -632,7 +632,7 @@ error: Component type `@NegSem_210101_connect_and_map_operations_013.GeneralComp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the the IUT does not allows two output port connection >
+<TC - 210101_001 Ensure that the the IUT does not allows two output port connection >
 
 <COMPILE>
 
@@ -684,7 +684,7 @@ error: The connection between port types `@NegSem_210101_connect_operation_001.m
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that IUT cannot map input port with output port >
+<TC - 210101_002 Ensure that IUT cannot map input port with output port >
 
 <COMPILE>
 
@@ -745,7 +745,7 @@ error: The mapping between test component port type `@NegSem_210101_map_operatio
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that unmap operation cannot contain a system port reference >
+<TC - 210102_001 Verify that unmap operation cannot contain a system port reference >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -800,7 +800,7 @@ Dynamic test case error: Both arguments of unmap operation refer to test compone
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - violation of strong typing rules for local ports in disconnect operations >
+<TC - 210102_008 violation of strong typing rules for local ports in disconnect operations >
 
 <COMPILE>
 
@@ -861,7 +861,7 @@ error: Component type `@NegSem_210102_disconnect_and_unmap_operations_008.Genera
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - violation of strong typing rules for PTC ports in disconnect operations >
+<TC - 210102_010 violation of strong typing rules for PTC ports in disconnect operations >
 
 <COMPILE>
 
@@ -920,7 +920,7 @@ error: Component type `@NegSem_210102_disconnect_and_unmap_operations_010.Genera
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - violation of strong typing rules for PTC ports in disconnect operations >
+<TC - 210102_013 violation of strong typing rules for PTC ports in disconnect operations >
 
 <COMPILE>
 
@@ -979,7 +979,7 @@ error: Component type `@NegSem_210102_disconnect_and_unmap_operations_013.Genera
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that mapped port cannot disconnect >
+<TC - 210102_001 Ensure that mapped port cannot disconnect >
 
 <COMPILE>
 
@@ -1038,7 +1038,7 @@ module NegSem_210102_disconnect_operation_001{
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Stopping test case >
+<TC - 2102_001 Stopping test case >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1084,7 +1084,7 @@ Dynamic test case error: testcase.stop
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that named components on hosts are accepted >
+<TC - 210301_001 Ensure that named components on hosts are accepted >
 
 <COMPILE>
 
@@ -1121,7 +1121,7 @@ error: First operand of operation `create\(\)' should be charstring value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that named components on hosts are accepted >
+<TC - 210301_002 Ensure that named components on hosts are accepted >
 
 <COMPILE>
 
@@ -1158,7 +1158,7 @@ error: First operand of operation `create\(\)' should be charstring value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that named components on hosts are accepted >
+<TC - 210301_003 Ensure that named components on hosts are accepted >
 
 <COMPILE>
 
@@ -1195,7 +1195,7 @@ error: Second operand of operation `create\(\)' should be charstring value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that non-alive ptc cannot start again >
+<TC - 210302_001 Ensure that non-alive ptc cannot start again >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1242,7 +1242,7 @@ Dynamic test case error:
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that only component type is allowed for ptc declaration >
+<TC - 210302_002 Ensure that only component type is allowed for ptc declaration >
 
 <COMPILE>
 
@@ -1289,7 +1289,7 @@ error: Type mismatch: The type of the operand should be a component type instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that only component type is allowed for ptc declaration >
+<TC - 210302_003 Ensure that only component type is allowed for ptc declaration >
 
 <COMPILE>
 
@@ -1347,7 +1347,7 @@ error: Reference to a function was expected in the argument instead of altstep `
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - starting behaviour on already running non-alive component >
+<TC - 210302_004 starting behaviour on already running non-alive component >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1399,7 +1399,7 @@ Dynamic test case error: Error message was received from MC: PTC with component
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - starting behaviour on already running non-alive component >
+<TC - 210302_005 starting behaviour on already running non-alive component >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1451,7 +1451,7 @@ Dynamic test case error: Error message was received from MC: PTC with component
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - function invocation in the start operation doesn't return a component >
+<TC - 210302_006 function invocation in the start operation doesn't return a component >
 
 <COMPILE>
 
@@ -1507,7 +1507,7 @@ error: Type mismatch: The type of the operand should be a component type instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - starting function with incompatible "runs on" clause >
+<TC - 210302_007 starting function with incompatible "runs on" clause >
 
 <COMPILE>
 
@@ -1563,7 +1563,7 @@ error: Component type mismatch: The component reference is of type `@NegSem_2103
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - passing port to started component function >
+<TC - 210302_008 passing port to started component function >
 
 <COMPILE>
 
@@ -1620,7 +1620,7 @@ error: Function `@NegSem_210302_Start_test_component_008.f_behaviour' cannot be
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - passing default to started component function >
+<TC - 210302_009 passing default to started component function >
 
 <COMPILE>
 
@@ -1674,7 +1674,7 @@ error: Default type cannot be a parameter or embedded in a parameter of a functi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - passing timer to started component function >
+<TC - 210302_010 passing timer to started component function >
 
 <COMPILE>
 
@@ -1726,7 +1726,7 @@ error: Function `@NegSem_210302_Start_test_component_010.f_behaviour' cannot be
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - passing structured value containing ports to started component function >
+<TC - 210302_011 passing structured value containing ports to started component function >
 
 <COMPILE>
 
@@ -1785,7 +1785,7 @@ error: Port type `@NegSem_210302_Start_test_component_011.P' cannot be a paramet
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - passing structured value containing ports to started component function >
+<TC - 210302_012 passing structured value containing ports to started component function >
 
 <COMPILE>
 
@@ -1843,7 +1843,7 @@ error: Default type cannot be a parameter or embedded in a parameter of a functi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - restarting explicitly stopped non-alive component >
+<TC - 210303_001 restarting explicitly stopped non-alive component >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1899,7 +1899,7 @@ Dynamic test case error: Error message was received from MC: PTC with component
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - stopping all PTCs from a PTC >
+<TC - 210303_002 stopping all PTCs from a PTC >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1954,7 +1954,7 @@ Dynamic test case error: Operation 'all component.stop' can only be performed on
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying stop operation to a variable of a different than component type >
+<TC - 210303_003 applying stop operation to a variable of a different than component type >
 
 <COMPILE>
 
@@ -2012,7 +2012,7 @@ error: Type mismatch: The type of the operand should be a component type instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying stop operation to a variable of a different than component type >
+<TC - 210303_004 applying stop operation to a variable of a different than component type >
 
 <COMPILE>
 
@@ -2076,7 +2076,7 @@ error: Type mismatch: The type of the operand should be a component type instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - restarting explicitly killed non-alive component >
+<TC - 210304_001 restarting explicitly killed non-alive component >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2134,7 +2134,7 @@ Dynamic test case error: PTC with component reference 3 is not alive anymore. St
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - restarting explicitly killed alive component >
+<TC - 210304_002 restarting explicitly killed alive component >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2192,7 +2192,7 @@ Dynamic test case error: PTC with component reference 3 is not alive anymore. St
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - killing all PTCs from a PTC >
+<TC - 210304_003 killing all PTCs from a PTC >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2247,7 +2247,7 @@ Dynamic test case error: Operation 'all component.kill' can only be performed on
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying kill operation to a variable of a different than component type >
+<TC - 210304_004 applying kill operation to a variable of a different than component type >
 
 <COMPILE>
 
@@ -2305,7 +2305,7 @@ error: Type mismatch: The type of the operand should be a component type instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying kill operation to a function call result of a different than component type >
+<TC - 210304_005 applying kill operation to a function call result of a different than component type >
 
 <COMPILE>
 
@@ -2369,7 +2369,7 @@ error: Type mismatch: The type of the operand should be a component type instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from alive is applied to single component >
+<TC - 210305_001 Verify that error occurs when any from alive is applied to single component >
 
 <COMPILE>
 
@@ -2422,7 +2422,7 @@ error: The operand of operation `alive': Type mismatch: component array referenc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from alive is applied to 1D array and index target has wrong type >
+<TC - 210305_003 Verify that error occurs when any from alive is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -2484,7 +2484,7 @@ error: Indices of component arrays can only be redirected to an integer, an inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from alive index redirection for multi-D arrays requires arrays of correct size >
+<TC - 210305_004 Verify that any from alive index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -2553,7 +2553,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from alive index redirection for multi-D arrays requires arrays >
+<TC - 210305_005 Verify that any from alive index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -2619,7 +2619,7 @@ error: Indices of multi-dimensional component arrays can only be redirected to a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in component.alive operation >
+<TC - 210305_001 Verify that error occurs when using index redirection in component.alive operation >
 
 <COMPILE>
 
@@ -2674,7 +2674,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in any component.alive operation >
+<TC - 210305_002 Verify that error occurs when using index redirection in any component.alive operation >
 
 <COMPILE>
 
@@ -2729,7 +2729,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in all component.alive operation >
+<TC - 210305_003 Verify that error occurs when using index redirection in all component.alive operation >
 
 <COMPILE>
 
@@ -2784,7 +2784,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in function instance.alive operation >
+<TC - 210305_004 Verify that error occurs when using index redirection in function instance.alive operation >
 
 <COMPILE>
 
@@ -2843,7 +2843,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from running is applied to single component >
+<TC - 210306_001 Verify that error occurs when any from running is applied to single component >
 
 <COMPILE>
 
@@ -2897,7 +2897,7 @@ error: The operand of operation `component running': Type mismatch: component ar
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from running is applied to 1D array and index target is array >
+<TC - 210306_002 Verify that error occurs when any from running is applied to 1D array and index target is array >
 
 <COMPILE>
 
@@ -2960,7 +2960,7 @@ error: Indices of one-dimensional component arrays can only be redirected to an
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from running is applied to 1D array and index target has wrong type >
+<TC - 210306_003 Verify that error occurs when any from running is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -3023,7 +3023,7 @@ error: Indices of component arrays can only be redirected to an integer, an inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from running index redirection for multi-D arrays requires arrays of correct size >
+<TC - 210306_004 Verify that any from running index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -3092,7 +3092,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from running index redirection for multi-D arrays requires arrays >
+<TC - 210306_005 Verify that any from running index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -3159,7 +3159,7 @@ error: Indices of multi-dimensional component arrays can only be redirected to a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in component.running operation >
+<TC - 210306_001 Verify that error occurs when using index redirection in component.running operation >
 
 <COMPILE>
 
@@ -3215,7 +3215,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in any component.running operation >
+<TC - 210306_002 Verify that error occurs when using index redirection in any component.running operation >
 
 <COMPILE>
 
@@ -3271,7 +3271,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in all component.running operation >
+<TC - 210306_003 Verify that error occurs when using index redirection in all component.running operation >
 
 <COMPILE>
 
@@ -3327,7 +3327,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in function instance.running operation >
+<TC - 210306_004 Verify that error occurs when using index redirection in function instance.running operation >
 
 <COMPILE>
 
@@ -3387,7 +3387,7 @@ error: at or before token `->': syntax error, unexpected ->
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that done operator can be used only for ptcs. >
+<TC - 210307_001 Ensure that done operator can be used only for ptcs. >
 
 <COMPILE>
 
@@ -3434,7 +3434,7 @@ error: Reference to a value was expected instead of type `@NegSem_210307_done_op
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from done is applied to single component >
+<TC - 210307_002 Verify that error occurs when any from done is applied to single component >
 
 <COMPILE>
 
@@ -3485,7 +3485,7 @@ error: Type mismatch: The type of the operand should be a component array type i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from done is applied to 1D array and index target is array >
+<TC - 210307_003 Verify that error occurs when any from done is applied to 1D array and index target is array >
 
 <COMPILE>
 
@@ -3553,7 +3553,7 @@ error: Indices of one-dimensional component arrays can only be redirected to an
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from done is applied to 1D array and index target has wrong type >
+<TC - 210307_004 Verify that error occurs when any from done is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -3621,7 +3621,7 @@ error: Indices of component arrays can only be redirected to an integer, an inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from done index redirection for multi-D arrays requires arrays of correct size >
+<TC - 210307_005 Verify that any from done index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -3696,7 +3696,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from done index redirection for multi-D arrays requires arrays >
+<TC - 210307_006 Verify that any from done index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -3768,7 +3768,7 @@ error: Indices of multi-dimensional component arrays can only be redirected to a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - partially initialized array in any from ComponentArrayRef.done >
+<TC - 210307_010 partially initialized array in any from ComponentArrayRef.done >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -3821,7 +3821,7 @@ Dynamic test case error: Performing done operation on an unbound component refer
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in component.done operation >
+<TC - 210307_001 Verify that error occurs when using index redirection in component.done operation >
 
 <COMPILE>
 
@@ -3874,7 +3874,7 @@ error: Index redirect cannot be used without the 'any from' clause
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in any component.done operation >
+<TC - 210307_002 Verify that error occurs when using index redirection in any component.done operation >
 
 <COMPILE>
 
@@ -3930,7 +3930,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in all component.done operation >
+<TC - 210307_003 Verify that error occurs when using index redirection in all component.done operation >
 
 <COMPILE>
 
@@ -3986,7 +3986,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in function instance.done operation >
+<TC - 210307_004 Verify that error occurs when using index redirection in function instance.done operation >
 
 <COMPILE>
 
@@ -4042,7 +4042,7 @@ error: Type mismatch: The type of the operand should be a component array type i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that killed operator is only valid for ptcs. >
+<TC - 210308_001 Ensure that killed operator is only valid for ptcs. >
 
 <COMPILE>
 
@@ -4092,7 +4092,7 @@ error: at or before token `killed': syntax error, unexpected DotKilledKeyword, e
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from killed is applied to single component >
+<TC - 210308_002 Verify that error occurs when any from killed is applied to single component >
 
 <COMPILE>
 
@@ -4143,7 +4143,7 @@ error: Type mismatch: The type of the operand should be a component array type i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from killed is applied to 1D array and index target is array >
+<TC - 210308_003 Verify that error occurs when any from killed is applied to 1D array and index target is array >
 
 <COMPILE>
 
@@ -4211,7 +4211,7 @@ error: Indices of one-dimensional component arrays can only be redirected to an
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from killed is applied to 1D array and index target has wrong type >
+<TC - 210308_004 Verify that error occurs when any from killed is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -4279,7 +4279,7 @@ error: Indices of component arrays can only be redirected to an integer, an inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from killed index redirection for multi-D arrays requires arrays of correct size >
+<TC - 210308_005 Verify that any from killed index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -4354,7 +4354,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from killed index redirection for multi-D arrays requires arrays >
+<TC - 210308_006 Verify that any from killed index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -4426,7 +4426,7 @@ error: Indices of multi-dimensional component arrays can only be redirected to a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - partially initialized array in any from ComponentArrayRef.killed >
+<TC - 210308_010 partially initialized array in any from ComponentArrayRef.killed >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4479,7 +4479,7 @@ Dynamic test case error: Performing killed operation on an unbound component ref
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in component.killed operation >
+<TC - 210308_001 Verify that error occurs when using index redirection in component.killed operation >
 
 <COMPILE>
 
@@ -4535,7 +4535,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in any component.killed operation >
+<TC - 210308_002 Verify that error occurs when using index redirection in any component.killed operation >
 
 <COMPILE>
 
@@ -4591,7 +4591,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in all component.killed operation >
+<TC - 210308_003 Verify that error occurs when using index redirection in all component.killed operation >
 
 <COMPILE>
 
@@ -4647,7 +4647,7 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in function instance.killed operation >
+<TC - 210308_004 Verify that error occurs when using index redirection in function instance.killed operation >
 
 <COMPILE>
 
diff --git a/conformance_test/core_language_tests/negative_tests/22_communication_operations.script b/conformance_test/core_language_tests/negative_tests/22_communication_operations.script
index 9cf020faac7af755c391356bdb9df2243560e4eb..0e669454c674aae493f213210877dedae16a2748 100644
--- a/conformance_test/core_language_tests/negative_tests/22_communication_operations.script
+++ b/conformance_test/core_language_tests/negative_tests/22_communication_operations.script
@@ -53,7 +53,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 22_communicat
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles message sending operations >
+<TC - 220201_001 Ensure that the IUT correctly handles message sending operations >
 
 <COMPILE>
 
@@ -177,7 +177,7 @@ error: A specific value was expected instead of any or omit
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles message sending operations  >
+<TC - 220201_002 Ensure that the IUT correctly handles message sending operations  >
 
 <COMPILE>
 
@@ -301,7 +301,7 @@ error: A specific value was expected instead of any value
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles message sending operations  >
+<TC - 220201_003 Ensure that the IUT correctly handles message sending operations  >
 
 <COMPILE>
 
@@ -359,7 +359,7 @@ error: Incompatible explicit type specification: `integer' was expected instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles message sending operations  >
+<TC - 220201_004 Ensure that the IUT correctly handles message sending operations  >
 
 <COMPILE>
 
@@ -447,7 +447,7 @@ error: The type of send parameter is signature `@NegSem_220201_SendOperation_004
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - missing to clause in case of one-to-many connections  >
+<TC - 220201_005 missing to clause in case of one-to-many connections  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -519,7 +519,7 @@ Dynamic test case error: Port p has more than one active connections. Message ca
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - partially initialized template  >
+<TC - 220201_006 partially initialized template  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -576,7 +576,7 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - no type prefix in inline template  >
+<TC - 220201_007 no type prefix in inline template  >
 
 <COMPILE>
 
@@ -638,7 +638,7 @@ error: Cannot determine the type of the outgoing message
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the to clause of send operation  >
+<TC - 220201_010 null component in the to clause of send operation  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -692,7 +692,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - send operation on disconnected and unmapped ports  >
+<TC - 220201_011 send operation on disconnected and unmapped ports  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -742,7 +742,7 @@ Dynamic test case error: Port p has neither connections nor mappings. Message ca
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles message receiving operations  >
+<TC - 220202_001 Ensure that the IUT correctly handles message receiving operations  >
 
 <COMPILE>
 
@@ -825,7 +825,7 @@ error: Message-based operation `receive' is not applicable to a procedure-based
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - no type prefix in ambiguous inline template  >
+<TC - 220202_002 no type prefix in ambiguous inline template  >
 
 <COMPILE>
 
@@ -886,7 +886,7 @@ error: Cannot determine the type of the incoming message
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - type mismatch in redirect value assignment  >
+<TC - 220202_003 type mismatch in redirect value assignment  >
 
 <COMPILE>
 
@@ -942,7 +942,7 @@ error: Type mismatch in value redirect: A variable of type `integer' or of a com
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - type mismatch in redirect assignment of message fields >
+<TC - 220202_004 type mismatch in redirect assignment of message fields >
 
 <COMPILE>
 
@@ -1006,7 +1006,7 @@ error: Type mismatch in value redirect: A variable of type `charstring' or of a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying @decoded to a forbidden field  >
+<TC - 220202_005 applying @decoded to a forbidden field  >
 
 <COMPILE>
 
@@ -1072,7 +1072,7 @@ error: The '@decoded' modifier is only available to value redirects of string ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - decoding error in @decoded redirect assignment  >
+<TC - 220202_006 decoding error in @decoded redirect assignment  >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1139,7 +1139,7 @@ Dynamic test case error: Value redirect #1 failed, because the buffer was not em
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - invalid format value in @decoded redirect assignment  >
+<TC - 220202_007 invalid format value in @decoded redirect assignment  >
 
 <COMPILE>
 
@@ -1204,7 +1204,7 @@ error: 'proprietary' is not a valid encoding format
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect assignment  >
+<TC - 220202_008 value of wrong type in @decoded redirect assignment  >
 
 <COMPILE>
 
@@ -1269,7 +1269,7 @@ error: Type mismatch: a value of type `charstring' was expected instead of `inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect assignment  >
+<TC - 220202_009 value of wrong type in @decoded redirect assignment  >
 
 <COMPILE>
 
@@ -1335,7 +1335,7 @@ error: The encoding format parameter for the '@decoded' modifier is only availab
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - attempting to store component name in redirect assignment >
+<TC - 220202_010 attempting to store component name in redirect assignment >
 
 <COMPILE>
 
@@ -1389,7 +1389,7 @@ error: The type of the variable should be a component type instead of `charstrin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - attempting to receive a type missing from the port list >
+<TC - 220202_011 attempting to receive a type missing from the port list >
 
 <COMPILE>
 
@@ -1447,7 +1447,7 @@ error: Incompatible explicit type specification: `integer' was expected instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value redirect assignment in receive any message statement >
+<TC - 220202_012 value redirect assignment in receive any message statement >
 
 <COMPILE>
 
@@ -1503,7 +1503,7 @@ error: Value redirect cannot be used without receive parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - type mismatch in sender redirect assignment >
+<TC - 220202_014 type mismatch in sender redirect assignment >
 
 <COMPILE>
 
@@ -1558,7 +1558,7 @@ error: The type of the variable should be a component type instead of `charstrin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component reference in from clause of receive operation >
+<TC - 220202_015 null component reference in from clause of receive operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1614,7 +1614,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - index redirection in standard port.receive >
+<TC - 220202_017 index redirection in standard port.receive >
 
 <COMPILE>
 
@@ -1669,7 +1669,7 @@ error: Index redirect cannot be used without the 'any from' clause
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - insufficient value range of variable in index redirection >
+<TC - 220202_019 insufficient value range of variable in index redirection >
 
 <COMPILE>
 
@@ -1722,7 +1722,7 @@ error: 3 is not a valid value for type `integer' which has subtype \(0..2\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - insufficient array dimension of variable in index redirection >
+<TC - 220202_020 insufficient array dimension of variable in index redirection >
 
 <COMPILE>
 
@@ -1774,7 +1774,7 @@ error: Size of integer array is invalid: the port array has 3 dimensions, but th
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - insufficient array dimension of variable in index redirection >
+<TC - 220202_021 insufficient array dimension of variable in index redirection >
 
 <COMPILE>
 
@@ -1830,7 +1830,7 @@ error: 3 is not a valid value for type `integer' which has subtype \(0..2\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - incompatible from and sender clause  >
+<TC - 220202_022 incompatible from and sender clause  >
 
 <COMPILE>
 
@@ -1889,7 +1889,7 @@ error: The type of the variable should be a component type instead of `integer'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles message trigger operations >
+<TC - 220203_001 Ensure that the IUT correctly handles message trigger operations >
 
 <COMPILE>
 
@@ -1974,7 +1974,7 @@ error: Message-based operation `trigger' is not applicable to a procedure-based
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - no type prefix in ambiguous inline template >
+<TC - 220203_002 no type prefix in ambiguous inline template >
 
 <COMPILE>
 
@@ -2037,7 +2037,7 @@ error: Cannot determine the type of the incoming message
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - type mismatch in redirect value assignment >
+<TC - 220203_003 type mismatch in redirect value assignment >
 
 <COMPILE>
 
@@ -2093,7 +2093,7 @@ error: Type mismatch in value redirect: A variable of type `integer' or of a com
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - type mismatch in redirect assignment of message fields >
+<TC - 220203_004 type mismatch in redirect assignment of message fields >
 
 <COMPILE>
 
@@ -2156,7 +2156,7 @@ error: Type mismatch in value redirect: A variable of type `charstring' or of a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying @decoded to a forbidden field >
+<TC - 220203_005 applying @decoded to a forbidden field >
 
 <COMPILE>
 
@@ -2221,7 +2221,7 @@ error: The '@decoded' modifier is only available to value redirects of string ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - decoding error in @decoded redirect assignment >
+<TC - 220203_006 decoding error in @decoded redirect assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2287,7 +2287,7 @@ Dynamic test case error: Value redirect #1 failed, because the buffer was not em
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - invalid format value in @decoded redirect assignment >
+<TC - 220203_007 invalid format value in @decoded redirect assignment >
 
 <COMPILE>
 
@@ -2352,7 +2352,7 @@ error: 'proprietary' is not a valid encoding format
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect assignment >
+<TC - 220203_008 value of wrong type in @decoded redirect assignment >
 
 <COMPILE>
 
@@ -2417,7 +2417,7 @@ error: Type mismatch: a value of type `charstring' was expected instead of `inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - encoding parameter of @decoded redirect assignment applied to incorrect type >
+<TC - 220203_009 encoding parameter of @decoded redirect assignment applied to incorrect type >
 
 <COMPILE>
 
@@ -2483,7 +2483,7 @@ error: The encoding format parameter for the '@decoded' modifier is only availab
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - attempting to store component name in redirect assignment >
+<TC - 220203_010 attempting to store component name in redirect assignment >
 
 <COMPILE>
 
@@ -2540,7 +2540,7 @@ error: The type of the variable should be a component type instead of `charstrin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - attempting to receive a type missing from the port list >
+<TC - 220203_011 attempting to receive a type missing from the port list >
 
 <COMPILE>
 
@@ -2597,7 +2597,7 @@ error: Incompatible explicit type specification: `integer' was expected instead
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value redirect assignment in receive any message statement >
+<TC - 220203_012 value redirect assignment in receive any message statement >
 
 <COMPILE>
 
@@ -2651,7 +2651,7 @@ error: Value redirect cannot be used without receive parameter
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - type mismatch in sender redirect assignment >
+<TC - 220203_014 type mismatch in sender redirect assignment >
 
 <COMPILE>
 
@@ -2707,7 +2707,7 @@ error: The type of the variable should be a component type instead of `charstrin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component reference in from clause of trigger operation >
+<TC - 220203_015 null component reference in from clause of trigger operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2760,104 +2760,104 @@ Dynamic test case error: The second argument of connect operation contains the n
 :exmp
 
 *---------------------------------------------------------------------*
-:h3. NegSem_220203_TriggerOperation_019 negative test
+:h3. NegSem_220203_TriggerOperation_017 negative test
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - insufficient value range of variable in index redirection >
+<TC - 220203_017 index redirection in standard port.trigger >
 
 <COMPILE>
 
-<MODULE TTCN NegSem_220203_TriggerOperation_019 NegSem_220203_TriggerOperation_019.ttcn >
+<MODULE TTCN NegSem_220203_TriggerOperation_017 NegSem_220203_TriggerOperation_017.ttcn >
 /******************************************************************************
  ** @version  0.0.1
- ** @purpose  1:22.2.3, insufficient value range of variable in index redirection 
+ ** @purpose  1:22.2.3, index redirection in standard port.trigger
  ** @verdict  pass reject
  *****************************************************************/
 
 // The following requirements are tested:
-// If the index redirection is used for single-dimensional port arrays, the type of the 
-// integer variable shall allow storing the highest index of the respective array.
+// The index redirection shall only be used when the operation is used on an any from port
+// array construct.
+
+module NegSem_220203_TriggerOperation_017 {
 
-module NegSem_220203_TriggerOperation_019 {
-    type integer RestrInt(0..2);
 	type port P message {
 		inout integer;
 	} with {extension "internal"}
 	
     type component GeneralComp {
-		port P p[10];
+		port P p;
 	}
 	    
-    testcase TC_NegSem_220203_TriggerOperation_019() runs on GeneralComp {
-        var RestrInt v_int;
+    testcase TC_NegSem_220203_TriggerOperation_017() runs on GeneralComp {
+        var integer v_int;
 
-		connect(self:p[5], self:p[5]);
-        p[5].send(100);
-        any from p.trigger(integer:?) -> @index value v_int;
+		connect(self:p, self:p);
+        p.send(10);
+        p.trigger(integer:?) -> @index value v_int;
         setverdict(pass);
     }
 
     control {
-        execute(TC_NegSem_220203_TriggerOperation_019(), 5.0);
+        execute(TC_NegSem_220203_TriggerOperation_017(), 5.0);
     }
 }
 <END_MODULE>
 
 <RESULT COUNT 1>
-error: 3 is not a valid value for type `integer' which has subtype \(0..2\)
+error: Index redirect cannot be used without the 'any from' clause
 <END_RESULT>
 
 <END_TC>
 :exmp
 
 *---------------------------------------------------------------------*
-:h3. NegSem_220203_TriggerOperation_017 negative test
+:h3. NegSem_220203_TriggerOperation_019 negative test
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - index redirection in standard port.trigger >
+<TC - 220203_019 insufficient value range of variable in index redirection >
 
 <COMPILE>
 
-<MODULE TTCN NegSem_220203_TriggerOperation_017 NegSem_220203_TriggerOperation_017.ttcn >
+<MODULE TTCN NegSem_220203_TriggerOperation_019 NegSem_220203_TriggerOperation_019.ttcn >
 /******************************************************************************
  ** @version  0.0.1
- ** @purpose  1:22.2.3, index redirection in standard port.trigger
+ ** @purpose  1:22.2.3, insufficient value range of variable in index redirection 
  ** @verdict  pass reject
  *****************************************************************/
 
 // The following requirements are tested:
-// The index redirection shall only be used when the operation is used on an any from port
-// array construct.
-
-module NegSem_220203_TriggerOperation_017 {
+// If the index redirection is used for single-dimensional port arrays, the type of the 
+// integer variable shall allow storing the highest index of the respective array.
 
+module NegSem_220203_TriggerOperation_019 {
+    type integer RestrInt(0..2);
 	type port P message {
 		inout integer;
 	} with {extension "internal"}
 	
     type component GeneralComp {
-		port P p;
+		port P p[10];
 	}
 	    
-    testcase TC_NegSem_220203_TriggerOperation_017() runs on GeneralComp {
-        var integer v_int;
+    testcase TC_NegSem_220203_TriggerOperation_019() runs on GeneralComp {
+        var RestrInt v_int;
 
-		connect(self:p, self:p);
-        p.send(10);
-        p.trigger(integer:?) -> @index value v_int;
+		connect(self:p[5], self:p[5]);
+        p[5].send(100);
+        any from p.trigger(integer:?) -> @index value v_int;
         setverdict(pass);
     }
 
     control {
-        execute(TC_NegSem_220203_TriggerOperation_017(), 5.0);
+        execute(TC_NegSem_220203_TriggerOperation_019(), 5.0);
     }
 }
 <END_MODULE>
 
 <RESULT COUNT 1>
-error: Index redirect cannot be used without the 'any from' clause
+error: 3 is not a valid value for type `integer' which has subtype \(0..2\)
 <END_RESULT>
 
 <END_TC>
@@ -2868,7 +2868,7 @@ error: Index redirect cannot be used without the 'any from' clause
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - insufficient array dimension of variable in index redirection >
+<TC - 220203_020 insufficient array dimension of variable in index redirection >
 
 <COMPILE>
 
@@ -2921,7 +2921,7 @@ error: Size of integer array is invalid: the port array has 3 dimensions, but th
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - insufficient element value range of variable in index redirection >
+<TC - 220203_021 insufficient element value range of variable in index redirection >
 
 <COMPILE>
 
@@ -2975,7 +2975,7 @@ error: 3 is not a valid value for type `integer' which has subtype \(0..2\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - incompatible from and sender clause  >
+<TC - 220203_022 incompatible from and sender clause  >
 
 <COMPILE>
 
@@ -3038,7 +3038,7 @@ error: The type of the variable should be a component type instead of `integer'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles procedure call operations  >
+<TC - 220301_001 Ensure that the IUT correctly handles procedure call operations  >
 
 <COMPILE>
 
@@ -3096,7 +3096,7 @@ error: Procedure-based operation `call' is not applicable to a message-based por
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly procedure calls >
+<TC - 220301_002 Ensure that the IUT correctly procedure calls >
 
 <COMPILE>
 
@@ -3238,7 +3238,7 @@ error: Catching of `timeout' exception is not allowed because the previous `call
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the to clause of the call operation >
+<TC - 220301_003 null component in the to clause of the call operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -3292,7 +3292,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that getcall operations are only used on procedure based ports  >
+<TC - 220302_001 Ensure that getcall operations are only used on procedure based ports  >
 
 <COMPILE>
 
@@ -3348,7 +3348,7 @@ error: Procedure-based operation `getcall' is not applicable to a message-based
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that getcall operation does not allow value assignment >
+<TC - 220302_002 Ensure that getcall operation does not allow value assignment >
 
 <COMPILE>
 
@@ -3494,7 +3494,7 @@ error: at or before token `testcase': syntax error, unexpected TestcaseKeyword,
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that getcall for any call does not allow param assignment >
+<TC - 220302_003 Ensure that getcall for any call does not allow param assignment >
 
 <COMPILE>
 
@@ -3635,7 +3635,7 @@ error: Parameter redirect cannot be used without signature template
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from getcall is applied to single port >
+<TC - 220302_004 Verify that error occurs when any from getcall is applied to single port >
 
 <COMPILE>
 
@@ -3696,7 +3696,7 @@ error: Reference to a port array was expected instead of a port
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from getcall is applied to 1D array and index target is array >
+<TC - 220302_005 Verify that error occurs when any from getcall is applied to 1D array and index target is array >
 
 <COMPILE>
 
@@ -3768,7 +3768,7 @@ error: Indices of one-dimensional port arrays can only be redirected to an integ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from getcall is applied to 1D array and index target has wrong type >
+<TC - 220302_006 Verify that error occurs when any from getcall is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -3840,7 +3840,7 @@ error: Indices of port arrays can only be redirected to an integer, an integer a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from getcall index redirection for multi-D arrays requires arrays of correct size >
+<TC - 220302_007 Verify that any from getcall index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -3920,7 +3920,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from getcall index redirection for multi-D arrays requires arrays >
+<TC - 220302_008 Verify that any from getcall index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -3996,7 +3996,7 @@ error: Indices of multi-dimensional port arrays can only be redirected to an int
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the from clause of the getcall operation >
+<TC - 220302_009 null component in the from clause of the getcall operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4061,7 +4061,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying @decoded to a forbidden field >
+<TC - 220302_011 applying @decoded to a forbidden field >
 
 <COMPILE>
 
@@ -4131,7 +4131,7 @@ error: The '@decoded' modifier is only available to parameter redirects of strin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - decoding error in @decoded redirect assignment >
+<TC - 220302_012 decoding error in @decoded redirect assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4201,7 +4201,7 @@ Dynamic test case error: Parameter redirect \(for parameter 'p__par'\) failed, b
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - invalid format value in @decoded redirect assignment >
+<TC - 220302_013 invalid format value in @decoded redirect assignment >
 
 <COMPILE>
 
@@ -4270,7 +4270,7 @@ error: 'proprietary' is not a valid encoding format
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect assignment >
+<TC - 220302_014 value of wrong type in @decoded redirect assignment >
 
 <COMPILE>
 
@@ -4339,7 +4339,7 @@ error: Type mismatch: a value of type `charstring' was expected instead of `inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - encoding parameter of @decoded redirect assignment applied to incorrect type >
+<TC - 220302_015 encoding parameter of @decoded redirect assignment applied to incorrect type >
 
 <COMPILE>
 
@@ -4409,7 +4409,7 @@ error: The encoding format parameter for the '@decoded' modifier is only availab
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - incompatible from and sender clause in getcall operation >
+<TC - 220302_016 incompatible from and sender clause in getcall operation >
 
 <COMPILE>
 
@@ -4479,7 +4479,7 @@ error: The types in `from' clause and `sender' redirect are not the same: `@NegS
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in port.getcall operation >
+<TC - 220302_001 Verify that error occurs when using index redirection in port.getcall operation >
 
 <COMPILE>
 
@@ -4541,7 +4541,7 @@ error: Index redirect cannot be used without the 'any from' clause
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that reply operations are only used on procedure based ports >
+<TC - 220303_001 Ensure that reply operations are only used on procedure based ports >
 
 <COMPILE>
 
@@ -4602,7 +4602,7 @@ error: The type of parameter is `integer', which is not a signature
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the to clause of the reply operation >
+<TC - 220303_002 null component in the to clause of the reply operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -4667,7 +4667,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from getreply is applied to single port >
+<TC - 220304_001 Verify that error occurs when any from getreply is applied to single port >
 
 <COMPILE>
 
@@ -4730,7 +4730,7 @@ error: Reference to a port array was expected instead of a port
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from getreply is applied to 1D array and index target is array >
+<TC - 220304_002 Verify that error occurs when any from getreply is applied to 1D array and index target is array >
 
 <COMPILE>
 
@@ -4809,7 +4809,7 @@ error: Indices of one-dimensional port arrays can only be redirected to an integ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from getreply is applied to 1D array and index target has wrong type >
+<TC - 220304_003 Verify that error occurs when any from getreply is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -4888,7 +4888,7 @@ error: Indices of port arrays can only be redirected to an integer, an integer a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from getreply index redirection for multi-D arrays requires arrays of correct size >
+<TC - 220304_004 Verify that any from getreply index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -4977,7 +4977,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from getreply index redirection for multi-D arrays requires arrays >
+<TC - 220304_005 Verify that any from getreply index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -5062,7 +5062,7 @@ error: Indices of multi-dimensional port arrays can only be redirected to an int
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the from clause of the getreply operation >
+<TC - 220304_006 null component in the from clause of the getreply operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5128,7 +5128,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the multicast list of the from clause of the getreply operation >
+<TC - 220304_007 null component in the multicast list of the from clause of the getreply operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5191,7 +5191,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying @decoded to a forbidden parameter field >
+<TC - 220304_008 applying @decoded to a forbidden parameter field >
 
 <COMPILE>
 
@@ -5263,7 +5263,7 @@ error: The '@decoded' modifier is only available to parameter redirects of strin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - decoding error in @decoded redirect parameter assignment >
+<TC - 220304_009 decoding error in @decoded redirect parameter assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5331,7 +5331,7 @@ Dynamic test case error: Parameter redirect \(for parameter 'p__par'\) failed, b
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - invalid format value in @decoded redirect parameter assignment >
+<TC - 220304_010 invalid format value in @decoded redirect parameter assignment >
 
 <COMPILE>
 
@@ -5400,7 +5400,7 @@ error: 'proprietary' is not a valid encoding format
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect parameter assignment >
+<TC - 220304_011 value of wrong type in @decoded redirect parameter assignment >
 
 <COMPILE>
 
@@ -5468,7 +5468,7 @@ error: Type mismatch: a value of type `charstring' was expected instead of `inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - encoding parameter of @decoded redirect parameter assignment applied to incorrect type >
+<TC - 220304_012 encoding parameter of @decoded redirect parameter assignment applied to incorrect type >
 
 <COMPILE>
 
@@ -5537,7 +5537,7 @@ error: The encoding format parameter for the '@decoded' modifier is only availab
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - incompatible from and sender clause in getreply operation >
+<TC - 220304_013 incompatible from and sender clause in getreply operation >
 
 <COMPILE>
 
@@ -5605,7 +5605,7 @@ error: The types in `from' clause and `sender' redirect are not the same: `@NegS
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying @decoded to a forbidden parameter field >
+<TC - 220304_015 applying @decoded to a forbidden parameter field >
 
 <COMPILE>
 
@@ -5682,7 +5682,7 @@ error: The '@decoded' modifier is only available to value redirects of string ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - decoding error in @decoded redirect value assignment >
+<TC - 220304_016 decoding error in @decoded redirect value assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -5755,7 +5755,7 @@ Dynamic test case error: Value redirect #1 failed, because the buffer was not em
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - invalid format value in @decoded redirect value assignment >
+<TC - 220304_017 invalid format value in @decoded redirect value assignment >
 
 <COMPILE>
 
@@ -5829,7 +5829,7 @@ module NegSem_220304_getreply_operation_017 {
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect value assignment >
+<TC - 220304_018 value of wrong type in @decoded redirect value assignment >
 
 <COMPILE>
 
@@ -5900,7 +5900,7 @@ error: Type mismatch: a value of type `charstring' was expected instead of `inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - encoding parameter of @decoded redirect value assignment applied to incorrect type >
+<TC - 220304_019 encoding parameter of @decoded redirect value assignment applied to incorrect type >
 
 <COMPILE>
 
@@ -5974,7 +5974,7 @@ error: The encoding format parameter for the '@decoded' modifier is only availab
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in port.getreply operation >
+<TC - 220304_001 Verify that error occurs when using index redirection in port.getreply operation >
 
 <COMPILE>
 
@@ -6038,7 +6038,7 @@ error: Index redirect cannot be used without the 'any from' clause
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - raised exception type not in the list of available exceptions >
+<TC - 220305_001 raised exception type not in the list of available exceptions >
 
 <COMPILE>
 
@@ -6102,7 +6102,7 @@ error: Type `integer' is not present on the exception list of signature `@NegSem
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - exception raised for a signature with no exception list >
+<TC - 220305_002 exception raised for a signature with no exception list >
 
 <COMPILE>
 
@@ -6166,7 +6166,7 @@ error: Signature `@NegSem_220305_raise_operation_002.S' does not have exceptions
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - raised exception type is ambiguous >
+<TC - 220305_003 raised exception type is ambiguous >
 
 <COMPILE>
 
@@ -6233,7 +6233,7 @@ error: Type of the exception is ambiguous: `integer' is compatible with more tha
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - missing to clause in case of 1 to n connection >
+<TC - 220305_004 missing to clause in case of 1 to n connection >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6299,7 +6299,7 @@ Dynamic test case error: Port p has more than one active connections. Message ca
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - exception on a message port >
+<TC - 220305_005 exception on a message port >
 
 <COMPILE>
 
@@ -6365,7 +6365,7 @@ error: Procedure-based operation `raise' is not applicable to a message-based po
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - exception procedure signature not in the port list >
+<TC - 220305_006 exception procedure signature not in the port list >
 
 <COMPILE>
 
@@ -6426,7 +6426,7 @@ error: Signature `@NegSem_220305_raise_operation_006.S2' is not present on the i
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of incorrect type in the to clause of the raise operation >
+<TC - 220305_007 value of incorrect type in the to clause of the raise operation >
 
 <COMPILE>
 
@@ -6488,7 +6488,7 @@ error: A component reference was expected as operand
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null in the to clause of the raise operation >
+<TC - 220305_008 null in the to clause of the raise operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6550,7 +6550,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - raise operation on disconnected and unmapped ports >
+<TC - 220305_009 raise operation on disconnected and unmapped ports >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6612,7 +6612,7 @@ Dynamic test case error: Port p has neither connections nor mappings. Message ca
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from catch is applied to single port >
+<TC - 220306_001 Verify that error occurs when any from catch is applied to single port >
 
 <COMPILE>
 
@@ -6675,7 +6675,7 @@ error: Reference to a port array was expected instead of a port
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from catch is applied to 1D array and index target is array >
+<TC - 220306_002 Verify that error occurs when any from catch is applied to 1D array and index target is array >
 
 <COMPILE>
 
@@ -6754,7 +6754,7 @@ error: Indices of one-dimensional port arrays can only be redirected to an integ
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when any from catch is applied to 1D array and index target has wrong type >
+<TC - 220306_003 Verify that error occurs when any from catch is applied to 1D array and index target has wrong type >
 
 <COMPILE>
 
@@ -6833,7 +6833,7 @@ error: Indices of port arrays can only be redirected to an integer, an integer a
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from catch index redirection for multi-D arrays requires arrays of correct size >
+<TC - 220306_004  that any from catch index redirection for multi-D arrays requires arrays of correct size >
 
 <COMPILE>
 
@@ -6921,7 +6921,7 @@ error: Array index overflow: the index value must be at most `0' instead of `1'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that any from catch index redirection for multi-D arrays requires arrays >
+<TC - 220306_005 Verify that any from catch index redirection for multi-D arrays requires arrays >
 
 <COMPILE>
 
@@ -7006,7 +7006,7 @@ error: Indices of multi-dimensional port arrays can only be redirected to an int
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the from clause of the catch operation >
+<TC - 220306_006 null component in the from clause of the catch operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -7071,7 +7071,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component in the multicast list of the from clause of the catch operation >
+<TC - 220306_007 null component in the multicast list of the from clause of the catch operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -7135,7 +7135,7 @@ Dynamic test case error: The second argument of connect operation contains the n
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - applying @decoded to a forbidden exception field >
+<TC - 220306_008 applying @decoded to a forbidden exception field >
 
 <COMPILE>
 
@@ -7212,7 +7212,7 @@ error: The '@decoded' modifier is only available to value redirects of string ty
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - decoding error in @decoded redirect value assignment >
+<TC - 220306_009 decoding error in @decoded redirect value assignment >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -7283,7 +7283,7 @@ Dynamic test case error: Value redirect #1 failed, because the buffer was not em
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - invalid format value in @decoded redirect value assignment >
+<TC - 220306_010 invalid format value in @decoded redirect value assignment >
 
 <COMPILE>
 
@@ -7356,7 +7356,7 @@ error: 'proprietary' is not a valid encoding format
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - value of wrong type in @decoded redirect value assignment >
+<TC - 220306_011 value of wrong type in @decoded redirect value assignment >
 
 <COMPILE>
 
@@ -7428,7 +7428,7 @@ error: Type mismatch: a value of type `charstring' was expected instead of `inte
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - encoding parameter of @decoded redirect value assignment applied to incorrect type >
+<TC - 220306_012 encoding parameter of @decoded redirect value assignment applied to incorrect type >
 
 <COMPILE>
 
@@ -7502,7 +7502,7 @@ error: The encoding format parameter for the '@decoded' modifier is only availab
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - incompatible from and sender clause in catch operation >
+<TC - 220306_013 incompatible from and sender clause in catch operation >
 
 <COMPILE>
 
@@ -7571,7 +7571,7 @@ error: The types in `from' clause and `sender' redirect are not the same: `@NegS
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify that error occurs when using index redirection in port.catch operation >
+<TC - 220306_001 Verify that error occurs when using index redirection in port.catch operation >
 
 <COMPILE>
 
@@ -7639,7 +7639,7 @@ error: Index redirect cannot be used without the 'any from' clause
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - null component reference in from clause of check operation >
+<TC - 2204_001 null component reference in from clause of check operation >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
diff --git a/conformance_test/core_language_tests/negative_tests/23-27-B_folders.script b/conformance_test/core_language_tests/negative_tests/23-27-B_folders.script
index 590910c4fdf7796416a8db95e0a0394e30fb193d..a4ac1a092307db3b8d69a3f08e14616de91b1d65 100644
--- a/conformance_test/core_language_tests/negative_tests/23-27-B_folders.script
+++ b/conformance_test/core_language_tests/negative_tests/23-27-B_folders.script
@@ -53,7 +53,7 @@ This TD contains negative tests from ETSI TTCN3 Conformance Test's 23_timer_oper
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer operations are not allowed outside of module control, test case, function, altstep >
+<TC - 23_001 Ensure timer operations are not allowed outside of module control, test case, function, altstep >
 
 <COMPILE>
 
@@ -96,7 +96,7 @@ error: A static value was expected instead of operation `timer read'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer operations are not allowed outside of module control, test case, function, altstep >
+<TC - 23_002 Ensure timer operations are not allowed outside of module control, test case, function, altstep >
 
 <COMPILE>
 
@@ -139,7 +139,7 @@ error: A static value was expected instead of operation `timer running'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer operations are not allowed outside of module control, test case, function, altstep >
+<TC - 23_001 Ensure timer operations are not allowed outside of module control, test case, function, altstep >
 
 <COMPILE>
 
@@ -169,7 +169,7 @@ error: at or before token `all': syntax error, unexpected AllKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer operations are not allowed outside of module control, test case, function, altstep >
+<TC - 23_002 Ensure timer operations are not allowed outside of module control, test case, function, altstep >
 
 <COMPILE>
 
@@ -199,7 +199,7 @@ error: at or before token `any': syntax error, unexpected AnyKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure infinity is not allowed >
+<TC - 2302_001 Ensure infinity is not allowed >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -248,7 +248,7 @@ Dynamic test case error: Starting timer t_timer with a non-numeric float value \
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure not_a_number is not allowed >
+<TC - 2302_002 Ensure not_a_number is not allowed >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -297,7 +297,7 @@ Dynamic test case error: Starting timer t_timer with a non-numeric float value \
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure negative value is not allowed >
+<TC - 2302_003 Ensure negative value is not allowed >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -346,7 +346,7 @@ Dynamic test case error: Starting timer t_timer with a negative duration \(-1\)
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure negative infinity is not allowed >
+<TC - 2302_004 Ensure negative infinity is not allowed >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -395,7 +395,7 @@ Dynamic test case error: Starting timer t_timer with a negative duration \(-inf\
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_001 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -439,7 +439,7 @@ error: at or before token `\)': syntax error, unexpected '\)'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_002 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -485,7 +485,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_003 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -530,7 +530,7 @@ error: at or before token `\)': syntax error, unexpected '\)'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_004 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -576,7 +576,7 @@ error: at or before token `1.0': syntax error, unexpected FloatValue
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_005 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -622,7 +622,7 @@ error: at or before token `start': syntax error, unexpected StartKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_006 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -668,7 +668,7 @@ error: at or before token `1.0': syntax error, unexpected FloatValue
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_007 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -714,7 +714,7 @@ error: at or before token `start': syntax error, unexpected StartKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_009 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -760,7 +760,7 @@ error: at or before token `start': syntax error, unexpected StartKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_010 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -806,7 +806,7 @@ error: at or before token `start': syntax error, unexpected DotStartKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_011 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -852,7 +852,7 @@ error: at or before token `start': syntax error, unexpected DotStartKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_012 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -898,7 +898,7 @@ error: at or before token `start': syntax error, unexpected DotStartKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer start syntax >
+<TC - 2302_013 Ensure timer start syntax >
 
 <COMPILE>
 
@@ -945,7 +945,7 @@ error: at or before token `start': syntax error, unexpected DotStartKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer stop syntax >
+<TC - 2303_001 Ensure timer stop syntax >
 
 <COMPILE>
 
@@ -989,7 +989,7 @@ error: at or before token `stop': syntax error, unexpected StopKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer stop syntax >
+<TC - 2303_002 Ensure timer stop syntax >
 
 <COMPILE>
 
@@ -1034,7 +1034,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer stop syntax >
+<TC - 2303_003 Ensure timer stop syntax >
 
 <COMPILE>
 
@@ -1079,7 +1079,7 @@ error: at or before token `stop': syntax error, unexpected DotStopKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer stop syntax >
+<TC - 2303_004 Ensure timer stop syntax >
 
 <COMPILE>
 
@@ -1122,7 +1122,7 @@ error: at or before token `stop': syntax error, unexpected DotStopKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer stop syntax >
+<TC - 2303_005 Ensure timer stop syntax >
 
 <COMPILE>
 
@@ -1165,7 +1165,7 @@ error: at or before token `stop': syntax error, unexpected StopKeyword, expectin
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer stop syntax >
+<TC -2303_006 Ensure timer stop syntax >
 
 <COMPILE>
 
@@ -1208,7 +1208,7 @@ error: at or before token `stop': syntax error, unexpected DotStopKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer read syntax >
+<TC - 2304_001 Ensure timer read syntax >
 
 <COMPILE>
 
@@ -1251,7 +1251,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer read syntax >
+<TC - 2304_002 Ensure timer read syntax >
 
 <COMPILE>
 
@@ -1293,7 +1293,7 @@ error: at or before token `read': syntax error, unexpected ReadKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer read syntax >
+<TC - 2304_003 Ensure timer read syntax >
 
 <COMPILE>
 
@@ -1335,7 +1335,7 @@ error: at or before token `read': syntax error, unexpected ReadKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer read syntax: disallow any timer.read >
+<TC - 2304_004 Ensure timer read syntax: disallow any timer.read >
 
 <COMPILE>
 
@@ -1377,7 +1377,7 @@ error: at or before token `read': syntax error, unexpected DotReadKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer read syntax >
+<TC - 2304_005 Ensure timer read syntax >
 
 <COMPILE>
 
@@ -1418,7 +1418,7 @@ error: at or before token `timer': syntax error, unexpected TimerKeyword, expect
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer running syntax >
+<TC - 2305_001 Ensure timer running syntax >
 
 <COMPILE>
 
@@ -1459,7 +1459,7 @@ error: at or before token `running': syntax error, unexpected RunningKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer running syntax >
+<TC - 2305_002 Ensure timer running syntax >
 
 <COMPILE>
 
@@ -1501,7 +1501,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer running syntax >
+<TC - 2305_003 Ensure timer running syntax >
 
 <COMPILE>
 
@@ -1543,7 +1543,7 @@ error: at or before token `running': syntax error, unexpected RunningKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer running syntax >
+<TC - 2305_004 Ensure timer running syntax >
 
 <COMPILE>
 
@@ -1585,7 +1585,7 @@ error: at or before token `timer': syntax error, unexpected TimerKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer running syntax >
+<TC - 2305_005 Ensure timer running syntax >
 
 <COMPILE>
 
@@ -1627,7 +1627,7 @@ error: at or before token `timer': syntax error, unexpected TimerKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer running syntax: disallow all timer.running >
+<TC - 2305_006 Ensure timer running syntax: disallow all timer.running >
 
 <COMPILE>
 
@@ -1669,7 +1669,7 @@ error: at or before token `timer': syntax error, unexpected TimerKeyword, expect
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout syntax >
+<TC - 2306_001 Ensure timer timeout syntax >
 
 <COMPILE>
 
@@ -1712,7 +1712,7 @@ error: at or before token `\]': syntax error, unexpected '\]'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout can`t be used in boolean expressions >
+<TC - 2306_002 Ensure timer timeout can`t be used in boolean expressions >
 
 <COMPILE>
 
@@ -1757,7 +1757,7 @@ error: at or before token `timeout': syntax error, unexpected DotTimeoutKeyword,
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout syntax >
+<TC - 2306_003 Ensure timer timeout syntax >
 
 <COMPILE>
 
@@ -1799,7 +1799,7 @@ error: at or before token `\(': syntax error, unexpected '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout syntax >
+<TC - 2306_004 Ensure timer timeout syntax >
 
 <COMPILE>
 
@@ -1840,7 +1840,7 @@ error: at or before token `\(': syntax error, unexpected '\('
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout syntax >
+<TC - 2306_005 Ensure timer timeout syntax >
 
 <COMPILE>
 
@@ -1882,7 +1882,7 @@ error: at or before token `timeout': syntax error, unexpected TimeoutKeyword, ex
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout syntax >
+<TC - 2306_006 Ensure timer timeout syntax >
 
 <COMPILE>
 
@@ -1924,7 +1924,7 @@ error: at or before token `timeout': syntax error, unexpected TimeoutKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure timer timeout syntax >
+<TC - 2306_007 Ensure timer timeout syntax >
 
 <COMPILE>
 
@@ -1970,7 +1970,7 @@ error: at or before token `timeout': syntax error, unexpected DotTimeoutKeyword,
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure getverdict is not allowed in constant initialization in control part >
+<TC - 24_001 Ensure getverdict is not allowed in constant initialization in control part >
 
 <COMPILE>
 
@@ -2012,7 +2012,7 @@ error: An evaluable constant value was expected instead of operation `getverdict
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure getverdict is not allowed in parameter initialization in control part. >
+<TC - 24_002 Ensure getverdict is not allowed in parameter initialization in control part. >
 
 <COMPILE>
 
@@ -2052,7 +2052,7 @@ error: Operation `getverdict\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure getverdict is not allowed in variable definition in control part. >
+<TC - 24_003 Ensure getverdict is not allowed in variable definition in control part. >
 
 <COMPILE>
 
@@ -2092,7 +2092,7 @@ error: Operation `getverdict\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict is not allowed in part whithin compound statement. >
+<TC - 24_004 Ensure setverdict is not allowed in part whithin compound statement. >
 
 <COMPILE>
 
@@ -2135,7 +2135,7 @@ error: Setverdict statement is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict is not allowed in control part at the top level. >
+<TC - 24_005 Ensure setverdict is not allowed in control part at the top level. >
 
 <COMPILE>
 
@@ -2177,7 +2177,7 @@ error: at or before token `setverdict': syntax error, unexpected SetVerdictKeywo
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that setverdict can't set error verdict >
+<TC - 2401_001 Ensure that setverdict can't set error verdict >
 
 <COMPILE>
 
@@ -2230,7 +2230,7 @@ error: Error verdict cannot be set by the setverdict operation
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict accepts parameters of verdicttype only >
+<TC - 2402_001 Ensure setverdict accepts parameters of verdicttype only >
 
 <COMPILE>
 
@@ -2270,7 +2270,7 @@ error: A value or expression of type verdict was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict accepts parameters of verdicttype only >
+<TC - 2402_002 Ensure setverdict accepts parameters of verdicttype only >
 
 <COMPILE>
 
@@ -2312,7 +2312,7 @@ error: A value or expression of type verdict was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict accepts parameters of verdicttype only >
+<TC - 2402_003 Ensure setverdict accepts parameters of verdicttype only >
 
 <COMPILE>
 
@@ -2352,7 +2352,7 @@ error: Reference to a value was expected instead of template variable `v_pass'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict accepts values only as the parameter >
+<TC - 2402_004 Ensure setverdict accepts values only as the parameter >
 
 <COMPILE>
 
@@ -2392,7 +2392,7 @@ error: Reference to a value was expected instead of template variable `v_pass'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure setverdict accepts values only as the parameter >
+<TC - 2402_005 Ensure setverdict accepts values only as the parameter >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -2440,7 +2440,7 @@ Dynamic test case error: Using non-selected field verdicttype in a value of unio
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that non-float timeout parameters in the execute statement are rejected (in this case int).>
+<TC - 2601_001 Ensure that non-float timeout parameters in the execute statement are rejected (in this case int).>
 
 <COMPILE>
 
@@ -2478,7 +2478,7 @@ error: A value or expression of type float was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that non-float timeout parameters in the execute statement are rejected (in this case charstring).>
+<TC - 2601_002 Ensure that non-float timeout parameters in the execute statement are rejected (in this case charstring).>
 
 <COMPILE>
 
@@ -2516,7 +2516,7 @@ error: A value or expression of type float was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that execution rejects test case execution with infinity timer guard >
+<TC - 2601_004 Ensure that execution rejects test case execution with infinity timer guard >
 
 <COMPILE>
 
@@ -2555,7 +2555,7 @@ error: The testcase guard timer duration cannot be INF
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that setverdict statements are not allowed in the control part. >
+<TC - 2602_001 Ensure that setverdict statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -2589,7 +2589,7 @@ error: at or before token `setverdict': syntax error, unexpected SetVerdictKeywo
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the create component is not allowed in the control part. >
+<TC - 2602_002 Ensure that the create component is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2629,7 +2629,7 @@ error: Operation `create\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the create alive component is not allowed in the control part. >
+<TC - 2602_003 Ensure that the create alive component is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2669,7 +2669,7 @@ error: Operation `create\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the start statement is not allowed in the control part. >
+<TC - 2602_004 Ensure that the start statement is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2718,7 +2718,7 @@ error: Component operation is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the stop statement is not allowed in the control part. >
+<TC - 2602_005 Ensure that the stop statement is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2768,7 +2768,7 @@ error: Component operation is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the kill statement is not allowed in the control part. >
+<TC - 2602_006 Ensure that the kill statement is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2818,7 +2818,7 @@ error: at or before token `kill': syntax error, unexpected DotKillKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the alive operation is not allowed in the control part. >
+<TC - 2602_007 Ensure that the alive operation is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2869,7 +2869,7 @@ error: Operation `alive' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the running operation is not allowed in the control part. >
+<TC - 2602_008 Ensure that the running operation is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2920,7 +2920,7 @@ error: Operation `component running' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the done operation is not allowed in the control part. >
+<TC - 2602_009 Ensure that the done operation is not allowed in the control part. >
 
 <COMPILE>
 
@@ -2970,7 +2970,7 @@ error: at or before token `done': syntax error, unexpected DotDoneKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the done operation is not allowed in the control part. >
+<TC - 2602_010 Ensure that the done operation is not allowed in the control part. >
 
 <COMPILE>
 
@@ -3021,7 +3021,7 @@ error: at or before token `killed': syntax error, unexpected DotKilledKeyword, e
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the connect statements are not allowed in the control part. >
+<TC - 2602_011 Ensure that the connect statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3073,7 +3073,7 @@ error: at or before token `connect': syntax error, unexpected ConnectKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the disconnect statements are not allowed in the control part. >
+<TC - 2602_012 Ensure that the disconnect statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3125,7 +3125,7 @@ error: at or before token `disconnect': syntax error, unexpected DisconnectKeywo
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the map statements are not allowed in the control part. >
+<TC - 2602_013 Ensure that the map statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3177,7 +3177,7 @@ error: at or before token `map': syntax error, unexpected MapKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the unmap statements are not allowed in the control part. >
+<TC - 2602_014 Ensure that the unmap statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3229,7 +3229,7 @@ error: at or before token `unmap': syntax error, unexpected UnmapKeyword
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the send statements are not allowed in the control part. >
+<TC - 2602_015 Ensure that the send statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3276,7 +3276,7 @@ error: at or before token `send': syntax error, unexpected DotSendOpKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the receive statements are not allowed in the control part. >
+<TC - 2602_016 Ensure that the receive statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3323,7 +3323,7 @@ error: at or before token `receive': syntax error, unexpected DotReceiveOpKeywor
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the call statements are not allowed in the control part. >
+<TC - 2602_017 Ensure that the call statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3374,7 +3374,7 @@ error: at or before token `call': syntax error, unexpected DotCallOpKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the reply statements are not allowed in the control part. >
+<TC - 2602_018 Ensure that the reply statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3424,7 +3424,7 @@ error: at or before token `reply': syntax error, unexpected DotReplyKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the raise statements are not allowed in the control part. >
+<TC - 2602_019 Ensure that the raise statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3476,7 +3476,7 @@ error: at or before token `raise': syntax error, unexpected DotRaiseKeyword, exp
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the trigger statements are not allowed in the control part. >
+<TC - 2602_020 Ensure that the trigger statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3524,7 +3524,7 @@ error: at or before token `trigger': syntax error, unexpected DotTriggerOpKeywor
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the getcall statements are not allowed in the control part. >
+<TC - 2602_021 Ensure that the getcall statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3573,7 +3573,7 @@ error: at or before token `getcall': syntax error, unexpected DotGetCallOpKeywor
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the getreply statements are not allowed in the control part. >
+<TC - 2602_022 Ensure that the getreply statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3621,7 +3621,7 @@ error: at or before token `getreply': syntax error, unexpected DotGetReplyOpKeyw
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the catch statements are not allowed in the control part. >
+<TC - 2602_023 Ensure that the catch statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3669,7 +3669,7 @@ error: at or before token `catch': syntax error, unexpected DotCatchOpKeyword, e
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the check statements are not allowed in the control part. >
+<TC - 2602_024 Ensure that the check statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3717,7 +3717,7 @@ error: at or before token `check': syntax error, unexpected DotCheckOpKeyword, e
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the clear statements are not allowed in the control part. >
+<TC - 2602_025 Ensure that the clear statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3765,7 +3765,7 @@ error: at or before token `clear': syntax error, unexpected DotClearOpKeyword, e
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the start statements on ports are not allowed in the control part. >
+<TC - 2602_026 Ensure that the start statements on ports are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3813,7 +3813,7 @@ error: The argument of start operation is missing, although it cannot be a start
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the stop statements on ports are not allowed in the control part. >
+<TC - 2602_027 Ensure that the stop statements on ports are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3864,7 +3864,7 @@ error: Referencing fields of a component is not allowed
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the halt statements are not allowed in the control part. >
+<TC - 2602_028 Ensure that the halt statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3912,7 +3912,7 @@ error: at or before token `halt': syntax error, unexpected DotHaltKeyword, expec
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that alternative behaviours are only used to control timer behavior in the control part. >
+<TC - 2602_029 Ensure that alternative behaviours are only used to control timer behavior in the control part. >
 
 <COMPILE>
 
@@ -3963,7 +3963,7 @@ error: Reference to a port or port parameter was expected instead of variable `v
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that getverdict statements are not allowed in the control part. >
+<TC - 2602_030 Ensure that getverdict statements are not allowed in the control part. >
 
 <COMPILE>
 
@@ -3998,7 +3998,7 @@ error: Operation `getverdict\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that execute statements are not executed from test cases. >
+<TC - 2602_031 Ensure that execute statements are not executed from test cases. >
 
 <COMPILE>
 
@@ -4042,7 +4042,7 @@ error: A definition that has `runs on' clause cannot execute testcases
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the create alive named component is not allowed in the control part. >
+<TC - 2602_032 Ensure that the create alive named component is not allowed in the control part. >
 
 <COMPILE>
 
@@ -4082,7 +4082,7 @@ error: Operation `create\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the create named component is not allowed in the control part. >
+<TC - 2602_033 Ensure that the create named component is not allowed in the control part. >
 
 <COMPILE>
 
@@ -4122,7 +4122,7 @@ error: Operation `create\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the create named component on host is not allowed in the control part. >
+<TC - 2602_034 Ensure that the create named component on host is not allowed in the control part. >
 
 <COMPILE>
 
@@ -4161,7 +4161,7 @@ error: Operation `create\(\)' is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that alternative behaviours are only used to control timer behavior in the control part. >
+<TC - 2602_035 Ensure that alternative behaviours are only used to control timer behavior in the control part. >
 
 <COMPILE>
 
@@ -4198,7 +4198,7 @@ error: Port operation is not allowed in the control part
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of omitted values >
+<TC - B010101_001 Ensure that the IUT correctly handles template matching of omitted values >
 
 <COMPILE>
 
@@ -4276,7 +4276,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of * values  >
+<TC - B010204_001 Ensure that the IUT correctly handles template matching of * values  >
 
 <COMPILE>
 
@@ -4377,7 +4377,7 @@ error: Using `\*' for mandatory field
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of * values  >
+<TC - B010204_002 Ensure that the IUT correctly handles template matching of * values  >
 
 <COMPILE>
 
@@ -4483,7 +4483,7 @@ error: Using `\*' for mandatory field
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of value range definitions >
+<TC - B010205_001 Ensure that the IUT correctly handles template matching of value range definitions >
 
 <COMPILE>
 
@@ -4570,7 +4570,7 @@ error: value range match cannot be used for enumerated type `@NegSem_B010205_val
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of value range definitions  >
+<TC - B010205_002 Ensure that the IUT correctly handles template matching of value range definitions  >
 
 <COMPILE>
 
@@ -4658,7 +4658,7 @@ error: The lower boundary is higher than the upper boundary
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of value range definitions >
+<TC - B010205_003 Ensure that the IUT correctly handles template matching of value range definitions >
 
 <COMPILE>
 
@@ -4745,7 +4745,7 @@ error: The lower boundary has higher character code than the upper boundary
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of superset definitions >
+<TC - B010206_001 Ensure that the IUT correctly handles template matching of superset definitions >
 
 <COMPILE>
 
@@ -4802,7 +4802,7 @@ error: superset match cannot be used for `record of' type `@NegSem_B010206_super
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of superset definitions >
+<TC - B010206_002 Ensure that the IUT correctly handles template matching of superset definitions >
 
 <COMPILE>
 
@@ -4862,7 +4862,7 @@ error: superset match cannot be used for set type `@NegSem_B010206_superset_002.
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of superset definition >
+<TC - B010206_004 Ensure that the IUT correctly handles template matching of superset definition >
 
 <COMPILE>
 
@@ -4935,7 +4935,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definition >
+<TC - B010206_005 Ensure that the IUT correctly handles template matching of subset definition >
 
 <COMPILE>
 
@@ -5007,7 +5007,7 @@ error: A template of type '@NegSem_B010206_superset_005.SoI' can not be used as
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of superset definition >
+<TC - B010206_006 Ensure that the IUT correctly handles template matching of superset definition >
 
 <COMPILE>
 
@@ -5079,7 +5079,7 @@ error: A template of type '@NegSem_B010206_superset_006.SoI' can not be used as
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of superset definitions >
+<TC - B010206_007 Ensure that the IUT correctly handles template matching of superset definitions >
 
 <COMPILE>
 
@@ -5152,7 +5152,7 @@ error: 'all from' can not refer to permutation or AnyElementsOrNone
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of superset definition >
+<TC - B010206_008 Ensure that the IUT correctly handles template matching of superset definition >
 
 <COMPILE>
 
@@ -5228,7 +5228,7 @@ error: permutation match cannot be used for type `integer'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_001 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5284,7 +5284,7 @@ error: subset match cannot be used for `record of' type `@NegSem_B010207_subset_
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_002 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5353,7 +5353,7 @@ error: subset match cannot be used for set type `@NegSem_B010207_subset_002.SetT
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_004 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5426,7 +5426,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_005 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5499,7 +5499,7 @@ error: A template of type '@NegSem_B010207_subset_005.SoI' can not be used as ta
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_006 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5572,7 +5572,7 @@ error: A template of type '@NegSem_B010207_subset_006.SoI' can not be used as ta
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_007 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5645,7 +5645,7 @@ error: 'all from' can not refer to permutation or AnyElementsOrNone
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of subset definitions >
+<TC - B010207_008 Ensure that the IUT correctly handles template matching of subset definitions >
 
 <COMPILE>
 
@@ -5723,7 +5723,7 @@ error: permutation match cannot be used for type `integer'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of omit values >
+<TC - B010208_001 Ensure that the IUT correctly handles template matching of omit values >
 
 <COMPILE>
 
@@ -5825,7 +5825,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of omit values >
+<TC - B010208_002 Ensure that the IUT correctly handles template matching of omit values >
 
 <COMPILE>
 
@@ -5927,7 +5927,7 @@ error: `omit' value is not allowed in this context
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of ? symbols in value elements >
+<TC - B010303_001 Ensure that the IUT correctly handles template matching of ? symbols in value elements >
 
 <COMPILE>
 
@@ -6004,7 +6004,7 @@ error: permutation match cannot be used for `set of' type `@NegSem_B010303_permu
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that all from operand can be a record of or set of only >
+<TC - B010303_002 Ensure that all from operand can be a record of or set of only >
 
 <COMPILE>
 
@@ -6056,7 +6056,7 @@ error: A template of type 'integer' can not be used as target of 'all from'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that type restriction for permutation elements is applied >
+<TC - B010303_003 Ensure that type restriction for permutation elements is applied >
 
 <COMPILE>
 
@@ -6108,7 +6108,7 @@ error: integer value was expected
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify restriction on individual members of all from operand in permutation >
+<TC - B010303_005 Verify restriction on individual members of all from operand in permutation >
 
 <COMPILE>
 
@@ -6162,7 +6162,7 @@ error: Matching mechanism can not be used as target of 'all from'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Verify restriction on individual members of all from operand in permutation >
+<TC - B010303_006 Verify restriction on individual members of all from operand in permutation >
 
 <COMPILE>
 
@@ -6222,7 +6222,7 @@ error: permutation match cannot be used for type `integer'
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of value length definitions >
+<TC - B010401_002 Ensure that the IUT correctly handles template matching of value length definitions >
 
 <COMPILE>
 
@@ -6309,7 +6309,7 @@ error: There are fewer \(5\) elements in the string than it is allowed by the le
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of value length definitions >
+<TC - B010401_004 Ensure that the IUT correctly handles template matching of value length definitions >
 
 <COMPILE>
 
@@ -6391,7 +6391,7 @@ error: There are more \(4\) elements in the template than it is allowed by the l
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of ifpresent indicators >
+<TC - B010402_001 Ensure that the IUT correctly handles template matching of ifpresent indicators >
 
 <COMPILE>
 
@@ -6475,7 +6475,7 @@ error: `ifpresent' is not allowed here
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of character pattern set expressions >
+<TC - B010501_001 Ensure that the IUT correctly handles template matching of character pattern set expressions >
 
 <COMPILE>
 
@@ -6525,7 +6525,7 @@ error: Unmatched `\]'. Did you mean `\\\]'\?
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles template matching of character pattern reference characters >
+<TC - B010504_001 Ensure that the IUT correctly handles template matching of character pattern reference characters >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -6612,7 +6612,7 @@ Dynamic test case error: The length of the charstring must be of length one, whe
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the IUT correctly handles character pattern metacharacters
+<TC - B010505_001 Ensure that the IUT correctly handles character pattern metacharacters
  compatibility rules of template matching >
 
 <COMPILE>
diff --git a/conformance_test/core_language_tests/negative_tests/24-26_misc_verdict.script b/conformance_test/core_language_tests/negative_tests/24-26_misc_verdict.script
index 19014ad7a12c63d77af5e7d5bf3136e2bf6b0667..c4f2ef663e7bfc972a51c1c51416774b1f57eef8 100644
--- a/conformance_test/core_language_tests/negative_tests/24-26_misc_verdict.script
+++ b/conformance_test/core_language_tests/negative_tests/24-26_misc_verdict.script
@@ -55,7 +55,7 @@ This TD contains tests with not pass verdicts from ETSI TTCN3 Conformance Test's
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: inconc can overwrite none. >
+<TC - 2401_002 Ensure overwriting rules for global verdict: inconc can overwrite none. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -111,7 +111,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: fail can overwrite none. >
+<TC - 2401_003 Ensure overwriting rules for global verdict: fail can overwrite none. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -167,7 +167,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: inconc can overwrite pass. >
+<TC - 2401_005 Ensure overwriting rules for global verdict: inconc can overwrite pass. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -223,7 +223,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: fail can overwrite pass. >
+<TC - 2401_006 Ensure overwriting rules for global verdict: fail can overwrite pass. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -279,7 +279,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: none can't overwrite inconc. >
+<TC - 2401_007 Ensure overwriting rules for global verdict: none can't overwrite inconc. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -335,7 +335,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: pass can't overwrite inconc. >
+<TC - 2401_008 Ensure overwriting rules for global verdict: pass can't overwrite inconc. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -391,7 +391,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: fail can overwrite inconc. >
+<TC - 2401_009 Ensure overwriting rules for global verdict: fail can overwrite inconc. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -447,7 +447,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: none can't overwrite fail. >
+<TC - 2401_010 Ensure overwriting rules for global verdict: none can't overwrite fail. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -503,7 +503,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: pass can't overwrite fail. >
+<TC - 2401_011 Ensure overwriting rules for global verdict: pass can't overwrite fail. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -559,7 +559,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for global verdict: inconc can't overwrite fail. >
+<TC - 2401_012 Ensure overwriting rules for global verdict: inconc can't overwrite fail. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -615,7 +615,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: inconc can overwrite none. >
+<TC - 2401_002 Ensure overwriting rules for local verdict: inconc can overwrite none. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -662,7 +662,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: fail can overwrite none. >
+<TC - 2401_003 Ensure overwriting rules for local verdict: fail can overwrite none. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -709,7 +709,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: inconc can overwrite pass. >
+<TC - 2401_005 Ensure overwriting rules for local verdict: inconc can overwrite pass. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -756,7 +756,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: fail can overwrite pass. >
+<TC - 2401_006 Ensure overwriting rules for local verdict: fail can overwrite pass. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -803,7 +803,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: none can't overwrite inconc. >
+<TC - 2401_007 Ensure overwriting rules for local verdict: none can't overwrite inconc. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -850,7 +850,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: pass can't overwrite inconc. >
+<TC - 2401_008 Ensure overwriting rules for local verdict: pass can't overwrite inconc. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -897,7 +897,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: fail can overwrite inconc. >
+<TC - 2401_009 Ensure overwriting rules for local verdict: fail can overwrite inconc. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -944,7 +944,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: none can't overwrite fail. >
+<TC - 2401_010 Ensure overwriting rules for local verdict: none can't overwrite fail. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -991,7 +991,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: pass can't overwrite fail. >
+<TC - 2401_011 Ensure overwriting rules for local verdict: pass can't overwrite fail. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1038,7 +1038,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure overwriting rules for local verdict: inconc can't overwrite fail. >
+<TC - 2401_012 Ensure overwriting rules for local verdict: inconc can't overwrite fail. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1085,7 +1085,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure getverdict returns the actual verdict inconc >
+<TC - 2403_002 Ensure getverdict returns the actual verdict inconc >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1132,7 +1132,7 @@ Verdict: inconc
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure getverdict returns the actual verdict fail >
+<TC - 2403_004 Ensure getverdict returns the actual verdict fail >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1183,7 +1183,7 @@ Verdict: fail
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the timeout specified with the execute statement is respected. >
+<TC - 2601_003 Ensure that the timeout specified with the execute statement is respected. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1233,7 +1233,7 @@ Dynamic test case error: Guard timer has expired. Execution of current test case
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the verdict none works correctly. >
+<TC - 2601_004 Ensure that the verdict none works correctly. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1286,7 +1286,7 @@ Verdict: pass
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the verdict inconc works correctly. >
+<TC - 2601_006 Ensure that the verdict inconc works correctly. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1339,7 +1339,7 @@ Verdict: pass
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the user error sets the verdict error correctly. >
+<TC - 2601_008 Ensure that the user error sets the verdict error correctly. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>
@@ -1380,7 +1380,7 @@ Verdict: error
 .*---------------------------------------------------------------------*
 :xmp tab=0.
 
-<TC - Ensure that the selection of test cases can be achieven based on resulting verdict types. >
+<TC - 2602_003 Ensure that the selection of test cases can be achieven based on resulting verdict types. >
 
 <COMPILE>
 <EXECUTE_PARALLEL>