diff --git a/tests/04-enum-SE.asn1.-E b/tests/04-enum-SE.asn1.-E
index 19b431c..2036bd5 100644
--- a/tests/04-enum-SE.asn1.-E
+++ b/tests/04-enum-SE.asn1.-E
@@ -1,6 +1,5 @@
-ModuleTestEnum2 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	4 }
+ModuleTestEnum2 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 4 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/07-int-OK.asn1.-EF b/tests/07-int-OK.asn1.-EF
index 3b93cd3..86ee7f8 100644
--- a/tests/07-int-OK.asn1.-EF
+++ b/tests/07-int-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestInt1 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	7 }
+ModuleTestInt1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363)
+	software(1) asn1c(5) test(1) 7 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/14-resolver-OK.asn1.-EF b/tests/14-resolver-OK.asn1.-EF
index 31793f2..2ab60ee 100644
--- a/tests/14-resolver-OK.asn1.-EF
+++ b/tests/14-resolver-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestResolver2 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	14 1 }
+ModuleTestResolver2 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 14 1 }
 DEFINITIONS ::=
 BEGIN
 
@@ -19,9 +18,8 @@
 
 END
 
-ModuleTestResolver3 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	14 2 }
+ModuleTestResolver3 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 14 2 }
 DEFINITIONS ::=
 BEGIN
 
@@ -34,9 +32,8 @@
 
 END
 
-HiddenModule {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	14 3 }
+HiddenModule { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363)
+	software(1) asn1c(5) test(1) 14 3 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/16-constraint-OK.asn1.-EF b/tests/16-constraint-OK.asn1.-EF
index 61d8122..9fae28c 100644
--- a/tests/16-constraint-OK.asn1.-EF
+++ b/tests/16-constraint-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestConstraint {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	16 }
+ModuleTestConstraint { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 16 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/19-param-OK.asn1.-EF b/tests/19-param-OK.asn1.-EF
index f2daaf3..c579212 100644
--- a/tests/19-param-OK.asn1.-EF
+++ b/tests/19-param-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestParam {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	19 }
+ModuleTestParam { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 19 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/20-constr-OK.asn1.-EF b/tests/20-constr-OK.asn1.-EF
index fe61cfe..798f756 100644
--- a/tests/20-constr-OK.asn1.-EF
+++ b/tests/20-constr-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestConstr {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	20 }
+ModuleTestConstr { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 20 }
 DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
 BEGIN
 
diff --git a/tests/21-tags-OK.asn1.-EF b/tests/21-tags-OK.asn1.-EF
index 857c581..566e6a1 100644
--- a/tests/21-tags-OK.asn1.-EF
+++ b/tests/21-tags-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestTags1 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	21 1 }
+ModuleTestTags1 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 21 1 }
 DEFINITIONS EXPLICIT TAGS ::=
 BEGIN
 
@@ -11,9 +10,8 @@
 
 END
 
-ModuleTestTags2 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	21 2 }
+ModuleTestTags2 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 21 2 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/22-tags-OK.asn1.-EF b/tests/22-tags-OK.asn1.-EF
index 50fce1e..b1a0b8c 100644
--- a/tests/22-tags-OK.asn1.-EF
+++ b/tests/22-tags-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestTags3 {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	22 }
+ModuleTestTags3 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 22 }
 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
diff --git a/tests/23-bits-OK.asn1.-EF b/tests/23-bits-OK.asn1.-EF
index 45ff4da..8064815 100644
--- a/tests/23-bits-OK.asn1.-EF
+++ b/tests/23-bits-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestBitString {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	23 }
+ModuleTestBitString { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 23 }
 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
diff --git a/tests/24-sequence-OK.asn1.-EF b/tests/24-sequence-OK.asn1.-EF
index e45e04a..ecdc4b0 100644
--- a/tests/24-sequence-OK.asn1.-EF
+++ b/tests/24-sequence-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestSequence {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	24 }
+ModuleTestSequence { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 24 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/31-set-of-OK.asn1.-EF b/tests/31-set-of-OK.asn1.-EF
index 2efaccc..f97ce2a 100644
--- a/tests/31-set-of-OK.asn1.-EF
+++ b/tests/31-set-of-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestSetOfSimple {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	31 }
+ModuleTestSetOfSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 31 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF
index 3697ef1..9809141 100644
--- a/tests/32-sequence-of-OK.asn1.-EF
+++ b/tests/32-sequence-of-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestSequenceSimple {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	32 }
+ModuleTestSequenceSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 32 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/34-class-OK.asn1.-EF b/tests/34-class-OK.asn1.-EF
index 52ba867..d0e379f 100644
--- a/tests/34-class-OK.asn1.-EF
+++ b/tests/34-class-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestClassSimple {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	34 }
+ModuleTestClassSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 34 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/37-indirect-choice-OK.asn1.-EF b/tests/37-indirect-choice-OK.asn1.-EF
index 4f8c80b..8966815 100644
--- a/tests/37-indirect-choice-OK.asn1.-EF
+++ b/tests/37-indirect-choice-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestIndirectChoiceFine {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	37 }
+ModuleTestIndirectChoiceFine { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 37 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/42-real-life-OK.asn1.-EF b/tests/42-real-life-OK.asn1.-EF
index 6b5249d..0543ee3 100644
--- a/tests/42-real-life-OK.asn1.-EF
+++ b/tests/42-real-life-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleLAPStorage {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	42 }
+ModuleLAPStorage { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 42 }
 DEFINITIONS EXTENSIBILITY IMPLIED ::=
 BEGIN
 
diff --git a/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt b/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt
index 99dcd60..994a890 100644
--- a/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt
+++ b/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt
@@ -1,6 +1,5 @@
-ModuleKnownExternType {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	45 }
+ModuleKnownExternType { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 45 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/49-real-life-OK.asn1.-E b/tests/49-real-life-OK.asn1.-E
index e3d9d35..7167768 100644
--- a/tests/49-real-life-OK.asn1.-E
+++ b/tests/49-real-life-OK.asn1.-E
@@ -1,6 +1,5 @@
-ModuleSetChoiceExtensibility {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	49 }
+ModuleSetChoiceExtensibility { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 49 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/50-constraint-OK.asn1.-EFprint-constraints b/tests/50-constraint-OK.asn1.-EFprint-constraints
index b1b6e0e..a3adae0 100644
--- a/tests/50-constraint-OK.asn1.-EFprint-constraints
+++ b/tests/50-constraint-OK.asn1.-EFprint-constraints
Binary files differ
diff --git a/tests/55-components-of-OK.asn1.-EF b/tests/55-components-of-OK.asn1.-EF
index 1ace859..3251d43 100644
--- a/tests/55-components-of-OK.asn1.-EF
+++ b/tests/55-components-of-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestComponentsOf {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	55 }
+ModuleTestComponentsOf { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 55 }
 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
diff --git a/tests/58-param-OK.asn1.-EF b/tests/58-param-OK.asn1.-EF
index 168b057..c07b79d 100644
--- a/tests/58-param-OK.asn1.-EF
+++ b/tests/58-param-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestParam {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	58 }
+ModuleTestParam { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 58 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF
index 064a0b9..520c6c9 100644
--- a/tests/60-any-OK.asn1.-EF
+++ b/tests/60-any-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestANY {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	60 }
+ModuleTestANY { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363)
+	software(1) asn1c(5) test(1) 60 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/62-any-OK.asn1.-EF b/tests/62-any-OK.asn1.-EF
index a7917fc..0316412 100644
--- a/tests/62-any-OK.asn1.-EF
+++ b/tests/62-any-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestANYSyntax {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	62 }
+ModuleTestANYSyntax { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 62 }
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
 
diff --git a/tests/70-xer-test-OK.asn1.-EF b/tests/70-xer-test-OK.asn1.-EF
index e40e679..ecc2309 100644
--- a/tests/70-xer-test-OK.asn1.-EF
+++ b/tests/70-xer-test-OK.asn1.-EF
@@ -1,6 +1,5 @@
-ModuleTestXERDecoding {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	70 }
+ModuleTestXERDecoding { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 70 }
 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
diff --git a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
index 1776279..45cb515 100644
--- a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
+++ b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
@@ -1,6 +1,5 @@
-ModuleTestIntegerAndEnumeratedConstraints {iso org(3) dod(6) internet(1) private(4)
-	enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
-	74 }
+ModuleTestIntegerAndEnumeratedConstraints { iso org(3) dod(6) internet(1)
+	private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 74 }
 DEFINITIONS ::=
 BEGIN