diff --git a/test/circuits/utils/claimUtils_getClaimMerklizeRoot.circom b/test/circuits/utils/claimUtils_getClaimMerklizeRoot.circom
index 744b3c9..8ed0036 100644
--- a/test/circuits/utils/claimUtils_getClaimMerklizeRoot.circom
+++ b/test/circuits/utils/claimUtils_getClaimMerklizeRoot.circom
@@ -9,11 +9,11 @@ template wrappedGetClaimMerklizeRoot() {
     signal output flag;
     signal output out;
 
-    component getClaimMerklizeRoot = GetClaimMerklizeRoot();
-    getClaimMerklizeRoot.claim <== claim;
-    getClaimMerklizeRoot.claimFlags <== AddBinaryArrayTag()(claimFlags);
-    flag <== getClaimMerklizeRoot.flag;
-    out <== getClaimMerklizeRoot.out;
+    component check = getClaimMerklizeRoot();
+    check.claim <== claim;
+    check.claimFlags <== AddBinaryArrayTag(32)(claimFlags);
+    flag <== check.flag;
+    out <== check.out;
 }
 
 component main = wrappedGetClaimMerklizeRoot();
diff --git a/test/circuits/utils/utils_getSubjectLocation.circom b/test/circuits/utils/utils_getSubjectLocation.circom
index 8b4f371..4d39620 100644
--- a/test/circuits/utils/utils_getSubjectLocation.circom
+++ b/test/circuits/utils/utils_getSubjectLocation.circom
@@ -1,5 +1,15 @@
 pragma circom 2.1.1;
 
 include "../../../circuits/lib/utils/claimUtils.circom";
+include "../../../circuits/lib/utils/tags-managing.circom";
 
-component main = getSubjectLocation();
+template wrappedGetSubjectLocation() {
+    signal input claimFlags[32];
+    signal output out;
+
+    component check = getSubjectLocation();
+    check.claimFlags <== AddBinaryArrayTag(32)(claimFlags);
+    out <== check.out;
+}
+
+component main = wrappedGetSubjectLocation();
diff --git a/test/circuits/utils/utils_isExpirable.circom b/test/circuits/utils/utils_isExpirable.circom
index 6b55108..d65e85c 100644
--- a/test/circuits/utils/utils_isExpirable.circom
+++ b/test/circuits/utils/utils_isExpirable.circom
@@ -1,5 +1,15 @@
 pragma circom 2.1.1;
 
 include "../../../circuits/lib/utils/claimUtils.circom";
+include "../../../circuits/lib/utils/tags-managing.circom";
 
-component main = isExpirable();
+template wrappedIsExpirable() {
+    signal input claimFlags[32];
+    signal output out;
+
+    component check = isExpirable();
+    check.claimFlags <== AddBinaryArrayTag(32)(claimFlags);
+    out <== check.out;
+}
+
+component main = wrappedIsExpirable();
diff --git a/test/circuits/utils/utils_isUpdatable.circom b/test/circuits/utils/utils_isUpdatable.circom
index 1d04f3d..28b2ca1 100644
--- a/test/circuits/utils/utils_isUpdatable.circom
+++ b/test/circuits/utils/utils_isUpdatable.circom
@@ -1,5 +1,15 @@
 pragma circom 2.1.1;
 
 include "../../../circuits/lib/utils/claimUtils.circom";
+include "../../../circuits/lib/utils/tags-managing.circom";
 
-component main = isUpdatable();
+template wrappedIsUpdatable() {
+    signal input claimFlags[32];
+    signal output out;
+
+    component check = isUpdatable();
+    check.claimFlags <== AddBinaryArrayTag(32)(claimFlags);
+    out <== check.out;
+}
+
+component main = wrappedIsUpdatable();
diff --git a/test/circuits/utils/utils_verifyExpirationTime.circom b/test/circuits/utils/utils_verifyExpirationTime.circom
index 621cf4f..1c0fbfb 100644
--- a/test/circuits/utils/utils_verifyExpirationTime.circom
+++ b/test/circuits/utils/utils_verifyExpirationTime.circom
@@ -1,5 +1,17 @@
 pragma circom 2.1.1;
 
 include "../../../circuits/lib/utils/claimUtils.circom";
+include "../../../circuits/lib/utils/tags-managing.circom";
 
-component main = verifyExpirationTime();
+template wrappedVerifyExpirationTime() {
+    signal input expirationFlag; // claimFlags[3] (expiration flag) is set
+    signal input claim[8];
+    signal input timestamp;
+
+    component check = verifyExpirationTime();
+    check.expirationFlag <== AddBinaryTag()(expirationFlag);
+    check.claim <== claim;
+    check.timestamp <== timestamp;
+}
+
+component main = wrappedVerifyExpirationTime();