diff --git a/tests/tests-randomized/bundles/00-NULL-bundle.txt b/tests/tests-randomized/bundles/00-NULL-bundle.txt
new file mode 100644
index 0000000..7951def
--- /dev/null
+++ b/tests/tests-randomized/bundles/00-NULL-bundle.txt
@@ -0,0 +1 @@
+NULL
diff --git a/tests/tests-randomized/bundles/15-CHOICE-bundle.txt b/tests/tests-randomized/bundles/15-CHOICE-bundle.txt
index 55b8f45..f7d493a 100644
--- a/tests/tests-randomized/bundles/15-CHOICE-bundle.txt
+++ b/tests/tests-randomized/bundles/15-CHOICE-bundle.txt
@@ -1,11 +1,20 @@
 CHOICE { null NULL }
 CHOICE { null NULL, ... }
 CHOICE { one NULL, two [2] NULL }
+CHOICE { one [1] NULL, two [2] NULL }
+CHOICE { one [2] NULL, two [1] NULL }
+CHOICE { one [1] NULL, two [3] NULL }
+CHOICE { one [3] NULL, two [1] NULL }
+CHOICE { one [3] NULL, two [1] NULL, three [2] NULL }
+CHOICE { one [4] NULL, two [3] NULL, three [1] NULL, four [2] NULL }
+CHOICE { one [5] NULL, two [4] NULL, ..., three [3] NULL, four [2] NULL }
+CHOICE { null NULL, ..., one [5] NULL, two [4] NULL, three [3] NULL, four [2] NULL }
 CHOICE { one NULL, two [2] NULL, ... }
 CHOICE { one NULL, ..., two [2] NULL }
 CHOICE { one NULL, two [2] NULL, ..., three [3] NULL }
 CHOICE { one NULL, ..., two [2] NULL, three [3] NULL }
 CHOICE { one BOOLEAN, ..., two [2] BOOLEAN, three [3] BOOLEAN }
 CHOICE { one BOOLEAN, two BIT STRING (SIZE(1..3)) }
-CHOICE { ..., one BOOLEAN, two BIT STRING (SIZE(1..3)) }
+CHOICE { null NULL, ..., one BOOLEAN, two BIT STRING (SIZE(1..3)) }
 CHOICE { one NULL, two BOOLEAN, three BIT STRING (SIZE(1..3)) }
+CHOICE { null NULL, ..., one NULL, two BOOLEAN, three BIT STRING (SIZE(1..3)) }