diff --git a/.gitignore b/.gitignore
index 37195ed..7cae081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,8 @@ circuits/ecdsa/tmp/*
 !tests/tests/inputs/validInput.json
 helpers/blacklist_generation/__pycache__
 package-lock.json
+test/passports/*
+test/inputs/*
+test/registerIdentityTest.ts
+test/circuits/*
+!test/passports/readme.txt
\ No newline at end of file
diff --git a/.mocharc.json b/.mocharc.json
index d8079d9..32c989b 100644
--- a/.mocharc.json
+++ b/.mocharc.json
@@ -1,5 +1,6 @@
 {
   "require": "hardhat/register",
-  "timeout": 100000,
-  "_": ["test/**/*.ts"]
+  "timeout": 10000000,
+  "_": ["test/**/*.ts"],
+  "ignore": "test/generateRegisterIdentityTest.js"
 }
diff --git a/circuits/dateUtilities/dateComparison.circom b/circuits/dateUtilities/dateComparison.circom
index b980f9d..460eb37 100644
--- a/circuits/dateUtilities/dateComparison.circom
+++ b/circuits/dateUtilities/dateComparison.circom
@@ -1,6 +1,6 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/comparators.circom";
+include "circomlib/circuits/comparators.circom";
 
 template DateIsLess() {
     signal input firstDay;
diff --git a/circuits/dateUtilities/dateDecoder.circom b/circuits/dateUtilities/dateDecoder.circom
index f641e6d..4b369d4 100644
--- a/circuits/dateUtilities/dateDecoder.circom
+++ b/circuits/dateUtilities/dateDecoder.circom
@@ -1,6 +1,6 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "circomlib/circuits/bitify.circom";
 include "./dateEncoder.circom";
 
 template DateDecoder() {
diff --git a/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381Func.circom b/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381Func.circom
index 7c82312..78a3a9c 100644
--- a/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381Func.circom
+++ b/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381Func.circom
@@ -22,18 +22,22 @@ function get_BLS12_381_prime(CHUNK_SIZE, CHUNK_NUMBER){
 
 // half of 8th ROOTS of unity, up to negation
 function get_roots_of_unity(CHUNK_SIZE, CHUNK_NUMBER){
-    assert( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 );
+
+    assert(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7);
+
     var ROOTS[4][2][150];
+
     for(var idx=0; idx<CHUNK_NUMBER; idx++){
         ROOTS[0][0][idx] = 0;
         ROOTS[0][1][idx] = 0;
         ROOTS[1][0][idx] = 0;
         ROOTS[1][1][idx] = 0;
     }
+
     ROOTS[0][0][0] = 1; // ROOTS[0] = 1
     ROOTS[1][1][0] = 1; // ROOTS[1] = sqrt(-1)
 
-    if( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 ){
+    if(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7){
         ROOTS[2][0] = [4649817190157321,
                     14178090100713872,
                     25898210532243870,
@@ -67,11 +71,11 @@ function get_roots_of_unity(CHUNK_SIZE, CHUNK_NUMBER){
 }
 
 function get_etas(CHUNK_SIZE, CHUNK_NUMBER){
-    assert( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 );
+    assert(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7);
     var p[150] = get_BLS12_381_prime(CHUNK_SIZE, CHUNK_NUMBER);
     var ETAS[4][2][150];
      
-    if( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 ){
+    if(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7){
         ETAS[0][0] = [15111404105178256,
                      12179658998385743,
                      23072200951145993,
@@ -111,8 +115,11 @@ function get_etas(CHUNK_SIZE, CHUNK_NUMBER){
 // coefficients for the 3-isogeny map from E2' to E2 
 // taken from E.3 of https://cfrg.github.io/draft-irtf-cfrg-hash-to-curve/draft-irtf-cfrg-hash-to-curve.html#appendix-E.3
 function get_iso3_coeffs(CHUNK_SIZE, CHUNK_NUMBER){
+
     assert( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 );
+
     var COEFFS[4][4][2][150];
+
     if( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 ){
         COEFFS[0][0][0] = [15950248680265686, 32024958503631044, 4244301805875352, 29783714120969249, 35703698803053471, 29228779030399226, 406640325010316];
         COEFFS[0][0][1] = [15950248680265686, 32024958503631044, 4244301805875352, 29783714120969249, 35703698803053471, 29228779030399226, 406640325010316];
@@ -151,7 +158,9 @@ function get_iso3_coeffs(CHUNK_SIZE, CHUNK_NUMBER){
 }
 
 function get_generator_G1(CHUNK_SIZE, CHUNK_NUMBER){
-    assert( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 );
+
+    assert(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7);
+
     var G1[2][150];
 
     G1[0] = [16589478066046651,
@@ -173,7 +182,9 @@ function get_generator_G1(CHUNK_SIZE, CHUNK_NUMBER){
 }
 
 function get_generator_G2(CHUNK_SIZE, CHUNK_NUMBER){
-    assert( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 );
+
+    assert(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7);
+
     var G2[2][2][150];
 
     G2[0][0] = [95420233661880, 1773856045391785, 5044075188989616, 23082975677810779, 22805092780977487, 23121359448368568, 161253150172098];
@@ -185,12 +196,15 @@ function get_generator_G2(CHUNK_SIZE, CHUNK_NUMBER){
 }
 
 function get_Fp12_frobenius(CHUNK_SIZE, CHUNK_NUMBER){
+
     assert( (CHUNK_SIZE==96 && CHUNK_NUMBER==4) || (CHUNK_SIZE==77 && CHUNK_NUMBER==5) || (CHUNK_SIZE==55 && CHUNK_NUMBER==7) );
-    var COEFF[12][6][2][20]; // 
+
+    var COEFF[12][6][2][20];  
+
     // COEFF[j][i] represents an element in F_q^2
     // F_q^12 = F_q^2[w] / (w^6 - (u+1)) 
     // Apply Frobenius j times to w^i: (w^i)^(q^j) = COEFF[j][i] * w^i 
-    if( CHUNK_SIZE==96 && CHUNK_NUMBER==4 ){
+    if( CHUNK_SIZE == 96 && CHUNK_NUMBER == 4){
         COEFF[0][0][0][0] = 1;
         COEFF[0][0][0][1] = 0;
         COEFF[0][0][0][2] = 0;
@@ -2929,5 +2943,6 @@ function get_Fp12_frobenius(CHUNK_SIZE, CHUNK_NUMBER){
         COEFF[11][5][1][5] = 1778035881690211;
         COEFF[11][5][1][6] = 69335985795384;
     }
+    
     return COEFF;
 }
diff --git a/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381HashToG2.circom b/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381HashToG2.circom
index bab99b8..35fd700 100644
--- a/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381HashToG2.circom
+++ b/circuits/ecdsa/brainpoolP256r1/circomPairing/bls12_381HashToG2.circom
@@ -43,61 +43,82 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
     var LOGK = log_ceil(CHUNK_NUMBER);
     // in = t, compute t^2, t^3
     component tSQ = SignedFp2MultiplyNoCarryCompress(CHUNK_SIZE, CHUNK_NUMBER, P, CHUNK_SIZE, 3*CHUNK_SIZE + 2*LOGK + 1 );
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        tSQ.a[i][idx] <== in[i][idx];
-        tSQ.b[i][idx] <== in[i][idx];
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            tSQ.a[i][idx] <== in[i][idx];
+            tSQ.b[i][idx] <== in[i][idx];
+        }
     }
     // compute XI * t^2 
     component xiTSq = SignedFp2CarryModP(CHUNK_SIZE, CHUNK_NUMBER, 3*CHUNK_SIZE + 2*LOGK + 3, P);
-    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+
+    for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         xiTSq.in[0][idx] <== XI[0] * tSQ.out[0][idx] - XI[1] * tSQ.out[1][idx];
         xiTSq.in[1][idx] <== XI[0] * tSQ.out[1][idx] + XI[1] * tSQ.out[0][idx];
     }
 
     // XI^2 * t^4
     component xi2T4 = SignedFp2MultiplyNoCarryCompress(CHUNK_SIZE, CHUNK_NUMBER, P, CHUNK_SIZE, 3*CHUNK_SIZE + 2*LOGK + 1); 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        xi2T4.a[i][idx] <== xiTSq.out[i][idx];
-        xi2T4.b[i][idx] <== xiTSq.out[i][idx];
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            xi2T4.a[i][idx] <== xiTSq.out[i][idx];
+            xi2T4.b[i][idx] <== xiTSq.out[i][idx];
+        }
     }
     // XI^2 * t^4 + XI * t^2
     var NUM_DEN_COMMON[2][CHUNK_NUMBER];
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        NUM_DEN_COMMON[i][idx] = xi2T4.out[i][idx] + xiTSq.out[i][idx];
-    
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            NUM_DEN_COMMON[i][idx] = xi2T4.out[i][idx] + xiTSq.out[i][idx];
+        }
+    }
     // x0(t) = B (XI^2 * t^4 + XI * t^2 + 1) / (-A * (XI^2 * t^4 + XI * t^2)) 
     component x0Den = SignedFp2CarryModP(CHUNK_SIZE, CHUNK_NUMBER, 3*CHUNK_SIZE + 2*LOGK + 2 + 9, P);
-    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+
+    for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         x0Den.in[0][idx] <== -A[0] * NUM_DEN_COMMON[0][idx] + A[1] * NUM_DEN_COMMON[1][idx];
         x0Den.in[1][idx] <== -A[0] * NUM_DEN_COMMON[1][idx] - A[1] * NUM_DEN_COMMON[0][idx];
     }
 
     // if x0Den = 0, replace with X1_DEN = A * XI; this way x1(t) = x0Num / X1_DEN = B / (XI * A)
     // X1_DEN = A * XI = 240 - 480 i 
-    assert( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 );
+    assert(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7);
+
     var X1_DEN[2][CHUNK_NUMBER];
-    if( CHUNK_SIZE == 55 && CHUNK_NUMBER == 7 ){
-        X1_DEN = [[240,0,0,0,0,0,0],
-                [35747322042230987,36025922209447795,1084959616957103,7925923977987733,16551456537884751,23443114579904617,1829881462546425]];
+    if(CHUNK_SIZE == 55 && CHUNK_NUMBER == 7){
+        X1_DEN = [
+            [240,0,0,0,0,0,0],
+            [35747322042230987,36025922209447795,1084959616957103,7925923977987733,16551456537884751,23443114579904617,1829881462546425]
+        ];
     }
 
     // Exception if x0Den = 0: 
     component exception = Fp2IsZero(CHUNK_SIZE, CHUNK_NUMBER, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        exception.in[i][idx] <== x0Den.out[i][idx];
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            exception.in[i][idx] <== x0Den.out[i][idx];
+        }
+    }
     //isInfinity <== exception.out; 
     
     NUM_DEN_COMMON[0][0]++;
-    component x0Num = SignedFp2CarryModP(CHUNK_SIZE, CHUNK_NUMBER, 3*CHUNK_SIZE + 2*LOGK + 2 + 11, P);
-    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    component x0Num = SignedFp2CarryModP(CHUNK_SIZE, CHUNK_NUMBER, 3 * CHUNK_SIZE + 2 * LOGK + 2 + 11, P);
+
+    for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         x0Num.in[0][idx] <== B[0] * NUM_DEN_COMMON[0][idx] - B[1] * NUM_DEN_COMMON[1][idx];
         x0Num.in[1][idx] <== B[0] * NUM_DEN_COMMON[1][idx] + B[1] * NUM_DEN_COMMON[0][idx];
     }
     // division is same cost/constraints as multiplication, so we will compute x0 and avoid using projective coordinates 
     component x0 = SignedFp2Divide(CHUNK_SIZE, CHUNK_NUMBER, CHUNK_SIZE, CHUNK_SIZE, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        x0.a[i][idx] <== x0Num.out[i][idx];
-        x0.b[i][idx] <== x0Den.out[i][idx] + exception.out * (X1_DEN[i][idx] - x0Den.out[i][idx]);
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            x0.a[i][idx] <== x0Num.out[i][idx];
+            x0.b[i][idx] <== x0Den.out[i][idx] + exception.out * (X1_DEN[i][idx] - x0Den.out[i][idx]);
+        }
     }
     
     // g(x) = x^3 + A x + B 
@@ -106,23 +127,31 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
     // x1(t) = XI * t^2 * x0(t)
     component x1 = Fp2Multiply(CHUNK_SIZE, CHUNK_NUMBER, P);
 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        gX0.in[i][idx] <== x0.out[i][idx];
-        x1.a[i][idx] <== xiTSq.out[i][idx];
-        x1.b[i][idx] <== x0.out[i][idx];
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            gX0.in[i][idx] <== x0.out[i][idx];
+            x1.a[i][idx] <== xiTSq.out[i][idx];
+            x1.b[i][idx] <== x0.out[i][idx];
+        }
     }
     
     component xi3T6 = Fp2MultiplyThree(CHUNK_SIZE, CHUNK_NUMBER, P); // shares A hidden component with xi2T4; I'll let compiler optimize that out for readability
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){ 
-        xi3T6.a[i][idx] <== xiTSq.out[i][idx];
-        xi3T6.b[i][idx] <== xiTSq.out[i][idx];
-        xi3T6.c[i][idx] <== xiTSq.out[i][idx];
+    
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){ 
+            xi3T6.a[i][idx] <== xiTSq.out[i][idx];
+            xi3T6.b[i][idx] <== xiTSq.out[i][idx];
+            xi3T6.c[i][idx] <== xiTSq.out[i][idx];
+        }
     }
     // g(x1(t)) = XI^3 * t^6 * g(x0(t)) 
     component gX1 = Fp2Multiply(CHUNK_SIZE, CHUNK_NUMBER, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){ 
-        gX1.a[i][idx] <== xi3T6.out[i][idx];
-        gX1.b[i][idx] <== gX0.out[i][idx];
+    
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){ 
+            gX1.a[i][idx] <== xi3T6.out[i][idx];
+            gX1.b[i][idx] <== gX0.out[i][idx];
+        }
     }
     /* 
     XI^3 is not A square, so one of gX0, gX1 must be A square 
@@ -143,9 +172,9 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
     
     // Precompute SQRT_CANDIDATE = gX0^{(P^2 + 7) / 16} 
     // P^2 + 7
-    var C1[150] = long_add_unequal(CHUNK_SIZE, 2*CHUNK_NUMBER, 1, prod(CHUNK_SIZE, CHUNK_NUMBER, P, P), [7]);
+    var C1[150] = long_add_unequal(CHUNK_SIZE, 2 * CHUNK_NUMBER, 1, prod(CHUNK_SIZE, CHUNK_NUMBER, P, P), [7]);
     // (P^2 + 7) // 16
-    var C2[2][150] = long_div2(CHUNK_SIZE, 1, 2*CHUNK_NUMBER-1, C1, [16]); 
+    var C2[2][150] = long_div2(CHUNK_SIZE, 1, 2 * CHUNK_NUMBER-1, C1, [16]); 
 
     assert( C2[1][0] == 0 ); // assert P^2 + 7 is divisible by 16
 
@@ -154,11 +183,17 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
     // -1 is A square in Fp2 (because P^2 - 1 is even) so we only need to check half of the 8th ROOTS of unity
     var ROOTS[4][2][150] = get_roots_of_unity(CHUNK_SIZE, CHUNK_NUMBER);
     var SQRT_WITHNESS[2][2][150];
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        SQRT_WITHNESS[i][j][idx] = 0;
+
+    for(var i = 0; i < 2; i++){
+        for(var j = 0; j < 2; j++){
+            for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+                SQRT_WITHNESS[i][j][idx] = 0;
+            }
+        }
+    }
 
     var IS_SQUARE = 0;
-    for(var i=0; i<4; i++){
+    for(var i = 0; i < 4; i++){
         var SQRT_TMP[2][150] = find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, SQRT_CANDIDATE, ROOTS[i], P); 
         if(is_equal_Fp2(CHUNK_SIZE, CHUNK_NUMBER, find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, SQRT_TMP, SQRT_TMP, P), gX0.out) == 1){
             IS_SQUARE = 1;
@@ -166,7 +201,7 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
         }
     }
     isSquare <-- IS_SQUARE;
-    isSquare * (1-isSquare) === 0; 
+    isSquare * (1 - isSquare) === 0; 
     
     var IS_SQUARE1 = 0;
     var ETAS[4][2][150] = get_etas(CHUNK_SIZE, CHUNK_NUMBER);
@@ -177,7 +212,7 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
     var T_CU[2][150] = find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, in, in, P), in, P);
     SQRT_CANDIDATE = find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, SQRT_CANDIDATE, T_CU, P);
     
-    for(var i=0; i<4; i++){
+    for(var i = 0; i < 4; i++){
         var SQRT_TMP[2][150] = find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, SQRT_CANDIDATE, ETAS[i], P); 
         if(is_equal_Fp2(CHUNK_SIZE, CHUNK_NUMBER, find_Fp2_product(CHUNK_SIZE, CHUNK_NUMBER, SQRT_TMP, SQRT_TMP, P), gX1.out) == 1){
             IS_SQUARE1 = 1;
@@ -188,17 +223,27 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
         
      
     // X = out[0] = x0 if isSquare == 1, else X = x1    
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        out[0][i][idx] <== isSquare * (x0.out[i][idx] - x1.out[i][idx]) + x1.out[i][idx];  
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            out[0][i][idx] <== isSquare * (x0.out[i][idx] - x1.out[i][idx]) + x1.out[i][idx]; 
+        } 
+    }
 
     // sgn0(t) 
     component sgn_in = Fp2Sgn0(CHUNK_SIZE, CHUNK_NUMBER, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        sgn_in.in[i][idx] <== in[i][idx];
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            sgn_in.in[i][idx] <== in[i][idx];
+        }
+    }
 
     var Y[2][150];
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        Y[i][idx] = IS_SQUARE * SQRT_WITHNESS[0][i][idx] + (1-IS_SQUARE) * SQRT_WITHNESS[1][i][idx];
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            Y[i][idx] = IS_SQUARE * SQRT_WITHNESS[0][i][idx] + (1-IS_SQUARE) * SQRT_WITHNESS[1][i][idx];
+        }
+    }
     // Y = out[1] = +- SQRT_WITHNESS; sign determined by sgn0(Y) = sgn0(t) 
     
     if(get_fp2_sgn0(CHUNK_NUMBER, Y) != sgn_in.out){
@@ -208,20 +253,27 @@ template OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER){
     
     component ySq = Fp2Multiply(CHUNK_SIZE, CHUNK_NUMBER, P);
     // Y^2 == g(X) 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        out[1][i][idx] <-- Y[i][idx];
-        ySq.a[i][idx] <== out[1][i][idx];
-        ySq.b[i][idx] <== out[1][i][idx];
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            out[1][i][idx] <-- Y[i][idx];
+            ySq.a[i][idx] <== out[1][i][idx];
+            ySq.b[i][idx] <== out[1][i][idx];
+        }   
     }
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        ySq.out[i][idx] === isSquare * (gX0.out[i][idx] - gX1.out[i][idx]) + gX1.out[i][idx]; 
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            ySq.out[i][idx] === isSquare * (gX0.out[i][idx] - gX1.out[i][idx]) + gX1.out[i][idx]; 
+        }
     }
 
     // sgn0(Y) == sgn0(t)
     component sqnY = Fp2Sgn0(CHUNK_SIZE, CHUNK_NUMBER, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-        sqnY.in[i][idx] <== out[1][i][idx];
-
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            sqnY.in[i][idx] <== out[1][i][idx];
+        }
+    }
     sqnY.out === sgn_in.out;
     
 }
@@ -256,10 +308,10 @@ template Iso3Map(CHUNK_SIZE, CHUNK_NUMBER){
 
     // x = x_num / x_den
     // y = y' * y_num / y_den
-    // x_num = sum_{i=0}^3 COEFFS[0][i] * x'^i
+    // x_num = sum_{i = 0}^3 COEFFS[0][i] * x'^i
     // x_den = x'^2 + COEFFS[1][1] * x' + COEFFS[1][0] 
-    // y_num = sum_{i=0}^3 COEFFS[2][i] * x'^i
-    // y_den = x'^3 + sum_{i=0}^2 COEFFS[3][i] * x'^i
+    // y_num = sum_{i = 0}^3 COEFFS[2][i] * x'^i
+    // y_den = x'^3 + sum_{i = 0}^2 COEFFS[3][i] * x'^i
   
     var LOGK = log_ceil(CHUNK_NUMBER); 
     component xp2NoCarry = SignedFp2MultiplyNoCarry(CHUNK_SIZE, CHUNK_NUMBER, 2*CHUNK_SIZE + LOGK + 1); 
@@ -267,46 +319,68 @@ template Iso3Map(CHUNK_SIZE, CHUNK_NUMBER){
     component xp3NoCarry = SignedFp2MultiplyNoCarryUnequal(CHUNK_SIZE, 2*CHUNK_NUMBER-1, CHUNK_NUMBER, 3*CHUNK_SIZE + 2*LOGK + 2); 
     component xp3 = SignedFp2CompressCarry(CHUNK_SIZE, CHUNK_NUMBER, 2*CHUNK_NUMBER-2, 3*CHUNK_SIZE+2*LOGK+2, P);
 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        xp2NoCarry.a[i][idx] <== in[0][i][idx];
-        xp2NoCarry.b[i][idx] <== in[0][i][idx];
-        xp3NoCarry.b[i][idx] <== in[0][i][idx];
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            xp2NoCarry.a[i][idx] <== in[0][i][idx];
+            xp2NoCarry.b[i][idx] <== in[0][i][idx];
+            xp3NoCarry.b[i][idx] <== in[0][i][idx];
+        }
+    }
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx<2*CHUNK_NUMBER-1; idx++){
+            xp3NoCarry.a[i][idx] <== xp2NoCarry.out[i][idx];
+            xp2.in[i][idx] <== xp2NoCarry.out[i][idx];
+        }
     }
-    for(var i=0; i<2; i++)for(var idx=0; idx<2*CHUNK_NUMBER-1; idx++){
-        xp3NoCarry.a[i][idx] <== xp2NoCarry.out[i][idx];
-        xp2.in[i][idx] <== xp2NoCarry.out[i][idx];
+
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx< 3 * CHUNK_NUMBER - 2; idx++){
+            xp3.in[i][idx] <== xp3NoCarry.out[i][idx]; 
+        }
     }
-    for(var i=0; i<2; i++)for(var idx=0; idx<3*CHUNK_NUMBER-2; idx++)
-        xp3.in[i][idx] <== xp3NoCarry.out[i][idx]; 
 
     signal xpPow[3][2][CHUNK_NUMBER]; 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        xpPow[0][i][idx] <== in[0][i][idx];
-        xpPow[1][i][idx] <== xp2.out[i][idx];
-        xpPow[2][i][idx] <== xp3.out[i][idx];
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            xpPow[0][i][idx] <== in[0][i][idx];
+            xpPow[1][i][idx] <== xp2.out[i][idx];
+            xpPow[2][i][idx] <== xp3.out[i][idx];
+        }
     }
      
     component COEFFS_XP[4][3]; 
     var deg[4] = [3, 1, 3, 2];
-    for(var i=0; i<4; i++)for(var j=0; j<deg[i]; j++){
-        COEFFS_XP[i][j] = SignedFp2MultiplyNoCarry(CHUNK_SIZE, CHUNK_NUMBER, 2*CHUNK_SIZE + LOGK + 1);
-        for(var l=0; l<2; l++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-            COEFFS_XP[i][j].a[l][idx] <== COEFFS[i][j+1][l][idx];
-            COEFFS_XP[i][j].b[l][idx] <== xpPow[j][l][idx];
+    for(var i = 0; i < 4; i++){
+        for(var j = 0; j < deg[i]; j++){
+            COEFFS_XP[i][j] = SignedFp2MultiplyNoCarry(CHUNK_SIZE, CHUNK_NUMBER, 2 * CHUNK_SIZE + LOGK + 1);
+            for(var l = 0; l < 2; l++){
+                for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+                    COEFFS_XP[i][j].a[l][idx] <== COEFFS[i][j + 1][l][idx];
+                    COEFFS_XP[i][j].b[l][idx] <== xpPow[j][l][idx];
+                }
+            }
         }
     }
     var x_frac[4][2][150];  
-    for(var i=0; i<4; i++){
-        for(var l=0; l<2; l++)for(var idx=0; idx<2*CHUNK_NUMBER-1; idx++){
-            if(idx<CHUNK_NUMBER)
-                x_frac[i][l][idx] = COEFFS[i][0][l][idx];
-            else
-                x_frac[i][l][idx] = 0;
+    for(var i = 0; i < 4; i++){
+        for(var l = 0; l < 2; l++){
+            for(var idx = 0; idx< 2 * CHUNK_NUMBER - 1; idx++){
+                if(idx < CHUNK_NUMBER)
+                    x_frac[i][l][idx] = COEFFS[i][0][l][idx];
+                else
+                    x_frac[i][l][idx] = 0;
+            }
+        }
+        for(var j = 0; j<deg[i]; j++){
+            for(var l = 0; l < 2; l++){
+                for(var idx = 0; idx < 2 * CHUNK_NUMBER - 1; idx++){
+                    x_frac[i][l][idx] += COEFFS_XP[i][j].out[l][idx];
+                }
+            }
         }
-        for(var j=0; j<deg[i]; j++)for(var l=0; l<2; l++)for(var idx=0; idx<2*CHUNK_NUMBER-1; idx++)
-            x_frac[i][l][idx] += COEFFS_XP[i][j].out[l][idx];
     } 
-    for(var l=0; l<2; l++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var l = 0; l < 2; l++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         x_frac[1][l][idx] += xp2.out[l][idx];
         x_frac[3][l][idx] += xp3.out[l][idx];
     }
@@ -314,14 +388,20 @@ template Iso3Map(CHUNK_SIZE, CHUNK_NUMBER){
     // carry the denominators since we need to check whether they are 0
     component den[2];
     component denIsZero[2];
-    for(var i=0; i<2; i++){
-        den[i] = SignedFp2CompressCarry(CHUNK_SIZE, CHUNK_NUMBER, CHUNK_NUMBER-1, 2*CHUNK_SIZE + LOGK + 3, P); 
-        for(var l=0; l<2; l++)for(var idx=0; idx<2*CHUNK_NUMBER-1; idx++)
-            den[i].in[l][idx] <== x_frac[2*i+1][l][idx];
+    for(var i = 0; i < 2; i++){
+        den[i] = SignedFp2CompressCarry(CHUNK_SIZE, CHUNK_NUMBER, CHUNK_NUMBER - 1, 2 * CHUNK_SIZE + LOGK + 3, P); 
+        for(var l = 0; l < 2; l++){
+            for(var idx = 0; idx < 2 * CHUNK_NUMBER - 1; idx++){
+                den[i].in[l][idx] <== x_frac[2 * i + 1][l][idx];                
+            }
+        }
 
         denIsZero[i] = Fp2IsZero(CHUNK_SIZE, CHUNK_NUMBER, P);
-        for(var l=0; l<2; l++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-            denIsZero[i].in[l][idx] <== den[i].out[l][idx];
+        for(var l = 0; l < 2; l++){
+            for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+                denIsZero[i].in[l][idx] <== den[i].out[l][idx];
+            }
+        }
     }
 
     //component exception = IsZero();
@@ -329,32 +409,40 @@ template Iso3Map(CHUNK_SIZE, CHUNK_NUMBER){
     isInfinity <== denIsZero[0].out + denIsZero[1].out - denIsZero[0].out * denIsZero[1].out; // OR gate: if either denominator is 0, output point at infinity 
 
     component num[2];
-    for(var i=0; i<2; i++){
-        num[i] = Fp2Compress(CHUNK_SIZE, CHUNK_NUMBER, CHUNK_NUMBER-1, P, 3*CHUNK_SIZE + 2*LOGK + 3); 
-        for(var l=0; l<2; l++)for(var idx=0; idx<2*CHUNK_NUMBER-1; idx++)
-            num[i].in[l][idx] <== x_frac[2*i][l][idx];
+
+    for(var i = 0; i < 2; i++){
+        num[i] = Fp2Compress(CHUNK_SIZE, CHUNK_NUMBER, CHUNK_NUMBER - 1, P, 3 * CHUNK_SIZE + 2 * LOGK + 3); 
+        for(var l = 0; l < 2; l++){
+            for(var idx = 0; idx< 2 * CHUNK_NUMBER - 1; idx++){
+                num[i].in[l][idx] <== x_frac[2 * i][l][idx];
+            }
+        }
     }
 
     component x[2];
     // num / den if den != 0, else num / 1
-    for(var i=0; i<2; i++){
-        x[i] = SignedFp2Divide(CHUNK_SIZE, CHUNK_NUMBER, 3*CHUNK_SIZE + 2*LOGK + 3, CHUNK_SIZE, P);
-        for(var l=0; l<2; l++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-            x[i].a[l][idx] <== num[i].out[l][idx];
-            if(l==0 && idx==0)
-                x[i].b[l][idx] <== isInfinity * (1 - den[i].out[l][idx]) + den[i].out[l][idx];
-            else
-                x[i].b[l][idx] <== -isInfinity * den[i].out[l][idx] + den[i].out[l][idx];
-        } 
+    for(var i = 0; i < 2; i++){
+        x[i] = SignedFp2Divide(CHUNK_SIZE, CHUNK_NUMBER, 3 * CHUNK_SIZE + 2 * LOGK + 3, CHUNK_SIZE, P);
+        for(var l = 0; l < 2; l++){
+            for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+                x[i].a[l][idx] <== num[i].out[l][idx];
+                if(l == 0 && idx == 0)
+                    x[i].b[l][idx] <== isInfinity * (1 - den[i].out[l][idx]) + den[i].out[l][idx];
+                else
+                    x[i].b[l][idx] <== - isInfinity * den[i].out[l][idx] + den[i].out[l][idx];
+            }
+        }
     }
 
     component y = Fp2Multiply(CHUNK_SIZE, CHUNK_NUMBER, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
-        y.a[i][idx] <== in[1][i][idx];
-        y.b[i][idx] <== x[1].out[i][idx];
+    for(var i = 0; i < 2; i++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
+            y.a[i][idx] <== in[1][i][idx];
+            y.b[i][idx] <== x[1].out[i][idx];
+        }
     } 
 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         out[0][i][idx] <== x[0].out[i][idx];
         out[1][i][idx] <== y.out[i][idx];
     }
@@ -407,18 +495,18 @@ template EndomorphismPsi(CHUNK_SIZE, CHUNK_NUMBER, P){
     }
     component frob[2];
     component qx[2];
-    for(var i=0; i<2; i++){
+    for(var i = 0; i < 2; i++){
         frob[i] = Fp2FrobeniusMap(CHUNK_SIZE, CHUNK_NUMBER, 1, P);
-        for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+        for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
             frob[i].in[j][idx] <== in[i][j][idx];
         qx[i] = Fp2Multiply(CHUNK_SIZE, CHUNK_NUMBER, P);
-        for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+        for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
             qx[i].a[j][idx] <== C[i][j][idx]; 
             qx[i].b[j][idx] <== frob[i].out[j][idx];
         } 
     }
 
-    for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         out[0][j][idx] <== qx[0].out[j][idx];
         out[1][j][idx] <== qx[1].out[j][idx];
     }
@@ -448,20 +536,20 @@ template EndomorphismPsi2(CHUNK_SIZE, CHUNK_NUMBER, P){
 
     component qx[2];
     component qy[2];
-    for(var i=0; i<2; i++){
+    for(var i = 0; i < 2; i++){
         qx[i] = FpMultiply(CHUNK_SIZE, CHUNK_NUMBER, P);
-        for(var idx=0; idx<CHUNK_NUMBER; idx++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
             qx[i].a[idx] <== C[idx];
             qx[i].b[idx] <== in[0][i][idx];
         }
         
         qy[i] = BigSub(CHUNK_SIZE, CHUNK_NUMBER);
-        for(var idx=0; idx<CHUNK_NUMBER; idx++){
+        for(var idx = 0; idx < CHUNK_NUMBER; idx++){
             qy[i].a[idx] <== P[idx];
             qy[i].b[idx] <== in[1][i][idx];
         }
     }
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         out[0][i][idx] <== qx[i].out[idx];
         out[1][i][idx] <== qy[i].out[idx];
     }
@@ -496,23 +584,23 @@ template ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER){
     component doubP = EllipticCurveDoubleFp2(CHUNK_SIZE, CHUNK_NUMBER, A, B, P);
      
     xP.inIsInfinity <== inIsInfinity; 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         P[i][j][idx] <== in[i][j][idx] + inIsInfinity * (DUMMY_POINT[i][j][idx] - in[i][j][idx]);
         xP.in[i][j][idx] <== P[i][j][idx];
         psiP.in[i][j][idx] <== P[i][j][idx];
         doubP.in[i][j][idx] <== P[i][j][idx];
     }
-    for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         negPy.in[j][idx] <== P[1][j][idx];
         negPsiPy.in[j][idx] <== psiP.out[1][j][idx];
     }
 
     component psi22P = EndomorphismPsi2(CHUNK_SIZE, CHUNK_NUMBER, P);
     component add[5];
-    for(var i=0; i<5; i++)
+    for(var i = 0; i<5; i++)
         add[i] = EllipticCurveAddFp2(CHUNK_SIZE, CHUNK_NUMBER, A, B, P); 
     
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         psi22P.in[i][j][idx] <== doubP.out[i][j][idx];
         add[0].a[i][j][idx] <== xP.out[i][j][idx];
         add[0].b[i][j][idx] <== P[i][j][idx]; 
@@ -520,7 +608,7 @@ template ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER){
     add[0].aIsInfinity <== xP.isInfinity; 
     add[0].bIsInfinity <== inIsInfinity;
 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         add[1].a[i][j][idx] <== add[0].out[i][j][idx];
         if(i==0)
             add[1].b[i][j][idx] <== psiP.out[i][j][idx];
@@ -531,11 +619,11 @@ template ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER){
     add[1].bIsInfinity <== inIsInfinity;
     
     component xAdd1 = EllipticCurveScalarMultiplyFp2(CHUNK_SIZE, CHUNK_NUMBER, B, X_ABS, P); 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         xAdd1.in[i][j][idx] <== add[1].out[i][j][idx];
     xAdd1.inIsInfinity <== add[1].isInfinity; 
 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         add[2].a[i][j][idx] <== xAdd1.out[i][j][idx];
         if(i==0)
             add[2].b[i][j][idx] <== P[i][j][idx];
@@ -545,7 +633,7 @@ template ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER){
     add[2].aIsInfinity <== xAdd1.isInfinity;
     add[2].bIsInfinity <== inIsInfinity;
     
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         add[3].a[i][j][idx] <== add[2].out[i][j][idx];
         if(i==0)
             add[3].b[i][j][idx] <== psiP.out[i][j][idx];
@@ -555,7 +643,7 @@ template ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER){
     add[3].aIsInfinity <== add[2].isInfinity;
     add[3].bIsInfinity <== inIsInfinity;
 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         add[4].a[i][j][idx] <== add[3].out[i][j][idx];
         add[4].b[i][j][idx] <== psi22P.out[i][j][idx];
     }
@@ -564,7 +652,7 @@ template ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER){
 
     // isInfinity = add[4].isInfinity or inIsInfinity (if starting point was O, output must be O)
     isInfinity <== add[4].isInfinity + inIsInfinity - inIsInfinity * add[4].isInfinity; 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         out[i][j][idx] <== add[4].out[i][j][idx] + isInfinity * (DUMMY_POINT[i][j][idx] - add[4].out[i][j][idx]); 
 }
 
@@ -581,15 +669,15 @@ template MapToG2(CHUNK_SIZE, CHUNK_NUMBER){
     var P[150] = get_BLS12_381_prime(CHUNK_SIZE, CHUNK_NUMBER);
 
     component Qp[2];
-    for(var i=0; i<2; i++){
+    for(var i = 0; i < 2; i++){
         Qp[i] = OptSimpleSWU2(CHUNK_SIZE, CHUNK_NUMBER);
-        for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+        for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
             Qp[i].in[j][idx] <== in[i][j][idx];
     }
 
     // There is A small optimization we can do: Iso3Map is A group homomorphism, so we can add first and then apply isogeny. This uses EllipticCurveAdd on E2' 
     component Rp = EllipticCurveAddFp2(CHUNK_SIZE, CHUNK_NUMBER, [0, 240], [1012, 1012], P); 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         Rp.a[i][j][idx] <== Qp[0].out[i][j][idx];
         Rp.b[i][j][idx] <== Qp[1].out[i][j][idx];
     }
@@ -597,16 +685,16 @@ template MapToG2(CHUNK_SIZE, CHUNK_NUMBER){
     Rp.bIsInfinity <== 0;
     
     component R = Iso3Map(CHUNK_SIZE, CHUNK_NUMBER);
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         R.in[i][j][idx] <== Rp.out[i][j][idx];
     
     component P = ClearCofactorG2(CHUNK_SIZE, CHUNK_NUMBER);
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         P.in[i][j][idx] <== R.out[i][j][idx]; 
     P.inIsInfinity <== R.isInfinity + Rp.isInfinity - R.isInfinity * Rp.isInfinity; 
     
     isInfinity <== P.isInfinity;
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         out[i][j][idx] <== P.out[i][j][idx]; 
 }
 
@@ -629,17 +717,17 @@ template SubgroupCheckG2(CHUNK_SIZE, CHUNK_NUMBER){
 
     component isOnCurve = PointOnCurveFp2(CHUNK_SIZE, CHUNK_NUMBER, [0,0], [4,4], P);
 
-    for(var i=0; i<2; i++)for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         isOnCurve.in[i][j][idx] <== in[i][j][idx]; 
 
     component psiP = EndomorphismPsi(CHUNK_SIZE, CHUNK_NUMBER, P); 
     component negP = Fp2Negate(CHUNK_SIZE, CHUNK_NUMBER, P);
     component xP = EllipticCurveScalarMultiplyUnequalFp2(CHUNK_SIZE, CHUNK_NUMBER, [4, 4], X_ABS, P); 
 
-    for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         negP.in[j][idx] <== in[1][j][idx];
             
-    for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         psiP.in[0][j][idx] <== in[0][j][idx];
         psiP.in[1][j][idx] <== in[1][j][idx];
         xP.in[0][j][idx] <== in[0][j][idx];
@@ -648,9 +736,9 @@ template SubgroupCheckG2(CHUNK_SIZE, CHUNK_NUMBER){
     
     // psi(P) == [x]P
     component isEq[2];
-    for(var i=0; i<2; i++){
+    for(var i = 0; i < 2; i++){
         isEq[i] = Fp2IsEqual(CHUNK_SIZE, CHUNK_NUMBER, P);
-        for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++){
+        for(var j = 0; j<2; j++)for(var idx = 0; idx < CHUNK_NUMBER; idx++){
             isEq[i].a[j][idx] <== psiP.out[i][j][idx];
             isEq[i].b[j][idx] <== xP.out[i][j][idx];
         }
@@ -671,7 +759,7 @@ template SubgroupCheckG1(CHUNK_SIZE, CHUNK_NUMBER){
 
     component isOnCurve = PointOnCurve(CHUNK_SIZE, CHUNK_NUMBER, 0, B, P);
 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         isOnCurve.in[i][idx] <== in[i][idx];
          
     var omega[CHUNK_NUMBER];
@@ -689,12 +777,12 @@ template SubgroupCheckG1(CHUNK_SIZE, CHUNK_NUMBER){
     }
 
     component phiPx = FpMultiply(CHUNK_SIZE, CHUNK_NUMBER, P);
-    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         phiPx.a[idx] <== omega[idx];
         phiPx.b[idx] <== in[0][idx];
     }
     component phiPyNeg = BigSub(CHUNK_SIZE, CHUNK_NUMBER);
-    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         phiPyNeg.a[idx] <== P[idx];
         phiPyNeg.b[idx] <== in[1][idx];
     }
@@ -702,15 +790,15 @@ template SubgroupCheckG1(CHUNK_SIZE, CHUNK_NUMBER){
     // x has hamming weight 6 while x^2 has hamming weight 17 so better to do double-and-add on x twice
     component xP = EllipticCurveScalarMultiplyUnequal(CHUNK_SIZE, CHUNK_NUMBER, B, X_ABS, P); 
     component x2P = EllipticCurveScalarMultiplyUnequal(CHUNK_SIZE, CHUNK_NUMBER, B, X_ABS, P);
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         xP.in[i][idx] <== in[i][idx];
 
-    for(var i=0; i<2; i++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
+    for(var i = 0; i < 2; i++)for(var idx = 0; idx < CHUNK_NUMBER; idx++)
         x2P.in[i][idx] <== xP.out[i][idx];
 
     // check -phi(P) == [x^2]P
     component isEq = Fp2IsEqual(CHUNK_SIZE, CHUNK_NUMBER, P); // using Fp2IsEqual to check two Fp points are equal
-    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+    for(var idx = 0; idx < CHUNK_NUMBER; idx++){
         isEq.a[0][idx] <== phiPx.out[idx];
         isEq.a[1][idx] <== phiPyNeg.out[idx];
 
diff --git a/circuits/ecdsa/brainpoolP256r1/circomPairing/curve.circom b/circuits/ecdsa/brainpoolP256r1/circomPairing/curve.circom
index 6a17cfc..11bc16e 100644
--- a/circuits/ecdsa/brainpoolP256r1/circomPairing/curve.circom
+++ b/circuits/ecdsa/brainpoolP256r1/circomPairing/curve.circom
@@ -422,8 +422,11 @@ template EllipticCurveScalarMultiply(CHUNK_SIZE, CHUNK_NUMBER, b, x, p){
                 pDouble[i].in[j][idx] <== r[i+1][j][idx]; 
             
             if(BITS[i] == 0){
-                for(var j=0; j<2; j++)for(var idx=0; idx<CHUNK_NUMBER; idx++)
-                    r[i][j][idx] <== pDouble[i].out[j][idx];
+                for(var j=0; j<2; j++){
+                    for(var idx=0; idx<CHUNK_NUMBER; idx++){
+                        r[i][j][idx] <== pDouble[i].out[j][idx];
+                    }
+                }
                 rIsO[i] <== rIsO[i+1]; 
             }else{
                 // pAdd[CUR_ID] = pDouble[i] + P 
diff --git a/circuits/ecdsa/p320.json b/circuits/ecdsa/p320.json
new file mode 100644
index 0000000..439b63c
--- /dev/null
+++ b/circuits/ecdsa/p320.json
@@ -0,0 +1,1544 @@
+{
+  "pubkey": [
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0"
+  ],
+  "signature": [
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0"
+  ],
+  "hashed": [
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "1",
+    "1",
+    "1",
+    "1",
+    "0",
+    "0",
+    "1",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "1",
+    "0",
+    "0",
+    "1",
+    "0"
+  ]
+}
\ No newline at end of file
diff --git a/circuits/ecdsa/p320main.circom b/circuits/ecdsa/p320main.circom
new file mode 100644
index 0000000..30f4965
--- /dev/null
+++ b/circuits/ecdsa/p320main.circom
@@ -0,0 +1,5 @@
+pragma circom  2.1.6;
+
+include "./brainpoolP320r1/signatureVerification.circom";
+
+component main = verifyBrainpool320(32,10,256);
diff --git a/circuits/ecdsa/secp192r1/signatureVerification.circom b/circuits/ecdsa/secp192r1/signatureVerification.circom
index 1f6b6ff..dff8b8b 100644
--- a/circuits/ecdsa/secp192r1/signatureVerification.circom
+++ b/circuits/ecdsa/secp192r1/signatureVerification.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.6;
 
 include "secp192r1.circom";
-include "Secp192r1Func.circom";
+include "secp192r1Func.circom";
 include "circomlib/circuits/bitify.circom";
 include "../utils/func.circom";
 
diff --git a/circuits/identityManagement/circuits/citizenshipCheck.circom b/circuits/identityManagement/circuits/citizenshipCheck.circom
index 6b0417a..7f904e7 100644
--- a/circuits/identityManagement/circuits/citizenshipCheck.circom
+++ b/circuits/identityManagement/circuits/citizenshipCheck.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.6;
 
-include "./circomlib/circuits/bitify.circom";
-include "./circomlib/circuits/comparators.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/comparators.circom";
 
 template CitizenshipCheck(){
     signal input citizenship;
diff --git a/circuits/identityManagement/circuits/identityStateVerifier.circom b/circuits/identityManagement/circuits/identityStateVerifier.circom
index c1b019d..ae9dd02 100644
--- a/circuits/identityManagement/circuits/identityStateVerifier.circom
+++ b/circuits/identityManagement/circuits/identityStateVerifier.circom
@@ -18,7 +18,7 @@ template IdentityStateVerifier(idTreeDepth) {
     // Retrieve pkIdentity from skIdentity + proving id ownership
     component babyPbk = BabyPbk();
     babyPbk.in <== skIdentity;
-
+    
     // Hashing identity pk
     component pkIdentityHasher = Poseidon(2);
     pkIdentityHasher.inputs[0] <== babyPbk.Ax;
diff --git a/circuits/identityManagement/circuits/queryIdentityTD1.circom b/circuits/identityManagement/circuits/queryIdentityTD1.circom
index b5ce440..8c7b6e5 100644
--- a/circuits/identityManagement/circuits/queryIdentityTD1.circom
+++ b/circuits/identityManagement/circuits/queryIdentityTD1.circom
@@ -7,6 +7,7 @@ include "identityStateVerifier.circom";
 include "../../dateUtilities/dateComparisonEncoded.circom";
 include "circomlib/circuits/comparators.circom";
 include "../../dateUtilities/dateComparisonEncodedNormalized.circom";
+include "./citizenshipCheck.circom";
 
 // QUERY SELECTOR:
 // 0 - nullifier   (+)
@@ -210,7 +211,7 @@ template QueryIdentity(idTreeDepth) {
         }
         dg1Hasher.inputs[i] <== dg1Chunking[i].out;
     }
-
+    
     component skIndentityHasher = Poseidon(1);   //skData = Poseidon(skIdentity)
     skIndentityHasher.inputs[0] <== skIdentity;
     dg1Hasher.inputs[4] <== skIndentityHasher.out;
@@ -228,4 +229,11 @@ template QueryIdentity(idTreeDepth) {
 
     identityStateVerifier.idStateRoot <== idStateRoot;
     identityStateVerifier.idStateSiblings <== idStateSiblings;
+
+    //---------------------------------
+    //Citizenship Blacklist check
+
+    component citizenshipCheck = CitizenshipCheck();
+    citizenshipCheck.citizenship <== dg1DataExtractor.citizenship;
+    citizenshipCheck.blacklist <== citizenshipMask;
 }
\ No newline at end of file
diff --git a/circuits/identityManagement/circuits/registerIdentityMock.circom b/circuits/identityManagement/circuits/registerIdentityMock.circom
new file mode 100644
index 0000000..be290b4
--- /dev/null
+++ b/circuits/identityManagement/circuits/registerIdentityMock.circom
@@ -0,0 +1,40 @@
+pragma circom  2.1.6;
+
+template RegisterIdentityBuilder (
+    SIGNATURE_TYPE,                 // 1, 2..  (list above) ^^^
+    DG_HASH_TYPE,                   // 160, 224, 256, 384, 512 (list above)^^^
+    DOCUMENT_TYPE,                  // 1: TD1; 3: TD3
+    EC_BLOCK_NUMBER,
+    EC_SHIFT,
+    DG1_SHIFT,
+    AA_SIGNATURE_ALGO,
+    DG15_SHIFT,
+    DG15_BLOCK_NUMBER,
+    AA_SHIFT
+) {
+
+    // INPUT SIGNALS:
+    signal input encapsulatedContent[EC_BLOCK_NUMBER * 512];
+    signal input dg1[1024];
+    signal input dg15[DG15_BLOCK_NUMBER * 512];
+    signal input signedAttributes[1024];
+    signal input signature[32];
+    signal input pubkey[32];
+    signal input slaveMerkleRoot;
+    signal input slaveMerkleInclusionBranches[80];
+    signal input skIdentity; 
+
+
+    signal output dg15PubKeyHash;
+    signal output passportHash;
+    signal output dg1Commitment;
+    signal output pkIdentityHash;
+
+    dg15PubKeyHash <== 12333;
+    passportHash <== 12345;
+    dg1Commitment <== dg1[0] * dg1[1];
+    pkIdentityHash <== dg1[0] * dg1[1];
+    
+
+}
+
diff --git a/circuits/identityManagement/m.circom b/circuits/identityManagement/m.circom
new file mode 100644
index 0000000..aac590a
--- /dev/null
+++ b/circuits/identityManagement/m.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.6;
+
+include "./circuits/queryIdentityTD1.circom";
+
+component main = QueryIdentity(80);
diff --git a/circuits/identityManagement/registerIdentityMock.circom b/circuits/identityManagement/registerIdentityMock.circom
new file mode 100644
index 0000000..8f31c82
--- /dev/null
+++ b/circuits/identityManagement/registerIdentityMock.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.6;
+
+include "./circuits/registerIdentityMock.circom";
+
+component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
+		10,	//sig_algo
+		256,	//dg hash algo
+		3,	//document type
+		3,	//encapsulated content len in blocks
+		576,	//encapsulated content  shift in bits
+		248,	//dg1 shift in bits
+		1,	//dg15 sig algo (0 if not present)
+		1184,	//dg15 shift in bits
+		5,	//dg15 blocks
+		264	//AA shift in bits
+);
\ No newline at end of file
diff --git a/circuits/identityManagement/registerIdentity_21_256_1_7_576_248_21_3056_6_2008.circom b/circuits/identityManagement/registerIdentity_21_256_1_7_576_248_21_3056_6_2008.circom
new file mode 100644
index 0000000..f78c09e
--- /dev/null
+++ b/circuits/identityManagement/registerIdentity_21_256_1_7_576_248_21_3056_6_2008.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.6;
+
+include  "./circuits/registerIdentityBuilder.circom";
+
+component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
+		21,	//sig_algo
+		256,	//dg hash algo
+		1,	//document type
+		7,	//encapsulated content len in blocks
+		576,	//encapsulated content  shift in bits
+		248,	//dg1 shift in bits
+		21,	//dg15 sig algo (0 if not present)
+		3056,	//dg15 shift in bits
+		6,	//dg15 blocks
+		2008	//AA shift in bits
+);
\ No newline at end of file
diff --git a/circuits/merkleTree/SMTVerifier.circom b/circuits/merkleTree/SMTVerifier.circom
index 5a93094..13e7dd7 100644
--- a/circuits/merkleTree/SMTVerifier.circom
+++ b/circuits/merkleTree/SMTVerifier.circom
@@ -1,10 +1,10 @@
 // LICENSE: GPL-3.0
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
-include "../node_modules/circomlib/circuits/switcher.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/comparators.circom";
+include "circomlib/circuits/switcher.circom";
+include "circomlib/circuits/poseidon.circom";
 
 
 template SMTHash1() {
@@ -165,15 +165,7 @@ template SMTVerifier(N_LEVELS) {
         } else {
             levels[i].child <== levels[i + 1].root;
         }
-        // if (i == 0 || i == 40 || i == 20){
-        //     log("st_top", levels[i].st_top);
-        //     log("st_inew", levels[i].st_inew);
-        //     log("sibling", levels[i].sibling);
-        //     log("new1leaf", levels[i].new1leaf);
-        //     log("lrbit", levels[i].lrbit);
-
-        // }
-        // log("root", i, " ", levels[i].root);
+        
     }
 
     component isEqual = IsEqual();
diff --git a/circuits/merkleTree/hashLeftRight.circom b/circuits/merkleTree/hashLeftRight.circom
index 3b2cfdc..5eb008b 100644
--- a/circuits/merkleTree/hashLeftRight.circom
+++ b/circuits/merkleTree/hashLeftRight.circom
@@ -1,6 +1,6 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
 
 template HashLeftRight() {
     signal input left;
diff --git a/circuits/merkleTree/merkleTreapVerifier.circom b/circuits/merkleTree/merkleTreapVerifier.circom
index f96b618..f49b444 100644
--- a/circuits/merkleTree/merkleTreapVerifier.circom
+++ b/circuits/merkleTree/merkleTreapVerifier.circom
@@ -1,10 +1,10 @@
 // LICENSE: GPL-3.0
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
-include "../node_modules/circomlib/circuits/switcher.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/comparators.circom";
+include "circomlib/circuits/switcher.circom";
+include "circomlib/circuits/poseidon.circom";
 
 template SMTHash2() {
     signal input L;
diff --git a/circuits/merkleTree/merkleTree.circom b/circuits/merkleTree/merkleTree.circom
index 02a038d..9c40663 100644
--- a/circuits/merkleTree/merkleTree.circom
+++ b/circuits/merkleTree/merkleTree.circom
@@ -3,7 +3,7 @@ pragma circom  2.1.6;
 include "dualMux.circom";
 include "hashLeftRight.circom";
 
-include "../node_modules/circomlib/circuits/comparators.circom";
+include "circomlib/circuits/comparators.circom";
 
 template MerkleTreeVerifier(depth) {
     signal output isVerified;
diff --git a/circuits/nullifiersCounter/nullifiersCounter.circom b/circuits/nullifiersCounter/nullifiersCounter.circom
index ffd7e03..c12e0c3 100644
--- a/circuits/nullifiersCounter/nullifiersCounter.circom
+++ b/circuits/nullifiersCounter/nullifiersCounter.circom
@@ -1,8 +1,8 @@
 // LICENSE: GPL-3.0
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/poseidon.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
+include "circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/comparators.circom";
 include "../merkleTree/merkleTree.circom";
 
 // BuildNullifier creates a new nullifier from documentHash, blinder and salt in the same way as it 
diff --git a/circuits/passportVerification/passportDG1VerificationSHA1.circom b/circuits/passportVerification/passportDG1VerificationSHA1.circom
index 1c752ba..16b73e9 100644
--- a/circuits/passportVerification/passportDG1VerificationSHA1.circom
+++ b/circuits/passportVerification/passportDG1VerificationSHA1.circom
@@ -1,6 +1,6 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "circomlib/circuits/bitify.circom";
 include "./passportVerificationValidity.circom";
 include "./utils/sha1.circom";
 
diff --git a/circuits/passportVerification/passportDG1VerificationSHA256.circom b/circuits/passportVerification/passportDG1VerificationSHA256.circom
index 42d83d4..6daef57 100644
--- a/circuits/passportVerification/passportDG1VerificationSHA256.circom
+++ b/circuits/passportVerification/passportDG1VerificationSHA256.circom
@@ -1,7 +1,7 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/sha256/sha256.circom";
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "circomlib/circuits/sha256/sha256.circom";
+include "circomlib/circuits/bitify.circom";
 include "./passportVerificationValidity.circom";
 
 template PassportVerificationSHA256(N) {
diff --git a/circuits/passportVerification/passportVerificationHash.circom b/circuits/passportVerification/passportVerificationHash.circom
index 8c420bf..414724a 100644
--- a/circuits/passportVerification/passportVerificationHash.circom
+++ b/circuits/passportVerification/passportVerificationHash.circom
@@ -1,8 +1,8 @@
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/sha256/sha256.circom";
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/sha256/sha256.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/poseidon.circom";
 include "../rsa/rsa.circom";
 include "../merkleTree/merkleTree.circom";
 include "../x509Verification/X509Verifier.circom";
diff --git a/circuits/passportVerification/passportVerificationHashPadded.circom b/circuits/passportVerification/passportVerificationHashPadded.circom
index ca5e67f..c4a69b5 100644
--- a/circuits/passportVerification/passportVerificationHashPadded.circom
+++ b/circuits/passportVerification/passportVerificationHashPadded.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/poseidon.circom";
 include "../rsa/rsa.circom";
 include "../sha256/sha256NoPadding.circom";
 include "../merkleTree/SMTVerifier.circom";
diff --git a/circuits/passportVerification/passportVerificationHashPaddedPSS.circom b/circuits/passportVerification/passportVerificationHashPaddedPSS.circom
index 6c9f6b3..4b1a661 100644
--- a/circuits/passportVerification/passportVerificationHashPaddedPSS.circom
+++ b/circuits/passportVerification/passportVerificationHashPaddedPSS.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/poseidon.circom";
 include "../rsaPss/rsaPss.circom";
 // include "../sha256/sha256NoPadding.circom";
 include "../hasher/passportHash.circom";
diff --git a/circuits/passportVerification/passportVerificationHashPaddedSHA384.circom b/circuits/passportVerification/passportVerificationHashPaddedSHA384.circom
index d208f2e..f815062 100644
--- a/circuits/passportVerification/passportVerificationHashPaddedSHA384.circom
+++ b/circuits/passportVerification/passportVerificationHashPaddedSHA384.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/poseidon.circom";
 include "../rsa/rsa.circom";
 include "../merkleTree/SMTVerifier.circom";
 // include "../x509Verification/X509Verifier.circom";
diff --git a/circuits/passportVerification/passportVerificationSHA1.circom b/circuits/passportVerification/passportVerificationSHA1.circom
index 614521b..eb834f9 100644
--- a/circuits/passportVerification/passportVerificationSHA1.circom
+++ b/circuits/passportVerification/passportVerificationSHA1.circom
@@ -1,6 +1,6 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "circomlib/circuits/bitify.circom";
 include "./passportVerificationValidity.circom";
 include "./utils/sha1.circom";
 
diff --git a/circuits/passportVerification/passportVerificationValidity.circom b/circuits/passportVerification/passportVerificationValidity.circom
index ec5f21a..4ec8f68 100644
--- a/circuits/passportVerification/passportVerificationValidity.circom
+++ b/circuits/passportVerification/passportVerificationValidity.circom
@@ -1,8 +1,8 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "circomlib/circuits/bitify.circom";
 include "../dateUtilities/dateComparison.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
+include "circomlib/circuits/comparators.circom";
 
 template PassportVerificationValidity(N) {
     signal input currDateYear;
diff --git a/circuits/scripts/export-keys.sh b/circuits/scripts/export-keys.sh
index 1fe5f0f..58fa08c 100755
--- a/circuits/scripts/export-keys.sh
+++ b/circuits/scripts/export-keys.sh
@@ -9,7 +9,7 @@ BUILD_DIR=""
 # Define the build directory where intermediate files will be stored
 if [ -d . ]; then
     BUILD_DIR="./$CIRCUIT_NAME.dev"
-    POWERS_FILE=../powers.dev/$SETUP_POWERS.ptau
+    POWERS_FILE=./powers.dev/$SETUP_POWERS.ptau
 elif [ -d .. ]; then
     BUILD_DIR="../$CIRCUIT_NAME.dev"
     POWERS_FILE=../powers.dev/$SETUP_POWERS.ptau
diff --git a/circuits/sha256/sha256NoPadding.circom b/circuits/sha256/sha256NoPadding.circom
index 50aaa49..16c3bea 100644
--- a/circuits/sha256/sha256NoPadding.circom
+++ b/circuits/sha256/sha256NoPadding.circom
@@ -1,7 +1,7 @@
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/sha256/constants.circom";
-include "../node_modules/circomlib/circuits/sha256/sha256compression.circom";
+include "circomlib/circuits/sha256/constants.circom";
+include "circomlib/circuits/sha256/sha256compression.circom";
 
 template Sha256NoPadding(nBlocks) {
     signal input in[nBlocks * 512];
diff --git a/circuits/voteSMT/SMTVerifier.circom b/circuits/voteSMT/SMTVerifier.circom
index 4aca89b..103f334 100644
--- a/circuits/voteSMT/SMTVerifier.circom
+++ b/circuits/voteSMT/SMTVerifier.circom
@@ -1,10 +1,10 @@
 // LICENSE: GPL-3.0
 pragma circom 2.1.6;
 
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
-include "../node_modules/circomlib/circuits/switcher.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/comparators.circom";
+include "circomlib/circuits/switcher.circom";
+include "circomlib/circuits/poseidon.circom";
 
 // TODO: use merkleTree/SMTverifier
 // computes Poseidon(nullifier + secret)
diff --git a/circuits/x509Verification/X509Verifier.circom b/circuits/x509Verification/X509Verifier.circom
index dc3419f..9e757e4 100644
--- a/circuits/x509Verification/X509Verifier.circom
+++ b/circuits/x509Verification/X509Verifier.circom
@@ -1,8 +1,8 @@
 pragma circom  2.1.6;
 
-include "../node_modules/circomlib/circuits/sha256/sha256.circom";
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "circomlib/circuits/sha256/sha256.circom";
+include "circomlib/circuits/bitify.circom";
+include "circomlib/circuits/poseidon.circom";
 include "../rsa/rsa.circom";
 
 // slaveSignedAttributesLen - 9864
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 64978ac..4b0000b 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -24,15 +24,15 @@ const config: HardhatUserConfig = {
     },
   },
   zkit: {
-    circuitsDir: "circuits",
+    circuitsDir: "test/circuits/",
     compilationSettings: {
       c: true,
-      onlyFiles: ["multiplier.circom"],
+      onlyFiles: ["queryIdentity.circom", "queryIdentityTD1.circom", "registerIdentity_1_256_3_4_600_248_1_1496_3_256.circom","registerIdentity_1_256_3_5_576_248_NA.circom","registerIdentity_1_256_3_6_576_248_1_2432_5_296.circom"],
       skipFiles: []
     },
     setupSettings: {
       ptauDir: "zkit/ptau",
-      onlyFiles: ["multiplier.circom"],
+      onlyFiles: ["queryIdentity.circom", "queryIdentityTD1.circom", "registerIdentity_1_256_3_4_600_248_1_1496_3_256.circom","registerIdentity_1_256_3_5_576_248_NA.circom","registerIdentity_1_256_3_6_576_248_1_2432_5_296.circom"],
       skipFiles: []
     },
   },
diff --git a/helpers/generateRegisterIdentityTest.js b/helpers/generateRegisterIdentityTest.js
new file mode 100644
index 0000000..d310807
--- /dev/null
+++ b/helpers/generateRegisterIdentityTest.js
@@ -0,0 +1,317 @@
+const { exec } = require('child_process');
+const fs = require('fs');
+const path = require("path");
+
+function createQueryCircuit(){
+    res_string = "pragma circom  2.1.6;\n\n"
+    res_string += `include "../../circuits/identityManagement/circuits/queryIdentity.circom";\n\n`
+    res_string += `component main { public [eventID,\n`
+    res_string +=  `                       eventData,\n`
+    res_string +=  `                       idStateRoot,\n` 
+    res_string +=  `                       selector,\n`
+    res_string +=  `                       currentDate,\n`
+    res_string +=  `                       timestampLowerbound,\n`
+    res_string +=  `                       timestampUpperbound,\n`
+    res_string +=  `                       identityCounterLowerbound,\n`
+    res_string +=  `                       identityCounterUpperbound,\n`
+    res_string +=  `                       birthDateLowerbound,\n`
+    res_string +=  `                       birthDateUpperbound,\n`
+    res_string +=  `                       expirationDateLowerbound,\n`
+    res_string +=  `                       expirationDateUpperbound,\n`
+    res_string +=  `                       citizenshipMask\n`
+    res_string +=  `                       ] } = QueryIdentity(80);`
+
+    try {
+        fs.writeFileSync("test/circuits/queryIdentity.circom", res_string, 'utf8');
+        // console.log(`File created and content written to ${filePath}`);
+    } catch (err) {
+        console.error(`Error writing to file: ${err}`);
+    }
+
+    res_string = "pragma circom  2.1.6;\n\n"
+    res_string += `include "../../circuits/identityManagement/circuits/queryIdentityTD1.circom";\n\n`
+    res_string += `component main { public [eventID,\n`
+    res_string +=  `                       eventData,\n`
+    res_string +=  `                       idStateRoot,\n` 
+    res_string +=  `                       selector,\n`
+    res_string +=  `                       currentDate,\n`
+    res_string +=  `                       timestampLowerbound,\n`
+    res_string +=  `                       timestampUpperbound,\n`
+    res_string +=  `                       identityCounterLowerbound,\n`
+    res_string +=  `                       identityCounterUpperbound,\n`
+    res_string +=  `                       birthDateLowerbound,\n`
+    res_string +=  `                       birthDateUpperbound,\n`
+    res_string +=  `                       expirationDateLowerbound,\n`
+    res_string +=  `                       expirationDateUpperbound,\n`
+    res_string +=  `                       citizenshipMask\n`
+    res_string +=  `                       ] } = QueryIdentity(80);`
+
+    try {
+        fs.writeFileSync("test/circuits/queryIdentityTD1.circom", res_string, 'utf8');
+        // console.log(`File created and content written to ${filePath}`);
+    } catch (err) {
+        console.error(`Error writing to file: ${err}`);
+    }
+}
+
+function updateOnlyFilesInConfig(filenames, configFilePath) {
+    try {
+        let configContent = fs.readFileSync(configFilePath, 'utf8');
+
+        let lines = configContent.split('\n');
+
+        // Find and update the line that contains 'onlyFiles: []'
+        lines = lines.map(line => {
+            if (line.includes('onlyFiles:')) {
+                return `      onlyFiles: ["queryIdentity.circom", "queryIdentityTD1.circom", ${filenames.map(file => `"${file}.circom"`)}],`
+            }
+            return line;
+        });
+
+        // Join the lines back into a single string
+        const updatedConfigContent = lines.join('\n');
+
+        // Write the updated content back to the config file
+        fs.writeFileSync(configFilePath, updatedConfigContent, 'utf8');
+
+        console.log(`Successfully updated onlyFiles in ${configFilePath}`);
+    } catch (error) {
+        console.error(`Error updating config file: ${error.message}`);
+    }
+
+}
+
+
+
+function modifyFile(filePath) {
+    try {
+        const fileContent = fs.readFileSync(filePath, 'utf8');
+        
+        const lines = fileContent.split('\n');
+
+        if (lines.length < 3) {
+            throw new Error('The file does not have at least 3 lines.');
+        }
+
+        const thirdLine = lines[2];
+        
+        if (thirdLine.length >= 12) {
+            const modifiedLine = thirdLine.slice(0, 10) + thirdLine.slice(16, 75) + "Mock" + thirdLine.slice(82);
+
+            lines[2] = modifiedLine; 
+        } else {
+            throw new Error('The third line does not have enough characters.');
+        }
+
+        const updatedContent = lines.join('\n');
+
+        fs.writeFileSync(filePath, updatedContent, 'utf8');
+
+        console.log(`File successfully updated at ${filePath}`);
+    } catch (err) {
+        console.error(`Error modifying file: ${err.message}`);
+    }
+}
+
+function copyFileSync(src, dest) {
+    try {
+        fs.copyFileSync(src, dest);
+    } catch (err) {
+        console.error(`Error copying file: ${err}`);
+    }
+}
+
+function generateTestFile(filenames){
+
+    let result_str = "import { zkit } from \"hardhat\";\nimport { expect } from \"chai\";\nimport fs from \"fs\";\nimport path from \"path\";\nimport { Poseidon, babyJub } from \"@iden3/js-crypto\";\n"
+    result_str += `import { Core } from "@zkit";\n`
+
+    result_str += `\nfunction bigintToUint8Array(bigIntValue: bigint): Uint8Array {`
+    result_str += `\n\tconst hexString = bigIntValue.toString(16);`
+    result_str += `\n\tconst paddedHexString = hexString.length % 2 === 0 ? hexString : '0' + hexString;`
+    result_str += `\n\tconst byteArray = new Uint8Array(paddedHexString.length / 2);`
+    result_str += `\n\tfor (let i = 0; i < byteArray.length; i++) {`
+    result_str += `\n\t\tbyteArray[i] = parseInt(paddedHexString.substr(i * 2, 2), 16);`
+    result_str += `\n\t}`
+    result_str += `\n\tif (byteArray.length < 32) {`
+    result_str += `\n\t\tconst paddedArray = new Uint8Array(32);`
+    result_str += `\n\t\tpaddedArray.set(byteArray, 32 - byteArray.length);`
+    result_str += `\n\t\treturn paddedArray;`
+    result_str += `\n\t}`
+    result_str += `\n\treturn byteArray;`
+    result_str += `\n}\n`
+    
+    result_str += `\n\ndescribe("Register Identity Circuit Tests", function () {\n`
+    for (var i = 0; i < filenames.length; i++){
+        result_str += `\tlet circuit${i}: Core.R${filenames[i].slice(1)}Circom.RegisterIdentityBuilder;\n`
+        result_str += `\tlet input${i}: any;\n`
+    }
+    result_str += `\tlet queryCircuit: Core.QueryIdentityCircom.QueryIdentity;\n`
+	result_str += `\tlet queryCircuitTD1: Core.QueryIdentityTD1Circom.QueryIdentity;\n`
+    
+  
+    result_str += `\n\n\tbefore(async function () {\n`;
+    for (var i = 0; i < filenames.length; i++){
+       result_str += `\t\tcircuit${i} = await zkit.getCircuit("test/circuits/${filenames[i]}.circom:RegisterIdentityBuilder");\n`
+       result_str += `\t\tconst testJson${i} = path.join(__dirname, \`./inputs/${filenames[i]}.json\`);\n`
+       result_str += `\t\tconst data${i} = await fs.promises.readFile(testJson${i}, 'utf8');\n`
+       result_str += `\t\tinput${i} = JSON.parse(data${i});\n`
+    }
+    result_str += `\n\t\tqueryCircuit = await zkit.getCircuit("test/circuits/queryIdentity.circom:QueryIdentity");`
+    result_str += `\n\t\tqueryCircuitTD1 = await zkit.getCircuit("test/circuits/queryIdentityTD1.circom:QueryIdentity");\n\n`
+
+    result_str += `\t});\n`
+
+    for (var i = 0; i < filenames.length; i++){
+        result_str += `\n\n\tit("${filenames[i]} test", async function () {\n`
+        result_str += `\n\t\tlet docType${i} = parseInt("${filenames[i]}".split("_")[3]);\n`
+        result_str += `\n\t\tlet dg1Len${i} = 760;`
+        result_str += `\n\t\t\tif (docType${i} == 3){`
+        result_str += `\n\t\t\tdg1Len${i} = 744;`
+        result_str += `\n\t\t}\n`
+        result_str += `\n\t\tconst circuitInput${i} = {`
+        result_str += `\n\t\t\tdg1: input${i}.dg1,`
+        result_str += `\n\t\t\tdg15: input${i}.dg15,`
+        result_str += `\n\t\t\tsignedAttributes: input${i}.signedAttributes,`
+        result_str += `\n\t\t\tencapsulatedContent: input${i}.encapsulatedContent,`
+        result_str += `\n\t\t\tpubkey: input${i}.pubkey,`
+        result_str += `\n\t\t\tsignature: input${i}.signature,`
+        result_str += `\n\t\t\tskIdentity: input${i}.skIdentity,`
+        result_str += `\n\t\t\tslaveMerkleRoot: input${i}.slaveMerkleRoot,`
+        result_str += `\n\t\t\tslaveMerkleInclusionBranches: input${i}.slaveMerkleInclusionBranches`
+        result_str += `\n\t\t};`
+        result_str += `\n\t\tawait expect(circuit${i}).to.have.witnessInputs(circuitInput${i});`
+        result_str += `\n\t\tconst proof${i} = await circuit${i}.generateProof(circuitInput${i});`
+        result_str += `\n\t\tawait expect(circuit${i}).to.verifyProof(proof${i});\n\n`
+        result_str += `\n\t\tlet pkPassportHash${i} = proof${i}.publicSignals.dg15PubKeyHash;`
+		result_str += `\n\t\tif (proof${i}.publicSignals.dg15PubKeyHash == 0) {`
+		result_str += `\n\t\t\tpkPassportHash${i} = proof${i}.publicSignals.passportHash;`
+		result_str += `\n\t\t}\n`
+        result_str += `\n\t\tlet chunking${i} = ["", "", "", ""];`
+        result_str += `\n\t\tfor (var i = 0; i < 4; i++){`
+        result_str += `\n\t\t\tfor (var j = 0; j < dg1Len${i}/4; j++){`
+        result_str += `\n\t\t\t\tchunking${i}[i] += input${i}.dg1[i*(dg1Len${i}/4) + dg1Len${i}/4 - 1 - j].toString();`
+        result_str += `\n\t\t\t}`
+        result_str += `\n\t\t}\n`
+		result_str += `\n\t\tlet skHash${i} = Poseidon.hash([BigInt(input${i}.skIdentity)]);`
+		result_str += `\n\t\tlet dgCommit${i} = Poseidon.hash([BigInt(\`0b\${chunking${i}[0]}\`), BigInt(\`0b\${chunking${i}[1]}\`), BigInt(\`0b\${chunking${i}[2]}\`), BigInt(\`0b\${chunking${i}[3]}\`), skHash${i}]);`
+		result_str += `\n\t\tconst timestampSeconds${i} = Date.now().toString().slice(0, Date.now().toString().length-3);`
+		result_str += `\n\t\tlet value${i} = Poseidon.hash([BigInt(dgCommit${i}), 1n, BigInt(timestampSeconds${i})]);`
+		result_str += `\n\n\t\tlet pubkey${i} = babyJub.mulPointEscalar(babyJub.Base8, BigInt(input${i}.skIdentity));`
+		result_str += `\n\t\tlet pk_hash${i} = Poseidon.hash(pubkey${i});`
+		result_str += `\n\t\tlet index${i} = Poseidon.hash([BigInt(pkPassportHash${i}), pk_hash${i}]);`
+		result_str += `\n\n\t\tlet root${i} = Poseidon.hash([index${i}, value${i}, 1n]);`
+		result_str += `\n\t\tlet branches${i} = new Array(80).fill("0");\n`
+        result_str += `\t\tconst queryCircuitInput${i} = {\n`
+		result_str += `\t\t\tdg1: input${i}.dg1.slice(0, dg1Len${i}),\n`
+        result_str += `\t\t\teventID: "0x1234567890",\n`
+        result_str += `\t\t\teventData: "0x12345678901234567890",\n`
+        result_str += `\t\t\tidStateRoot: \`\$\{root${i}\}\`,\n`
+        result_str += `\t\t\tidStateSiblings: branches${i},\n`
+        result_str += `\t\t\tpkPassportHash: \`\$\{pkPassportHash${i}\}\`,\n`
+        result_str += `\t\t\tskIdentity: \`\$\{input${i}.skIdentity\}\`,\n`
+        result_str += `\t\t\tselector: "0",\n`
+        result_str += `\t\t\ttimestamp: \`\$\{timestampSeconds${i}\}\`,\n`
+        const currentDate = new Date();
+        const formattedDate = currentDate.toISOString().split('T')[0].split("-");
+        const date = `0x3${formattedDate[0][2]}3${formattedDate[0][3]}3${formattedDate[1][0]}3${formattedDate[1][1]}3${formattedDate[2][0]}3${formattedDate[2][1]}`
+        result_str += `\t\t\tcurrentDate: "${date}",\n`
+        result_str += `\t\t\tidentityCounter: "1",\n`
+        result_str += `\t\t\ttimestampLowerbound: "0",\n`
+        result_str += `\t\t\ttimestampUpperbound: "19000000000",\n`
+        result_str += `\t\t\tidentityCounterLowerbound: "0",\n`
+        result_str += `\t\t\tidentityCounterUpperbound: "1000",\n`
+        const birthDate = `0x3${formattedDate[0][3] >= 8 ? parseInt(formattedDate[0][2], 10) - 1 : parseInt(formattedDate[0][2], 10) - 2}3${formattedDate[0][3] >= 8 ? parseInt(formattedDate[0][3], 10) - 8 : parseInt(formattedDate[0][3], 10) + 2}3${formattedDate[1][0]}3${formattedDate[1][1]}3${formattedDate[2][0]}3${formattedDate[2][1]}`
+        result_str += `\t\t\tbirthDateLowerbound: "0x303030303030",\n`
+        result_str += `\t\t\tbirthDateUpperbound: "${birthDate}",\n`
+        result_str += `\t\t\texpirationDateLowerbound: "0x303030303030",\n`
+        result_str += `\t\t\texpirationDateUpperbound: "0x333030303030",\n`
+        result_str += `\t\t\tcitizenshipMask: "15"\n`
+		result_str += `\t\t}\n`
+        result_str += `\n\t\tif (docType${i} == 3) {`
+		result_str += `\n\t\t\tawait expect(queryCircuit).to.have.witnessInputs(queryCircuitInput${i});`
+		result_str += `\n\t\t\tconst proof${i}_2 = await queryCircuit.generateProof(queryCircuitInput${i});`
+		result_str += `\n\t\t\tawait expect(queryCircuit).to.verifyProof(proof${i}_2);`
+		result_str += `\n\t\t}else{`
+		result_str += `\n\t\t\tawait expect(queryCircuitTD1).to.have.witnessInputs(queryCircuitInput${i});`
+		result_str += `\n\t\t\tconst proof${i}_2 = await queryCircuitTD1.generateProof(queryCircuitInput${i});`
+		result_str += `\n\t\t\tawait expect(queryCircuitTD1).to.verifyProof(proof${i}_2);`
+		result_str += `\n\t\t}`
+        result_str += `\n\t});\n`
+    }
+    result_str += "});"
+    const filePath = path.join(__dirname, '../test/registerIdentityTest.ts');
+
+    try {
+        fs.writeFileSync(filePath, result_str, 'utf8');
+        // console.log(`File created and content written to ${filePath}`);
+    } catch (err) {
+        console.error(`Error writing to file: ${err}`);
+    }
+}
+
+function generateFilesForAll(filenames, callback) {
+    let index = 0;
+    let circuit_filenames = [];
+
+    function executeNext() {
+        if (index >= filenames.length) {
+            return callback(null, circuit_filenames); 
+        }
+
+        const filename = filenames[index];
+        console.log("Executing for", filename);
+
+        exec(`python3 tests/tests/process_passport.py ./test/passports/${filename}`, (error, stdout, stderr) => {
+            if (error) {
+                console.error(`Error executing script: ${error.message}`);
+                return callback(error);
+            }
+            if (stderr) {
+                console.error(`Script stderr: ${stderr}`);
+                return callback(new Error(stderr));
+            }
+
+            const tmp_txt = path.join(__dirname, `../tests/tests/inputs/tmp.txt`);
+            fs.readFile(tmp_txt, 'utf8', (err, short_filename) => {
+                if (err) {
+                    return callback(err);
+                }
+
+                circuit_filenames.push(short_filename.trim());
+
+                copyFileSync(
+                    "./tests/tests/circuits/identityManagement/" + circuit_filenames[index] + ".circom", 
+                    "./test/circuits/" + circuit_filenames[index] + ".circom"
+                );
+                modifyFile("./test/circuits/" + circuit_filenames[index] + ".circom");
+                copyFileSync(
+                    "./tests/tests/inputs/generated/input_" + circuit_filenames[index] + "_2.dev.json", 
+                    "./test/inputs/" + circuit_filenames[index] + ".json"
+                );
+
+                index++;
+
+                setTimeout(executeNext, 2500); 
+            });
+        });
+    }
+
+    executeNext(); 
+}
+
+const passportDir = path.join(__dirname, '../test/passports');
+const filenames = fs.readdirSync(passportDir).filter(file => file.endsWith('.json'));
+let circuit_filenames = [];
+
+generateFilesForAll(filenames, (err, result) => {
+    if (err) {
+        console.error("An error occurred:", err);
+    } else {
+        console.log("Generated filenames:", result);
+        circuit_filenames = result;
+        generateTestFile(circuit_filenames);
+        updateOnlyFilesInConfig(circuit_filenames, "./hardhat.config.ts");
+        createQueryCircuit();
+    }
+});
\ No newline at end of file
diff --git a/package.json b/package.json
index 4f04e47..ee23670 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
     "version": "0.1.0",
     "description": "Verifying biometric passports with zero knowledge proofs (SNARKs)",
     "scripts": {
-        "test": "./node_modules/.bin/mocha -p 'tests/tests/automatisationTest.js'",
+        "test": "bash './test/test.bash'",
+        "wasm-test": "./node_modules/.bin/mocha -p 'tests/tests/automatisationTest.js'",
         "compile": "npm run zkit-make && npm run zkit-verifiers && npm run solidity-compile",
         "solidity-compile": "npx hardhat compile --force",
         "zkit-make": "npx hardhat zkit make",
@@ -27,13 +28,14 @@
     },
     "homepage": "https://github.com/rarimo/passport-zk-circuits#readme",
     "dependencies": {
+        "blake-hash": "^2.0.0",
         "circomlib": "^2.0.5"
     },
     "devDependencies": {
         "@iden3/js-crypto": "^1.0.3",
         "@nomicfoundation/hardhat-toolbox": "^5.0.0",
         "@solarity/chai-zkit": "^0.2.5",
-        "@solarity/hardhat-zkit": "^0.4.5",
+        "@solarity/hardhat-zkit": "^0.4.6",
         "@typechain/ethers-v6": "^0.5.1",
         "@types/chai": "^4.3.14",
         "@types/mocha": "^10.0.6",
diff --git a/test/passports/readme.txt b/test/passports/readme.txt
new file mode 100644
index 0000000..d56a6f7
--- /dev/null
+++ b/test/passports/readme.txt
@@ -0,0 +1 @@
+Put your .json passports here to do testing!
diff --git a/test/queryIdentity.test.ts b/test/queryIdentity.test.ts
new file mode 100644
index 0000000..fb784b8
--- /dev/null
+++ b/test/queryIdentity.test.ts
@@ -0,0 +1,50 @@
+// import { zkit } from "hardhat"; 
+// import { expect } from "chai"; 
+// import { QueryIdentity } from "@zkit"; 
+// import fs from "fs";
+// import path from "path";
+
+// describe("QueryIdentity Circuit Test", function () {
+//   let circuit: QueryIdentity;
+//   let input: any;
+  
+//   // Before hook to initialize circuit and load input data
+//   before(async function () {
+//     circuit = await zkit.getCircuit("QueryIdentity");
+
+//     const testJson = path.join(__dirname, `./inputQuery.json`);
+//     const data = await fs.promises.readFile(testJson, 'utf8');
+//     input = JSON.parse(data);
+//   });
+
+//   it("should generate a valid witness and proof for QueryIdentity circuit", async function () {
+//     const witness = {
+//       dg1: input.dg1,
+//       eventID: input.eventID,
+//       idStateRoot: input.idStateRoot,
+//       idStateSiblings: input.idStateSiblings,
+//       pkPassportHash: input.pkPassportHash,
+//       selector: input.selector,
+//       skIdentity: input.skIdentity,
+//       timestamp: input.timestamp,
+//       currentDate: input.currentDate,
+//       identityCounter: input.identityCounter,
+//       timestampLowerbound: input.timestampLowerbound,
+//       timestampUpperbound: input.timestampUpperbound,
+//       identityCounterLowerbound: input.identityCounterLowerbound,
+//       identityCounterUpperbound: input.identityCounterUpperbound,
+//       birthDateUpperbound: input.birthDateUpperbound,
+//       expirationDateLowerbound: input.expirationDateLowerbound,
+//       expirationDateUpperbound: input.expirationDateUpperbound,
+//       citizenshipMask: input.citizenshipMask,
+//       eventData: input.eventData,
+//       birthDateLowerbound: input.birthDateLowerbound
+//     };
+
+//     await expect(circuit).to.have.witnessInputs(witness);
+
+//     const proof = await circuit.generateProof(witness);
+
+//     await expect(circuit).to.verifyProof(proof);
+//   });
+// });
diff --git a/test/sol.test.ts b/test/sol.test.ts
deleted file mode 100644
index 863f603..0000000
--- a/test/sol.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// import { zkit } from "hardhat"; // hardhat-zkit plugin
-// import { expect } from "chai"; // chai-zkit extension
-// import { QueryIdentity } from "@zkit"; // zktype circuit-object
-// import fs from "fs";
-// import path from "path";
-
-
-// async function main() {
-//     const circuit: QueryIdentity = await zkit.getCircuit("QueryIdentity");
-
-//     const testJson = path.join(__dirname, `./inputQuery.json`);
-//     const data = await fs.promises.readFile(testJson, 'utf8');
-//     const input = JSON.parse(data);
-//     console.log(input);
-//     // witness testing
-//     await expect(circuit)
-//     .with.witnessInputs({
-//         dg1: input.dg1,
-//         eventID: input.eventID,
-//         idStateRoot: input.idStateRoot,
-//         idStateSiblings: input.idStateSiblings,
-//         pkPassportHash: input.pkPassportHash,
-//         selector: input.selector,
-//         skIdentity: input.skIdentity,
-//         timestamp: input.timestamp,
-//         currentDate: input.currentDate,
-//         identityCounter: input.identityCounter,
-//         timestampLowerbound: input.timestampLowerbound,
-//         timestampUpperbound: input.timestampUpperbound,
-//         identityCounterLowerbound: input.identityCounterLowerbound,
-//         identityCounterUpperbound: input.identityCounterUpperbound,
-//         birthDateUpperbound: input.birthDateUpperbound,
-//         expirationDateLowerbound: input.expirationDateLowerbound,
-//         expirationDateUpperbound: input.expirationDateUpperbound,
-//         citizenshipMask: input.citizenshipMask,
-//         eventData: input.eventData,
-//         birthDateLowerbound: input.birthDateLowerbound
-//     });
-
-
-// }
-
-// main()
-//   .then()
-//   .catch((e) => console.log(e));
\ No newline at end of file
diff --git a/test/sol2.test.ts b/test/sol2.test.ts
deleted file mode 100644
index 9bbbbb8..0000000
--- a/test/sol2.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// file location: ./scripts/multiplier.test.ts
-
-import { zkit } from "hardhat"; // hardhat-zkit plugin
-import { expect } from "chai"; // chai-zkit extension
-import { Multiplier } from "@zkit"; // zktype circuit-object
-
-async function main() {
-  const circuit: Multiplier = await zkit.getCircuit("Multiplier");
-  // or await zkit.getCircuit("circuits/multiplier.circom:Multiplier");
-
-  // witness testing
-  await expect(circuit)
-    .with.witnessInputs({ in1: "3", in2: "7" })
-    .to.have.witnessOutputs({ out: "21" });
-
-  // proof testing
-  const proof = await circuit.generateProof({ in1: "4", in2: "2" });
-
-  await expect(circuit).to.verifyProof(proof);
-}
-
-main()
-  .then()
-  .catch((e) => console.log(e));
\ No newline at end of file
diff --git a/test/test.bash b/test/test.bash
new file mode 100644
index 0000000..412dd27
--- /dev/null
+++ b/test/test.bash
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Execute the first command and wait for it to complete
+node ./helpers/generateRegisterIdentityTest.js
+if [ $? -ne 0 ]; then
+    echo "Error executing generateRegisterIdentityTest.js"
+    exit 1
+fi
+
+# Execute the second command and wait for it to complete
+npx hardhat zkit compile
+if [ $? -ne 0 ]; then
+    echo "Error during hardhat zkit compile"
+    exit 1
+fi
+
+# Execute the third command and wait for it to complete
+npx hardhat zkit make
+if [ $? -ne 0 ]; then
+    echo "Error during hardhat zkit make"
+    exit 1
+fi
+
+# Execute the final command
+npx hardhat test
+if [ $? -ne 0 ]; then
+    echo "Error during npm run test"
+    exit 1
+fi
+
+echo "All commands executed successfully."
diff --git a/tests/tests/circuits/identityManagement/registerIdentity_10_256_3_3_576_248_1_1184_5_264.circom b/tests/tests/circuits/identityManagement/registerIdentity_10_256_3_3_576_248_1_1184_5_264.circom
index b641cff..98ad6ba 100644
--- a/tests/tests/circuits/identityManagement/registerIdentity_10_256_3_3_576_248_1_1184_5_264.circom
+++ b/tests/tests/circuits/identityManagement/registerIdentity_10_256_3_3_576_248_1_1184_5_264.circom
@@ -7,7 +7,7 @@ component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
 		256,	//dg hash algo
 		3,	//document type
 		3,	//encapsulated content len in blocks
-		576,	///encapsulated content  shift in bits
+		576,	//encapsulated content  shift in bits
 		248,	//dg1 shift in bits
 		1,	//dg15 sig algo (0 if not present)
 		1184,	//dg15 shift in bits
diff --git a/tests/tests/circuits/identityManagement/registerIdentity_11_256_3_5_584_264_1_2136_4_256.circom b/tests/tests/circuits/identityManagement/registerIdentity_11_256_3_5_584_264_1_2136_4_256.circom
new file mode 100644
index 0000000..c7f0e54
--- /dev/null
+++ b/tests/tests/circuits/identityManagement/registerIdentity_11_256_3_5_584_264_1_2136_4_256.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.6;
+
+include  "../../../../circuits/identityManagement/circuits/registerIdentityBuilder.circom";
+
+component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
+		11,	//sig_algo
+		256,	//dg hash algo
+		3,	//document type
+		5,	//encapsulated content len in blocks
+		584,	//encapsulated content  shift in bits
+		264,	//dg1 shift in bits
+		1,	//dg15 sig algo (0 if not present)
+		2136,	//dg15 shift in bits
+		4,	//dg15 blocks
+		256	//AA shift in bits
+);
\ No newline at end of file
diff --git a/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_4_600_248_1_1496_3_256.circom b/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_4_600_248_1_1496_3_256.circom
index 16c5ea6..0e26e96 100644
--- a/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_4_600_248_1_1496_3_256.circom
+++ b/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_4_600_248_1_1496_3_256.circom
@@ -7,7 +7,7 @@ component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
 		256,	//dg hash algo
 		3,	//document type
 		4,	//encapsulated content len in blocks
-		600,	///encapsulated content  shift in bits
+		600,	//encapsulated content  shift in bits
 		248,	//dg1 shift in bits
 		1,	//dg15 sig algo (0 if not present)
 		1496,	//dg15 shift in bits
diff --git a/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_5_576_248_NA.circom b/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_5_576_248_NA.circom
index 2052de6..01fa5dd 100644
--- a/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_5_576_248_NA.circom
+++ b/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_5_576_248_NA.circom
@@ -7,7 +7,7 @@ component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
 		256,	//dg hash algo
 		3,	//document type
 		5,	//encapsulated content len in blocks
-		576,	///encapsulated content  shift in bits
+		576,	//encapsulated content  shift in bits
 		248,	//dg1 shift in bits
 		0,	//dg15 sig algo (0 if not present)
 		0,	//dg15 shift in bits
diff --git a/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_6_576_248_1_2432_5_296.circom b/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_6_576_248_1_2432_5_296.circom
index 8177f20..6ab3f34 100644
--- a/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_6_576_248_1_2432_5_296.circom
+++ b/tests/tests/circuits/identityManagement/registerIdentity_1_256_3_6_576_248_1_2432_5_296.circom
@@ -7,7 +7,7 @@ component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
 		256,	//dg hash algo
 		3,	//document type
 		6,	//encapsulated content len in blocks
-		576,	///encapsulated content  shift in bits
+		576,	//encapsulated content  shift in bits
 		248,	//dg1 shift in bits
 		1,	//dg15 sig algo (0 if not present)
 		2432,	//dg15 shift in bits
diff --git a/tests/tests/circuits/identityManagement/registerIdentity_21_256_1_7_576_248_21_3056_6_2008.circom b/tests/tests/circuits/identityManagement/registerIdentity_21_256_1_7_576_248_21_3056_6_2008.circom
new file mode 100644
index 0000000..702857c
--- /dev/null
+++ b/tests/tests/circuits/identityManagement/registerIdentity_21_256_1_7_576_248_21_3056_6_2008.circom
@@ -0,0 +1,16 @@
+pragma circom 2.1.6;
+
+include  "../../../../circuits/identityManagement/circuits/registerIdentityBuilder.circom";
+
+component main { public [slaveMerkleRoot] } = RegisterIdentityBuilder(
+		21,	//sig_algo
+		256,	//dg hash algo
+		1,	//document type
+		7,	//encapsulated content len in blocks
+		576,	//encapsulated content  shift in bits
+		248,	//dg1 shift in bits
+		21,	//dg15 sig algo (0 if not present)
+		3056,	//dg15 shift in bits
+		6,	//dg15 blocks
+		2008	//AA shift in bits
+);
\ No newline at end of file
diff --git a/tests/tests/circuits/passportVerification/passportVerification_11_256_3_5_584_264_1_2136_4_256.circom b/tests/tests/circuits/passportVerification/passportVerification_11_256_3_5_584_264_1_2136_4_256.circom
new file mode 100644
index 0000000..b096090
--- /dev/null
+++ b/tests/tests/circuits/passportVerification/passportVerification_11_256_3_5_584_264_1_2136_4_256.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.6;
+
+include "../../../../circuits/passportVerification/passportVerificationBuilder.circom";
+
+component main { public [slaveMerkleRoot] } = PassportVerificationBuilder(
+		8,	 //dg15 chunk number
+		8,	//encapsulated content chunk number
+		11,	//sig_algo
+		256,	//dg hash algo
+		5,	//encapsulated content len in blocks
+		584,	///encapsulated content  shift in bits
+		264,	//dg1 shift in bits
+		1,	//dg15 sig algo (0 if not present)
+		2136,	//dg15 shift in bits
+		4,	//dg15 blocks
+		256	//AA shift in bits
+);
\ No newline at end of file
diff --git a/tests/tests/circuits/passportVerification/passportVerification_21_256_1_7_576_248_21_3056_6_2008.circom b/tests/tests/circuits/passportVerification/passportVerification_21_256_1_7_576_248_21_3056_6_2008.circom
new file mode 100644
index 0000000..bcb4510
--- /dev/null
+++ b/tests/tests/circuits/passportVerification/passportVerification_21_256_1_7_576_248_21_3056_6_2008.circom
@@ -0,0 +1,17 @@
+pragma circom 2.1.6;
+
+include "../../../../circuits/passportVerification/passportVerificationBuilder.circom";
+
+component main { public [slaveMerkleRoot] } = PassportVerificationBuilder(
+		8,	 //dg15 chunk number
+		8,	//encapsulated content chunk number
+		21,	//sig_algo
+		256,	//dg hash algo
+		7,	//encapsulated content len in blocks
+		576,	///encapsulated content  shift in bits
+		248,	//dg1 shift in bits
+		21,	//dg15 sig algo (0 if not present)
+		3056,	//dg15 shift in bits
+		6,	//dg15 blocks
+		2008	//AA shift in bits
+);
\ No newline at end of file