diff --git a/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P b/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P
index b522fe2..67ab3fd 100644
--- a/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P
+++ b/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.-P
@@ -47,7 +47,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
diff --git a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
index e17981f..5b965c1 100644
--- a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
+++ b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
@@ -56,7 +56,7 @@
 	
 	if((size >= 1)) {
 		/* Perform validation of the inner elements */
-		return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+		return td->check_constraints(td, sptr, ctfailcb, app_key);
 	} else {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: constraint failed (%s:%d)",
@@ -405,7 +405,7 @@
 	
 	if((size >= 1)) {
 		/* Perform validation of the inner elements */
-		return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+		return td->check_constraints(td, sptr, ctfailcb, app_key);
 	} else {
 		ASN__CTFAIL(app_key, td, sptr,
 			"%s: constraint failed (%s:%d)",
diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P
index 2767118..8339f07 100644
--- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P
+++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-P
@@ -86,7 +86,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types
index 85146a2..eae562d 100644
--- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types
+++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pfwide-types
@@ -88,7 +88,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER
index c6bdd60..120c849 100644
--- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER
+++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.-Pgen-PER
@@ -90,7 +90,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
diff --git a/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE b/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE
index ba327b8..e24c261 100644
--- a/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE
+++ b/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE
@@ -37,7 +37,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
@@ -106,7 +106,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
@@ -175,7 +175,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
@@ -244,7 +244,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*
@@ -313,7 +313,7 @@
 	}
 	
 	/* Replace with underlying type checker */
-	return td->op->check_constraints(td, sptr, ctfailcb, app_key);
+	return td->check_constraints(td, sptr, ctfailcb, app_key);
 }
 
 /*