diff --git a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P
index d05c23d..495570c 100644
--- a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P
+++ b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P
@@ -77,7 +77,7 @@
 		/* Nothing is here. See below */
 	}
 	
-	return td->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
 }
 
 static asn_type_selector_result_t
@@ -119,7 +119,7 @@
 		/* Nothing is here. See below */
 	}
 	
-	return td->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->encoding_constraints.general_constraints(td, sptr, ctfailcb, app_key);
 }
 
 
@@ -131,9 +131,7 @@
 		.tag_mode = 0,
 		.type = &asn_DEF_PrimitiveMessage,
 		.type_selector = 0,
-		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.oer_constraints = 0,	/* OER is not compiled, use -gen-OER */
-		.per_constraints = 0,	/* PER is not compiled, use -gen-PER */
+		{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
 		.default_value = 0,
 		.name = "PrimitiveMessage"
 		},
@@ -142,9 +140,7 @@
 		.tag_mode = 0,
 		.type = &asn_DEF_ComplexMessage,
 		.type_selector = 0,
-		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.oer_constraints = 0,	/* OER is not compiled, use -gen-OER */
-		.per_constraints = 0,	/* PER is not compiled, use -gen-PER */
+		{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
 		.default_value = 0,
 		.name = "ComplexMessage"
 		},
@@ -168,13 +164,11 @@
 	"value",
 	"value",
 	&asn_OP_OPEN_TYPE,
-	OPEN_TYPE_constraint,
 	0,	/* No effective tags (pointer) */
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	0,	/* No OER visible constraints */
-	0,	/* No PER visible constraints */
+	{ 0, 0, OPEN_TYPE_constraint },
 	asn_MBR_value_3,
 	2,	/* Elements count */
 	&asn_SPC_value_specs_3	/* Additional specs */
@@ -186,9 +180,7 @@
 		.tag_mode = 0,
 		.type = &asn_DEF_NativeInteger,
 		.type_selector = 0,
-		.memb_constraints = memb_ident_constraint_1,
-		.oer_constraints = 0,	/* OER is not compiled, use -gen-OER */
-		.per_constraints = 0,	/* PER is not compiled, use -gen-PER */
+		{ .oer_constraints = 0, .per_constraints = 0, .general_constraints =  memb_ident_constraint_1 },
 		.default_value = 0,
 		.name = "ident"
 		},
@@ -197,9 +189,7 @@
 		.tag_mode = 0,
 		.type = &asn_DEF_value_3,
 		.type_selector = select_value_type,
-		.memb_constraints = memb_value_constraint_1,
-		.oer_constraints = 0,	/* OER is not compiled, use -gen-OER */
-		.per_constraints = 0,	/* PER is not compiled, use -gen-PER */
+		{ .oer_constraints = 0, .per_constraints = 0, .general_constraints =  memb_value_constraint_1 },
 		.default_value = 0,
 		.name = "value"
 		},
@@ -223,15 +213,13 @@
 	"Frame",
 	"Frame",
 	&asn_OP_SEQUENCE,
-	SEQUENCE_constraint,
 	asn_DEF_Frame_tags_1,
 	sizeof(asn_DEF_Frame_tags_1)
 		/sizeof(asn_DEF_Frame_tags_1[0]), /* 1 */
 	asn_DEF_Frame_tags_1,	/* Same as above */
 	sizeof(asn_DEF_Frame_tags_1)
 		/sizeof(asn_DEF_Frame_tags_1[0]), /* 1 */
-	0,	/* No OER visible constraints */
-	0,	/* No PER visible constraints */
+	{ 0, 0, SEQUENCE_constraint },
 	asn_MBR_Frame_1,
 	2,	/* Elements count */
 	&asn_SPC_Frame_specs_1	/* Additional specs */
@@ -273,15 +261,13 @@
 	"PrimitiveMessage",
 	"PrimitiveMessage",
 	&asn_OP_SEQUENCE,
-	SEQUENCE_constraint,
 	asn_DEF_PrimitiveMessage_tags_1,
 	sizeof(asn_DEF_PrimitiveMessage_tags_1)
 		/sizeof(asn_DEF_PrimitiveMessage_tags_1[0]), /* 1 */
 	asn_DEF_PrimitiveMessage_tags_1,	/* Same as above */
 	sizeof(asn_DEF_PrimitiveMessage_tags_1)
 		/sizeof(asn_DEF_PrimitiveMessage_tags_1[0]), /* 1 */
-	0,	/* No OER visible constraints */
-	0,	/* No PER visible constraints */
+	{ 0, 0, SEQUENCE_constraint },
 	0, 0,	/* No members */
 	&asn_SPC_PrimitiveMessage_specs_1	/* Additional specs */
 };
@@ -322,15 +308,13 @@
 	"ComplexMessage",
 	"ComplexMessage",
 	&asn_OP_SEQUENCE,
-	SEQUENCE_constraint,
 	asn_DEF_ComplexMessage_tags_1,
 	sizeof(asn_DEF_ComplexMessage_tags_1)
 		/sizeof(asn_DEF_ComplexMessage_tags_1[0]), /* 1 */
 	asn_DEF_ComplexMessage_tags_1,	/* Same as above */
 	sizeof(asn_DEF_ComplexMessage_tags_1)
 		/sizeof(asn_DEF_ComplexMessage_tags_1[0]), /* 1 */
-	0,	/* No OER visible constraints */
-	0,	/* No PER visible constraints */
+	{ 0, 0, SEQUENCE_constraint },
 	0, 0,	/* No members */
 	&asn_SPC_ComplexMessage_specs_1	/* Additional specs */
 };