diff --git a/tests/07-int-OK.asn1.-EF b/tests/07-int-OK.asn1.-EF
index 86ee7f8..2ec50fc 100644
--- a/tests/07-int-OK.asn1.-EF
+++ b/tests/07-int-OK.asn1.-EF
@@ -1,5 +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 2ab60ee..8c3eb0f 100644
--- a/tests/14-resolver-OK.asn1.-EF
+++ b/tests/14-resolver-OK.asn1.-EF
@@ -32,8 +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/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF
index 9809141..1fa4e10 100644
--- a/tests/32-sequence-of-OK.asn1.-EF
+++ b/tests/32-sequence-of-OK.asn1.-EF
@@ -1,5 +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/55-components-of-OK.asn1.-EF b/tests/55-components-of-OK.asn1.-EF
index 3251d43..b7b227f 100644
--- a/tests/55-components-of-OK.asn1.-EF
+++ b/tests/55-components-of-OK.asn1.-EF
@@ -1,5 +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/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF
index 520c6c9..73c658f 100644
--- a/tests/60-any-OK.asn1.-EF
+++ b/tests/60-any-OK.asn1.-EF
@@ -1,5 +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/74-int-enum-constraints-OK.asn1.-EFprint-constraints b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
index 45cb515..8f9cc6b 100644
--- a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
+++ b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints
@@ -1,5 +1,6 @@
 ModuleTestIntegerAndEnumeratedConstraints { iso org(3) dod(6) internet(1)
-	private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 74 }
+	private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1)
+	74 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/79-constrained-by-OK.asn1.-EF b/tests/79-constrained-by-OK.asn1.-EF
index 0a91f34..f462be0 100644
--- a/tests/79-constrained-by-OK.asn1.-EF
+++ b/tests/79-constrained-by-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 79 }
+ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 79 }
 DEFINITIONS ::=
 BEGIN
 
diff --git a/tests/82-with-comps-OK.asn1.-EF b/tests/82-with-comps-OK.asn1.-EF
index 34ea419..f4fe9aa 100644
--- a/tests/82-with-comps-OK.asn1.-EF
+++ b/tests/82-with-comps-OK.asn1.-EF
@@ -1,5 +1,5 @@
-ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 82 }
+ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4)
+	enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 82 }
 DEFINITIONS ::=
 BEGIN