diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P
index e28455a..7728121 100644
--- a/tests/31-set-of-OK.asn1.-P
+++ b/tests/31-set-of-OK.asn1.-P
@@ -48,6 +48,9 @@
 	asn1_DEF_Forest_tags,
 	sizeof(asn1_DEF_Forest_tags)
 		/sizeof(asn1_DEF_Forest_tags[0]), /* 1 */
+	asn1_DEF_Forest_tags,	/* Same as above */
+	sizeof(asn1_DEF_Forest_tags)
+		/sizeof(asn1_DEF_Forest_tags[0]), /* 1 */
 	1,	/* Whether CONSTRUCTED */
 	asn1_MBR_Forest,
 	1,	/* Single element */
@@ -119,6 +122,9 @@
 	asn1_DEF_Tree_tags,
 	sizeof(asn1_DEF_Tree_tags)
 		/sizeof(asn1_DEF_Tree_tags[0]), /* 1 */
+	asn1_DEF_Tree_tags,	/* Same as above */
+	sizeof(asn1_DEF_Tree_tags)
+		/sizeof(asn1_DEF_Tree_tags[0]), /* 1 */
 	1,	/* Whether CONSTRUCTED */
 	asn1_MBR_Tree,
 	2,	/* Elements count */
@@ -193,7 +199,8 @@
 		},
 };
 static ber_tlv_tag_t asn1_DEF_trees_tags[] = {
-	(ASN_TAG_CLASS_CONTEXT | (0 << 2))
+	(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
 static asn1_SET_OF_specifics_t asn1_DEF_trees_specs = {
 	sizeof(struct trees),
@@ -210,7 +217,10 @@
 	0,	/* Use generic outmost tag fetcher */
 	asn1_DEF_trees_tags,
 	sizeof(asn1_DEF_trees_tags)
-		/sizeof(asn1_DEF_trees_tags[0]), /* 1 */
+		/sizeof(asn1_DEF_trees_tags[0]) - 1, /* 1 */
+	asn1_DEF_trees_tags,	/* Same as above */
+	sizeof(asn1_DEF_trees_tags)
+		/sizeof(asn1_DEF_trees_tags[0]), /* 2 */
 	1,	/* Whether CONSTRUCTED */
 	asn1_MBR_trees,
 	1,	/* Single element */
@@ -252,6 +262,9 @@
 	asn1_DEF_anything_member_tags,
 	sizeof(asn1_DEF_anything_member_tags)
 		/sizeof(asn1_DEF_anything_member_tags[0]), /* 1 */
+	asn1_DEF_anything_member_tags,	/* Same as above */
+	sizeof(asn1_DEF_anything_member_tags)
+		/sizeof(asn1_DEF_anything_member_tags[0]), /* 1 */
 	1,	/* Whether CONSTRUCTED */
 	asn1_MBR_anything_member,
 	1,	/* Elements count */
@@ -268,7 +281,8 @@
 		},
 };
 static ber_tlv_tag_t asn1_DEF_anything_tags[] = {
-	(ASN_TAG_CLASS_CONTEXT | (1 << 2))
+	(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
 };
 static asn1_SET_OF_specifics_t asn1_DEF_anything_specs = {
 	sizeof(struct anything),
@@ -285,7 +299,10 @@
 	0,	/* Use generic outmost tag fetcher */
 	asn1_DEF_anything_tags,
 	sizeof(asn1_DEF_anything_tags)
-		/sizeof(asn1_DEF_anything_tags[0]), /* 1 */
+		/sizeof(asn1_DEF_anything_tags[0]) - 1, /* 1 */
+	asn1_DEF_anything_tags,	/* Same as above */
+	sizeof(asn1_DEF_anything_tags)
+		/sizeof(asn1_DEF_anything_tags[0]), /* 2 */
 	1,	/* Whether CONSTRUCTED */
 	asn1_MBR_anything,
 	1,	/* Single element */
@@ -338,6 +355,9 @@
 	asn1_DEF_Stuff_tags,
 	sizeof(asn1_DEF_Stuff_tags)
 		/sizeof(asn1_DEF_Stuff_tags[0]), /* 1 */
+	asn1_DEF_Stuff_tags,	/* Same as above */
+	sizeof(asn1_DEF_Stuff_tags)
+		/sizeof(asn1_DEF_Stuff_tags[0]), /* 1 */
 	1,	/* Whether CONSTRUCTED */
 	asn1_MBR_Stuff,
 	2,	/* Elements count */