diff --git a/tests/16-constraint-OK.asn1 b/tests/16-constraint-OK.asn1
index 50ee2e2c6ed9bd0ae58aa20ad4161622a8aa5189..00ade3791a5bffd5516b32125b16237189b09a2b 100644
--- a/tests/16-constraint-OK.asn1
+++ b/tests/16-constraint-OK.asn1
@@ -3,22 +3,34 @@
 
 -- iso.org.dod.internet.private.enterprise (1.3.6.1.4.1)
 -- .spelio.software.asn1c.test (9363.1.5.1)
--- .16
+-- .16 1
+-- .16 2
 
-ModuleTestConstraint
+ModuleTestConstraint1
 	{ iso org(3) dod(6) internet(1) private(4) enterprise(1)
-		spelio(9363) software(1) asn1c(5) test(1) 16 }
+		spelio(9363) software(1) asn1c(5) test(1) 16 1 }
 	DEFINITIONS ::=
 BEGIN
+	IMPORTS Type1 FROM ModuleTestConstraint2;
 
 	-- external reference
 	Type0 ::= IA5String (Type6)
+	Type6 ::= IA5String (Type1)
+END
+
+ModuleTestConstraint2
+	{ iso org(3) dod(6) internet(1) private(4) enterprise(1)
+		spelio(9363) software(1) asn1c(5) test(1) 16 2 }
+	DEFINITIONS ::=
+BEGIN
+	EXPORTS Type1;
+
+	-- external reference
 	Type1 ::= IA5String (SIZE(1..ten,...))(FROM("a".."z"|"#",...))
 	Type2 ::= IA5String (SIZE (MIN..4)|FROM ("abc"))
 	Type3 ::= BMPString (SIZE(1))
 	Type4 ::= INTEGER (1..MAX)
 	Type5 ::= BOOLEAN (TRUE|FALSE)
-	Type6 ::= IA5String (Type1)
 
 	ten INTEGER ::= 10
 
diff --git a/tests/16-constraint-OK.asn1.-EF b/tests/16-constraint-OK.asn1.-EF
index 305fc3e65b88a3846a95e299127537b8edcf7160..a1f8e851b48e6047d0e0f68f8ca44bb40a508397 100644
--- a/tests/16-constraint-OK.asn1.-EF
+++ b/tests/16-constraint-OK.asn1.-EF
@@ -1,10 +1,19 @@
-ModuleTestConstraint { iso org(3) dod(6) internet(1) private(4) enterprise(1)
-	spelio(9363) software(1) asn1c(5) test(1) 16 }
+ModuleTestConstraint1 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 16 1 }
 DEFINITIONS ::=
 BEGIN
 
 Type0 ::= IA5String (((SIZE(1..10))(FROM("a".."z" | "#"))))
 
+Type6 ::= IA5String ((SIZE(1..10))(FROM("a".."z" | "#")))
+
+END
+
+ModuleTestConstraint2 { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 16 2 }
+DEFINITIONS ::=
+BEGIN
+
 Type1 ::= IA5String (SIZE(1..10,...))(FROM("a".."z" | "#",...))
 
 Type2 ::= IA5String (SIZE(MIN..4) | FROM("abc"))
@@ -15,8 +24,6 @@ Type4 ::= INTEGER (1..MAX)
 
 Type5 ::= BOOLEAN (TRUE | FALSE)
 
-Type6 ::= IA5String ((SIZE(1..10))(FROM("a".."z" | "#")))
-
 ten INTEGER ::= 10
 
 v1 Type1 ::= "#value with ""double quotes"""
diff --git a/tests/16-constraint-OK.asn1.-EFprint-constraints b/tests/16-constraint-OK.asn1.-EFprint-constraints
index f5f0ddfb79724d21ed342d8ce7615340896a17be..3806e1959d72a5e8d3f028be0293a99a5ed64972 100644
Binary files a/tests/16-constraint-OK.asn1.-EFprint-constraints and b/tests/16-constraint-OK.asn1.-EFprint-constraints differ