Merge pull request #31 from apache/issue29-update-amcl

Update AMCL and apply trick to MTA ZKP
diff --git a/src/commitments.c b/src/commitments.c
index b191c98..af7c2af 100644
--- a/src/commitments.c
+++ b/src/commitments.c
@@ -118,7 +118,7 @@
     FF_2048_copy(Pm1, P, n);
     FF_2048_dec(Pm1, 1, n);
 
-    FF_2048_pow(f, f, Pm1, P, n);
+    FF_2048_pow(f, f, Pm1, P, n, n);
     FF_2048_dec(f, 1, n);
     if (FF_2048_iszilch(f, n))
     {
diff --git a/src/mta.c b/src/mta.c
index 021ef58..d41174e 100644
--- a/src/mta.c
+++ b/src/mta.c
@@ -104,8 +104,13 @@
     char oct[FS_2048];
     octet OCT = {0, sizeof(oct), oct};
 
+    BIG_512_60 g[HFLEN_4096];
+
     // Process Paillier Public key
-    FF_4096_toOctet(&OCT, key->g, HFLEN_4096);
+    FF_4096_copy(g, key->n, HFLEN_4096);
+    FF_4096_inc(g, 1, HFLEN_4096);
+    FF_4096_norm(g, HFLEN_4096);
+    FF_4096_toOctet(&OCT, g, HFLEN_4096);
     OCT_hash(sha, &OCT);
 
     // Process Bit Commitment modulus
@@ -464,13 +469,13 @@
     // Compute s = beta * r^e mod N using CRT
     FF_2048_amod(hws, r, 2*FFLEN_2048, key->p, HFLEN_2048);
     FF_2048_dmod(sp, rv->beta, key->p, HFLEN_2048);
-    FF_2048_pow(hws, hws, e, key->p, HFLEN_2048);
+    FF_2048_pow(hws, hws, e, key->p, HFLEN_2048, HFLEN_2048);
     FF_2048_mul(ws1, sp, hws,  HFLEN_2048);
     FF_2048_dmod(sp, ws1, key->p, HFLEN_2048);
 
     FF_2048_amod(hws, r, 2*FFLEN_2048, key->q, HFLEN_2048);
     FF_2048_dmod(sq, rv->beta, key->q, HFLEN_2048);
-    FF_2048_pow(hws, hws, e, key->q, HFLEN_2048);
+    FF_2048_pow(hws, hws, e, key->q, HFLEN_2048, HFLEN_2048);
     FF_2048_mul(ws1, sq, hws,  HFLEN_2048);
     FF_2048_dmod(sq, ws1, key->q, HFLEN_2048);
 
@@ -559,7 +564,9 @@
 
     BIG_512_60 e_4096[HFLEN_4096];
     BIG_512_60 s1[HFLEN_4096];
-    BIG_512_60 ws_4096[FFLEN_4096];
+    BIG_512_60 ws1_4096[FFLEN_4096];
+    BIG_512_60 ws2_4096[FFLEN_4096];
+    BIG_512_60 dws_4096[2 * FFLEN_4096];
 
     char oct[FS_2048];
     octet OCT = {0, sizeof(oct), oct};
@@ -611,13 +618,18 @@
     OCT_pad(&OCT, HFS_4096);
     FF_4096_fromOctet(s1, &OCT, HFLEN_4096);
 
-    FF_4096_fromOctet(ws_4096, CT, FFLEN_4096);
-    FF_4096_invmodp(ws_4096, ws_4096, key->n2, FFLEN_4096);
+    FF_4096_fromOctet(ws1_4096, CT, FFLEN_4096);
+    FF_4096_invmodp(ws1_4096, ws1_4096, key->n2, FFLEN_4096);
 
     // u_proof = g^s1 * s^N * c^(-e) mod N^2
-    FF_4096_pow3(ws_4096, key->g, s1, p->s, key->n, ws_4096, e_4096, key->n2, FFLEN_4096, HFLEN_4096);
+    FF_4096_mul(ws2_4096, key->n, s1, HFLEN_4096);
+    FF_4096_inc(ws2_4096, 1, FFLEN_4096);
+    FF_4096_norm(ws2_4096, FFLEN_4096);
+    FF_4096_pow2(ws1_4096, p->s, key->n, ws1_4096, e_4096, key->n2, FFLEN_4096, HFLEN_4096);
+    FF_4096_mul(dws_4096, ws1_4096, ws2_4096, FFLEN_4096);
+    FF_4096_dmod(ws1_4096, dws_4096, key->n2, FFLEN_4096);
 
-    if(FF_4096_comp(ws_4096, co->u, FFLEN_4096) != 0)
+    if(FF_4096_comp(ws1_4096, co->u, FFLEN_4096) != 0)
     {
         return MTA_FAIL;
     }
@@ -673,7 +685,9 @@
     BIG_512_60 alpha[HFLEN_4096];
     BIG_512_60 beta[FFLEN_4096];
     BIG_512_60 gamma[HFLEN_4096];
-    BIG_512_60 ws[FFLEN_4096];
+    BIG_512_60 ws1[FFLEN_4096];
+    BIG_512_60 ws2[FFLEN_4096];
+    BIG_512_60 dws[2 * FFLEN_4096];
 
     char oct[2 * FS_2048];
     octet OCT = {0, sizeof(oct), oct};
@@ -753,15 +767,20 @@
     FF_2048_skpow2(c->w,  mod->b0, tws, mod->b1, rv->tau,  mod->N, FFLEN_2048, FFLEN_2048 + HFLEN_2048);
 
     // Compute v = c1^alpha * g^gamma * beta^N mod n2
-    FF_4096_fromOctet(ws, C1, FFLEN_4096);
+    FF_4096_fromOctet(ws2, C1, FFLEN_4096);
 
     FF_2048_toOctet(&OCT, rv->alpha, HFLEN_2048);
     OCT_pad(&OCT, HFS_4096);
     FF_4096_fromOctet(alpha, &OCT, HFLEN_4096);
 
-    FF_4096_skpow3(ws, ws, alpha, key->g, gamma, beta, key->n, key->n2, FFLEN_4096, HFLEN_4096);
+    FF_4096_mul(ws1, key->n, gamma, HFLEN_4096);
+    FF_4096_inc(ws1, 1, FFLEN_4096);
+    FF_4096_norm(ws1, FFLEN_4096);
+    FF_4096_skpow2(ws2, ws2, alpha, beta, key->n, key->n2, FFLEN_4096, HFLEN_4096);
+    FF_4096_mul(dws, ws1, ws2, FFLEN_4096);
+    FF_4096_dmod(ws1, dws, key->n2, FFLEN_4096);
 
-    FF_4096_toOctet(&OCT, ws, FFLEN_4096);
+    FF_4096_toOctet(&OCT, ws1, FFLEN_4096);
     FF_2048_fromOctet(c->v, &OCT, 2 * FFLEN_2048);
 
     // Clean memory
@@ -826,7 +845,7 @@
     FF_2048_fromOctet(n, &OCT, FFLEN_2048);
 
     FF_2048_dmod(ws, dws, n, FFLEN_2048);
-    FF_2048_skpow(ws, ws, e, n, FFLEN_2048, HFLEN_2048);
+    FF_2048_pow(ws, ws, e, n, FFLEN_2048, HFLEN_2048);
     FF_2048_mul(dws, rv->beta, ws, FFLEN_2048);
     FF_2048_dmod(p->s, dws, n, FFLEN_2048);
 
diff --git a/test/smoke/test_bc_setup_smoke.c b/test/smoke/test_bc_setup_smoke.c
index cd31c3d..e3726a5 100644
--- a/test/smoke/test_bc_setup_smoke.c
+++ b/test/smoke/test_bc_setup_smoke.c
@@ -58,14 +58,14 @@
     COMMITMENTS_BC_setup(&RNG, &m, &P, &Q, NULL, NULL);
 
     // Check that b0, b1, alpha, ialpha are of the correct form
-    FF_2048_pow(e, m.b0, m.alpha, m.N, FFLEN_2048);
+    FF_2048_pow(e, m.b0, m.alpha, m.N, FFLEN_2048, FFLEN_2048);
     if (FF_2048_comp(e, m.b1, FFLEN_2048) != 0)
     {
         printf("FAILURE COMMITMENTS_BC_setup. b1 != b0^alpha");
         exit(EXIT_FAILURE);
     }
 
-    FF_2048_pow(e, m.b1, m.ialpha, m.N, FFLEN_2048);
+    FF_2048_pow(e, m.b1, m.ialpha, m.N, FFLEN_2048, FFLEN_2048);
     if (FF_2048_comp(e, m.b0, FFLEN_2048) != 0)
     {
         printf("FAILURE COMMITMENTS_BC_setup. b0 != b1^ialpha");
diff --git a/test/unit/test_mta_rp_challenge.c b/test/unit/test_mta_rp_challenge.c
index f8936cb..c5890b2 100644
--- a/test/unit/test_mta_rp_challenge.c
+++ b/test/unit/test_mta_rp_challenge.c
@@ -52,7 +52,7 @@
     const char *H2line = "H2 = ";
 
     PAILLIER_public_key pub;
-    const char *Gline = "G = ";
+    const char *Nline = "N = ";
 
     char c[2*FS_2048];
     octet C = {0, sizeof(c), c};
@@ -91,9 +91,7 @@
         scan_FF_4096(fp, co.u, line, Uline, FFLEN_4096);
         scan_FF_2048(fp, co.w, line, Wline, FFLEN_2048);
 
-        // pub.g is FFLEN_4096 long, but for this we only
-        // use the relevant HFLEN_4096 BIGs
-        scan_FF_4096(fp, pub.g, line, Gline, HFLEN_4096);
+        scan_FF_4096(fp, pub.n, line, Nline, HFLEN_4096);
 
         // Read ground truth
         scan_OCTET(fp, &E_GOLDEN, line, Eline);
diff --git a/test/unit/test_mta_zk_challenge.c b/test/unit/test_mta_zk_challenge.c
index eac8cd7..76b7998 100644
--- a/test/unit/test_mta_zk_challenge.c
+++ b/test/unit/test_mta_zk_challenge.c
@@ -54,7 +54,7 @@
     const char *H2line = "H2 = ";
 
     PAILLIER_public_key key;
-    const char *Gline = "G = ";
+    const char *Nline = "N = ";
 
     char c1[2*FS_2048];
     octet C1 = {0, sizeof(c1), c1};
@@ -100,9 +100,7 @@
         scan_FF_2048(fp, c.v,  line, Vline,  2 * FFLEN_2048);
         scan_FF_2048(fp, c.w,  line, Wline,  FFLEN_2048);
 
-        // pub.g is FFLEN_4096 long, but for this we only
-        // use the relevant HFLEN_4096 BIGs
-        scan_FF_4096(fp, key.g, line, Gline, HFLEN_4096);
+        scan_FF_4096(fp, key.n, line, Nline, HFLEN_4096);
 
         // Read ground truth
         scan_OCTET(fp, &E_GOLDEN, line, Eline);
diff --git a/test/unit/test_mta_zkwc_challenge.c b/test/unit/test_mta_zkwc_challenge.c
index d47302a..d9c13c9 100644
--- a/test/unit/test_mta_zkwc_challenge.c
+++ b/test/unit/test_mta_zkwc_challenge.c
@@ -55,7 +55,7 @@
     const char *H2line = "H2 = ";
 
     PAILLIER_public_key key;
-    const char *Gline = "G = ";
+    const char *Nline = "N = ";
 
     char c1[2*FS_2048];
     octet C1 = {0, sizeof(c1), c1};
@@ -108,9 +108,7 @@
 
         scan_ECP_SECP256K1(fp, &(c.U), line, Uline);
 
-        // pub.g is FFLEN_4096 long, but for this we only
-        // use the relevant HFLEN_4096 BIGs
-        scan_FF_4096(fp, key.g, line, Gline, HFLEN_4096);
+        scan_FF_4096(fp, key.n, line, Nline, HFLEN_4096);
 
         // Read ground truth
         scan_OCTET(fp, &E_GOLDEN, line, Eline);
diff --git a/testVectors/mta/mta_challenge.json b/testVectors/mta/mta_challenge.json
index cb83d34..3be5e98 100644
--- a/testVectors/mta/mta_challenge.json
+++ b/testVectors/mta/mta_challenge.json
@@ -1,7 +1,7 @@
 [
   {
     "TEST": 0,
-    "G": "9cd517455aad477a317ab3a141282e52d40ab61864fe0fb683ac8f0f5096c9a7ba886ec715b3d86be08ba60a957799f2f6f6f927a8c14e38e8f8400193bdc8fa1dd9a1dbc24e50796fd481eb5fe6eded842ecd3924847924b77a4f53ca7ca5731a1056e9906d3ca58c66d454db2ceeafc2aae8569dfeb0ad39929082969841ced094a67182bc61d0d93dd73f453af4bf92e2bf13f4fe0c5243089f0983638acaeb9fe509d15681db9ce637af5c7fa7aa1f31fa8451acf44730339b90a1099cb2cbbe65f003b5d7c72b6499d7050ba6e3a936b79586e32ee4e05f75388eb21480e40811b92cc83b09af75525a86c60f71f8aba989c6704693e6e224c68b1bbd68",
+    "N": "9cd517455aad477a317ab3a141282e52d40ab61864fe0fb683ac8f0f5096c9a7ba886ec715b3d86be08ba60a957799f2f6f6f927a8c14e38e8f8400193bdc8fa1dd9a1dbc24e50796fd481eb5fe6eded842ecd3924847924b77a4f53ca7ca5731a1056e9906d3ca58c66d454db2ceeafc2aae8569dfeb0ad39929082969841ced094a67182bc61d0d93dd73f453af4bf92e2bf13f4fe0c5243089f0983638acaeb9fe509d15681db9ce637af5c7fa7aa1f31fa8451acf44730339b90a1099cb2cbbe65f003b5d7c72b6499d7050ba6e3a936b79586e32ee4e05f75388eb21480e40811b92cc83b09af75525a86c60f71f8aba989c6704693e6e224c68b1bbd67",
     "NT": "b5eed17dc8d2b334110128bd1b19e58d97c3286e2505283a9f8d060527e8aa76b08771ca8b16ac020b4e022f85f70422abe7ea8f78a0e066188a2ca022a01af3ab93b7c39ba2558425664ae00a3ac13540b9e73ffd44973fd0ed9030850d242cdbd7c8825ef164eb04de336f3e9565b3b9fedefcf5269f54c68d5d2751bd77142f2ddbe3eda0fb68f2397899515057729b7ef88e7c8a459f88b39c33592cd2d95461185522c90c4d8b0feed1c9d4e1d68b7eff16d0439b2a687b24b242521ef3af8ed11151e3b8d50bddf39d90d0d34ba6a13ddec9b0b1cea034ac6c87d9e550335b8e8268094770d137d022d51122dbaaa403a9ffaa3258c8e1bedfc6ef6421",
     "H1": "2f96915406a7a08fec7da6f6000effe9ca4e4c7f8f76106e5813e6c392857f75114f5a6983f164f6051669943980936461eb8b120d482ed5bbb0f6867211db874fcab23165b99359bdb29c27f03f7616dd3360c4d8fa1616a0980536b3fcc4d81503ebbbed50bfd99294070fc7a84ce0e56129c33d17b2e67abf47d5db5e184eab4abc2bd16fc3c393a9194d446bf28144d3c083893b31774d195796757284eab783f63978e9367b06eb3e11f90ce5fbf674c2893733b7b8d36ae787d89e7339a9b58a93ebbce28686d64d18d4353053306a8a14e1b47ba1134b6f52284ca93f2c945f3a8903c7af684c0f7fd5d18dbd4b239c51d44f4c039ab8b31b592325c6",
     "H2": "4c20914184a0779ead339f8d5dc6582e3b55664220edb3f6cbe8df0a1ddb3972292a96b346365a8858bfca224ac95afa78ef641c461bef0bdefa6150a9357cad646855404274634de22c0201e40783addb5937dc0b48812fb7699e7cdb2cdb0f71830a130fe09b1e22e33a4a9764cc17a55744115c7aedcf5358fdc2687ece01183681bb479f53976776ac876b1987c955289c2fc6f2007d71e8be99ec03a3cd676c2765e04c1802ffcc19a4f53386b59f5ed4641a3df5de51fd4a569a0b22e562f6d5ce7baeba7e492fea809e0049973cef60384d6685af8e1a5c5f94a89ed20bd0bed59ae3b4fa6727e4ab29e3b984613b06ad9acaf0b36f52d364154ae890",
@@ -15,7 +15,7 @@
   },
   {
     "TEST": 1,
-    "G": "b801b8775c8a8ec476b860ddae3890018135fc8a9c5c4e76541cc7c4463e8e4c4cbeb3173f6c3fb5abdcda48f9a5d1580e426bdb6b7adfdc0c01bd8115a5b033e7e29971508f0c42ddf72d06eaf22608520c2547590fcbfa67af7b4334d78fd83e2934660351a4dcd634d7b36135006e0d9c72cb34576f424fd653cae17bb92ea70873cd9aea0aaa3ff750076a8dcc1bf83d3c71a7616dcd1125e0a828773601ed34a07b95f1b3d4ec4feb536525bdcbadee2d7cba30bc837f64195d47a74ece9b0820a4ec97f639ff28b63f0ef6ba098198cb2c4335323b211e5942208c59b696f39f4ea605d417d5ce857902cf8624280ad13a74644354af786683c638c08c",
+    "N": "b801b8775c8a8ec476b860ddae3890018135fc8a9c5c4e76541cc7c4463e8e4c4cbeb3173f6c3fb5abdcda48f9a5d1580e426bdb6b7adfdc0c01bd8115a5b033e7e29971508f0c42ddf72d06eaf22608520c2547590fcbfa67af7b4334d78fd83e2934660351a4dcd634d7b36135006e0d9c72cb34576f424fd653cae17bb92ea70873cd9aea0aaa3ff750076a8dcc1bf83d3c71a7616dcd1125e0a828773601ed34a07b95f1b3d4ec4feb536525bdcbadee2d7cba30bc837f64195d47a74ece9b0820a4ec97f639ff28b63f0ef6ba098198cb2c4335323b211e5942208c59b696f39f4ea605d417d5ce857902cf8624280ad13a74644354af786683c638c08b",
     "NT": "c1b8aab9caaf1f9021fcd135ef022089792684e7cdb1467ff522e46713609e7ebb633f19ad52e597f7dbdb59f6684f204f368b7104116a1fd8eabdc9ef7eb4b64867ad1f007f74bc57f2fb77b0b9b518af7df355e7a5d99217df442358543b76a51798e8ef194437fb4b58378943cc812942805a0b3d30eccae13fb56ea3500a781549d1d6fbd0b2ac57d63aedaa05987298201d8434b6e51b3c0e75bbd7eeb3cfbd4f79d28692110738954720784d269fabf4d4280d61e4fb8581803dd75e1be888d29d8ca419b68ea9850919c0d5563104c084f9fe0730b496b70612aa131b20b951ea8eb61c30b186a684698f22bf09d2b02b82504a1cb3491ad01fceadad",
     "H1": "8050d241f017da386be85d6723958d518420007ce6b8431cf4ef8846449efdfcc6df2fa53e52b6c6a11925ba6b61da61f71dc57c436e8e3001abf692b79eb5e5909c20ffdaa42b15d39bd09304396610898d5e7e7454fb70bf03f10928f77c8bb08343c7c771460d7f5019df3c6fc08ea3ad220d8686a8dfe77b839422413b93f0b904ec09e74c32944fa2ac3c50a43acbbcbeedf8f2f683db79ddd03458a35a673507fef917e82bb1ec3828b16401ec65a20de4bd5311794db8b56d7f2c52a333ad0804f1883559614686cb9e6c72e6019ec8ba6e0a4496127bc145077700a2c31dfc89f395af0fdf0b68d8d434baed63fce0500f800463f251bb6474278bbc",
     "H2": "607b0634e80c24da87e49ca4d82024653d3252696a5a7ec0948d25a0a255d8d064381b25d4fef287ad7a19673288a12d01ab158652b2af942417a086de6dca57d27ddf421037bed2f602d757f9c85eac55a49b4973e61735acdd6d803a21e7ce2446adb19fb3d6a9e37e20fc2ad7a5d796c57f0a9f8af27b023e921801c0e714409d2a87eea5bcc5e9416c02e63b1d00f95ead4a564d78ddecb456932365e034931c953b5681ba862b3a575eb3322ba09d129c262e5331e720a5cb7196d6fc5909398674a9b13ff98ff097e7595858f7bcee029e1b061824da423ac5561055db5e69905d94c001074f0f5ad1aa713bbb4844beaeaaacebf834fa42cb73b09b52",
@@ -29,7 +29,7 @@
   },
   {
     "TEST": 2,
-    "G": "9129e1d814e72df5cd31e2c2fc99b6c873362f5f057735f418001374f2013fddd8312c84f53b8c44af68cbc0bc9c1ce8e78038037e895fe5a2f79394718370dcf98951688c03b441d26c871f9f7a02bb9a28a102275597030bf3d020a3b1596f92cbe0c94a4adf6382f5049da1e02c9953067320ab524bcc85861ea46d807d7fc0836a807998927955486986d83846febd37d92737430e45f8d9269d45f76cdeb0a5712231bb892d5eeb9301b2f30cfa166b6998fbbcf4f0a19ebc550341c29500e465cfc2ba8cce80a1c9c0fe14c5f300ea25492dfe5894cbc90b3c17b7b99424e9a5396ba6c062e9a31f058176fae1451771665bec9f6b663649d259be049c",
+    "N": "9129e1d814e72df5cd31e2c2fc99b6c873362f5f057735f418001374f2013fddd8312c84f53b8c44af68cbc0bc9c1ce8e78038037e895fe5a2f79394718370dcf98951688c03b441d26c871f9f7a02bb9a28a102275597030bf3d020a3b1596f92cbe0c94a4adf6382f5049da1e02c9953067320ab524bcc85861ea46d807d7fc0836a807998927955486986d83846febd37d92737430e45f8d9269d45f76cdeb0a5712231bb892d5eeb9301b2f30cfa166b6998fbbcf4f0a19ebc550341c29500e465cfc2ba8cce80a1c9c0fe14c5f300ea25492dfe5894cbc90b3c17b7b99424e9a5396ba6c062e9a31f058176fae1451771665bec9f6b663649d259be049b",
     "NT": "dfbdfc2a4784522a0bcd93a9925e2d185ec9af22e3c76af9e3a55552ef2d22e01c3a9e5155420383305ae63787a6451f91d2ee741c24a695272fa1f3b7ed6830d7c9f519fe3afefd97b956029c9bb781ea3efe49bc9cfd911dd132f7b1c12d9002fe73782c148b299144b664200246b3a5336b46768afe63e8b508efb0aeb71022e27307663d1ff104865310e59edeb9220630561530a7de5e3c5a74abaa4549b80d37e851c8affc44eb1024387c63a7854346ba6cf9c9305d04350b93db8cde33c3260789feff3b3c4d55cd50216e4473db4fd83d138e6bf25a9d609f010769895dd1844fdaed0cca3a773ecb734a6687ec07422d5ec7496238cba08fd08fa9",
     "H1": "8b8efe9eafe8ef40ee9bcb29f015772e7ad5e9d11a1834e2cf429eee910f8d7079c13d7d9abb215efb88fa07bc34aadc43c27e737021ffe4f0a3871f457abc8f6738e9c9143f3260a7bab73fc8b8f443434a34ea33581811ae2609f772bb45bdd15114039729c075b00fea87b8d16628cbaa91aac1bc3cf385ad8e440f172a68940d7ea20b633818dfe79b5f1de2e2bb4b8e3522300f791b0260d879832e6f1068f1d031577400050e23e661f26dccac50929b416a5e835cc0607919596b128ee3a6a84f0720a1dd4dd7182365e6bc60801e355b03bba8692477bbf38a245e2d11a7a1fb1f4c367ffea9a14a32fed04c2a248b53993038877b0f9cef7f483507",
     "H2": "bbcb60dfa5cd7b240c856b57150716cea5d0708db5ed5be68bbd445da8a457499800c24836fcd545ff15f030c6acc2b57cbdf62a1520a3794efb8058c8bb9251625216d6939441d0517ce0519dd3029046361560cfe0126bfe03b9b9834835e3822d41c7573fa4dcf9d2ae68016b9438815439142021ebfeea3ca58c055b00d5b4d7915ffa32355fe1d5e38b165accd483d4b747e035f9d45285a2b7b71fafd073f905cb2fb2033c386bfc2cdec064545e387ec0820bd81e21464fba6d8c6b949a706b44b628258b6dfc5567b892f362fac8a08cbabfa9432e6e67e4c22a3ab8ad53ea3fdac33db9782c56569475bacd7044ed4dc93a1c2d9e954872d05f4872",
@@ -43,7 +43,7 @@
   },
   {
     "TEST": 3,
-    "G": "a5ee8b6391781d2b9118214e68c595a0e78d7dd1a72de4a6c95f031251dd8448dbd26e5f2e4f020b4d2c00a5358f9f611c2bae884b1f4d39114bf8390d8cd5a207d092c84f18c89c2a83d4fd63e7e1eff5cf93750404df72d02bbe608202f1ad0f647f923f7f0aece4d240244af910e66fa0f47f69c3ab180c8f594a8541b1bfad3f50202734ea36f18337ba5045d7b9b48e8b2eae00c03501a1a2a8a576a1d193a2364d2698d8a0329c44d18d31c54d1ce0c68e3dffef9b9fa069959661b69e3d57aca56f02c928bd0e23e3425d0e72fb51e564a729f992199fae4d4fa0bd37375d00eb9d5a5f83b84f83d5134cd990bd8365c78fd3b0ce239dda1ff83e36b8",
+    "N": "a5ee8b6391781d2b9118214e68c595a0e78d7dd1a72de4a6c95f031251dd8448dbd26e5f2e4f020b4d2c00a5358f9f611c2bae884b1f4d39114bf8390d8cd5a207d092c84f18c89c2a83d4fd63e7e1eff5cf93750404df72d02bbe608202f1ad0f647f923f7f0aece4d240244af910e66fa0f47f69c3ab180c8f594a8541b1bfad3f50202734ea36f18337ba5045d7b9b48e8b2eae00c03501a1a2a8a576a1d193a2364d2698d8a0329c44d18d31c54d1ce0c68e3dffef9b9fa069959661b69e3d57aca56f02c928bd0e23e3425d0e72fb51e564a729f992199fae4d4fa0bd37375d00eb9d5a5f83b84f83d5134cd990bd8365c78fd3b0ce239dda1ff83e36b7",
     "NT": "a86824e86c82674f33904dbdcb24e39d2464f3f906a90702ae2af8f71be38e87cb974493dbdfc40ec9477fde12be9f9c3d8ce49b31a9a55e8e7b56909b263106025cacbb8d454375f0078689f2c7df41e6c0a92a10aee5e53718ff1ed4ce08ac3eeef87d42e41e485f457720dd0173bea2d6aec0c6aa0046965e09c755244bf365c92f884dc2c38c415e041fda53b0226147ba3d8ded0b8d1cfb36f4aad7b98cf24f46dcbc6c83e9f40aa44d50c3c0cabc27d4c52a0c6e6fcc4736303bb65c5149a7a263a4524abdb512407a5a84267ee90412aef31d81251e20ed3735ce6f3ad0051138b21f58d95dc0bfa1b73b5b5adae3548d5a160faac4b865a2b85b0c6d",
     "H1": "252e34c0cfdf60a78d347c737a56540b21f628ea2b4bbe053b205735396dad5a3986d87e70ed15e58a877e9f7c446688ae8359d93633aee584459e858ab1032df1bf180515cd8df4a0f367f59d3240b8f3657019ff395f1cc7e3976616b917465edbb8edf928b6a344a510858b019a74dabad05cd053ac2a7c5b60f49bd93dcd0444071cd66f8be36a73bd7a541dc7ef58b00562bf2543091e8205c43d843d5eb7066436b30b95e0b788d48c32a3d1e6095ab03ac5f2a92a2bebf3d6f8dc5aafcb1d084aa5ecbb83559588dd1e5f3417943afabbef27dd30ee67d42c86f7e3550955f829fc9af3f9efe15246a7e80071f4660eae20ab0cda22538bddbec34caf",
     "H2": "22bdc357948ea906d8ccc3cc96dd8c1b36b33e117c2c640c2a5aa0d5a96c202ff6ebd428388dd31921f36b2fda41691cdfffb8ee6252f5d16d253b4802e772f4ad87ff753a29e861562d11d6f05ca6e21c83ca54b9c9845836e3d6e834e8aea3d1e36225390fef9ed0a596dfa54d72efa5a4cd1be094f6a57d3d020b28198049e179340ee25fef5be429c9cb66b10cb9cab927f41e46a408a12da2d5a53e2c82affc5102ca1d39e5c164f0a7cf9e467ddd3975301eca0bc023b8eb5b3695cec81d04e79f8f61bbfaddaae6345fe7dda078bcd70828801a7ae0d20bac47aad3a9978db5d226c88f73b406e65f8b542c515520002b6b3d1e605181e25d85d8724b",
@@ -57,7 +57,7 @@
   },
   {
     "TEST": 4,
-    "G": "d48dfdbc4f250471b611508a7c7add5a7244db8b4a6eb1c3823c970a39a6c6c60b2408854c8fba5fd12e8ed9584492d4a46a8150d2e3f30c1febd3d843a253927656facd573a662ea6bcd8c35c91e8367951915c7d51d84fae94d8873d2b6f244f659132b8f56fb6a8719cc11e0e8b3dda51faaf301a4945553fb692648fc68d9d64c9be1f358c6839ed2f9046e41374b66b7022a2dab66ff5dc3a903183447e21e503ad8310ce6bef1fc957675cbddb0dbc1b96d092958c88f16510ff1cd1f89e24658db3304040c6d2bd38df2cb298f54ecd8ccc96bd75b172a7ad74df8487aaed5d7352011f0fa7c5d6b0d22533b5ee695fe89f98dbb6448bc8141a86044c",
+    "N": "d48dfdbc4f250471b611508a7c7add5a7244db8b4a6eb1c3823c970a39a6c6c60b2408854c8fba5fd12e8ed9584492d4a46a8150d2e3f30c1febd3d843a253927656facd573a662ea6bcd8c35c91e8367951915c7d51d84fae94d8873d2b6f244f659132b8f56fb6a8719cc11e0e8b3dda51faaf301a4945553fb692648fc68d9d64c9be1f358c6839ed2f9046e41374b66b7022a2dab66ff5dc3a903183447e21e503ad8310ce6bef1fc957675cbddb0dbc1b96d092958c88f16510ff1cd1f89e24658db3304040c6d2bd38df2cb298f54ecd8ccc96bd75b172a7ad74df8487aaed5d7352011f0fa7c5d6b0d22533b5ee695fe89f98dbb6448bc8141a86044b",
     "NT": "9c9bc9253874a40a5a355579224cba50de2b41b28e6090aff68358b3b427b6c1d380dd159830af170deb982bc00eced7f4fd1767584d8c2d9679112404d565caec1ab17d20a2f0266fdf318a98cebd98def0aaab434e5de8e2231f899cd48db142b2893bc3c61bf679e6ab1132969cf78764f27b42fc2fef54d08ef578d8b26fd6809e65540d8433d3d7624a0932b80a71733788371789c3fbc6328020e844e8b9630346bae67e04b6ef762321dc75aa4def408a27ff0b2954a7de9c6daff0a21a3081ffa60a98af89ffea10337c6a8644afe0f5072cf1748fec2653337a85a8bee2d088510863383893c86be8d76682a5b1d4b19fd4e7a040c4c50d14bfef49",
     "H1": "034c5940d7cc492f6c479f226eeac10db123df64dd085a6588862dfba444e3f2928c204dcab8419c33cabd3ee2fb01091bee30de4f5e40ee26f8d28008845154c40f650b62caa70778ead907dd5fd26d98210435d5874a83de0842b87708fe1ee7c386a219a7e02d0aa16d36d5d2a3586bac9e88a3ab225edb67746f6c3e372d983d41c5af047066804dff304e7f2c8b812d16f7548f490b48b013a1af18ea3a67b840f25186ae2d8882f5116d762fc02742e1517073b7505b019cf392eeabda00de97a2319f8dddbc240ab4da079c4177db7659f8b47d312a3d24f5b3769942a3b434d38f2d92c19a4d3b186c105e46bc7cf1a8ef204876ebaec11a1efd7506",
     "H2": "96aac3c3a74882d292b1ed765f1c2cbe7ff1a8a92f237fade8e03791984937b7c4ca3ff3374422ede93056ee942496e6e5296771916c296ac9960da39f85de3c440666f6220efd7eaed20c10cc42eb23539b2d8087ec6ef7fcb117b0986f18652e15297cd1b4a18bb9f9ea1eea40b358effbb223c019be2fb5e9a9d6c39b7df9bc4bb2ec55610bd2f0ffd907d3ffd789982f3213da9f24fb75bdd7008b1a51000d3b17ff1a5a8e232604cab11d5d7ddbc98c219e0ae551ea49a5884fd9e5579366a270d746bbf7faf465612e9996729bdfdca44f8f2611c4baf9e9fe4c83386b13f77c8cbcc335fadae19025677cf7d4f35067763a5c89e2564ee1e7e3ec12a3",
@@ -71,7 +71,7 @@
   },
   {
     "TEST": 5,
-    "G": "84a717f2853cf21d3812d6ef4662d01152976d8920e0f45b888a02e6ee8f75a5cb38c900cf2066d3a56b985b801a65ded7124757662ce3423863875faea832d7fb9e774fe9b43147638cf18b93162a3f301723339fc56936c96d348d65ef179575db56eae2ed13156ed62897d0942330b0d433701dc56ef5ac813bc34a6248bb63156dc71a10964581e1a09a56a747688ea9df7a8d4f67842e529e4a6030040f5f34e083b0e061ad1750f0329844b35cb19091904ddad2ff21efa3a1efd224b6aed314b12d813fc67ff1c889e88c2053743518300ac56cbce6cca5abefe9b6e1ea64b7733f4cdfbb5aabcea7d33e64e09b5843bd40df8192f275b1efe353de32",
+    "N": "84a717f2853cf21d3812d6ef4662d01152976d8920e0f45b888a02e6ee8f75a5cb38c900cf2066d3a56b985b801a65ded7124757662ce3423863875faea832d7fb9e774fe9b43147638cf18b93162a3f301723339fc56936c96d348d65ef179575db56eae2ed13156ed62897d0942330b0d433701dc56ef5ac813bc34a6248bb63156dc71a10964581e1a09a56a747688ea9df7a8d4f67842e529e4a6030040f5f34e083b0e061ad1750f0329844b35cb19091904ddad2ff21efa3a1efd224b6aed314b12d813fc67ff1c889e88c2053743518300ac56cbce6cca5abefe9b6e1ea64b7733f4cdfbb5aabcea7d33e64e09b5843bd40df8192f275b1efe353de31",
     "NT": "b8d5562cebee1ba65ed1bc96f5a10d7f76f804ff76065ae71ef8e9224c1e8ecaec249e4ef4794053866b9052780ca0adbb656e56427d5e7e041b358a5f23036655a3bf3d180a5795f1aea576670ddc9ee3403dfa1c17babc5d86bd569c8932e404d727dd4ce769646413617a00c11527d40ffaff50b205ceb73de9591a3e614c65f92e1bc01d6f78bc8a7bc349eac9f4d432efa76be3a18d89f49abe6ad2e8fca17a2f100103e6622e290adcaa7b9d80b5fd61c2cffb533de4b9a8c8a0376a595c360f193319bce77256812e972f1e4bb2e38895783f870f7958033a59e3023224da56f5479d6fd8d990d361c4b28987232ae33fa84a24ebc5c041e78b5093d1",
     "H1": "8813ac8c401e067dad7f30de169b86d8e94137d5880b748b2ca96b2b3e04c70985d0fd22de1270870c51cf4d47a4bda6e993e2e9238e659acfac809313fb3ffe872966e875a20237cc2c9d5daadf90f6ed63f9c2398609122541f652a1bc8d08d2519fa3a260ed5e4b9be2be0b008605ce7e6cfbad1fa67187869135e40191fc018d5f125a924881dc5173f0eedd3fbb2dd7c3528ef0e015f5bcd312397626b0e56044e88a11c9f6bfa162392dfeef8b1884edce2cbc563fe519e1614c8b1f64a48a926a0448aa9cf998c20bc0f0ddbb7a0fb2adf32527896be21263a1d7bb91d2486c2ca3fa9c23b5598b327b932179b69b30f50b27684ee962419ca7691eb7",
     "H2": "8d4bde65d7e3a6663aba8ca06c3a2853f60c6df6e18a0ae845a889d97e2406cd564ab087c56483d049ce976277c14b0b7384c64f810466b86d2e0532b95a972d41c0494e57e2747cf6271bbabf43e4169833e76b36b1bc4d067bf4777dccff36432e688322168c8a9c057fa6adda30a0be0677f8854e1381a20cd4b77345a1ff76c25ed3ab6f47e1ecef81145143cc4386c93d899261c1efd57b57a1321ec110c04f193136e6785d398d64562ec82d07e00c7b3ee8d55caac7bf9ff14822c25ce5f5e4d215b6bc9208f25dd45918840ef0c349e3c013bbee3817c96803d8ab9154b2a68fc8272841c9c373203a67a6885d952e485e818e4d3225570be2732c0d",
@@ -85,7 +85,7 @@
   },
   {
     "TEST": 6,
-    "G": "ea316e4581e1ee206e299def9bdbf248136e81a98a195b99fcd17f7a8ff163f6bd583d935705779b587c6c9bdbf60259d265fbeba77a972b5cdfb07e118792f6f38d3c8c9a596cbba130c989c7e77ef2bad73a2b71d1514aa1ed6c8a723c2fbcfcc933eb4e19c6bb8d50704aee1e17ef59a8ae872f67272478d74974a2ac7b325a8443b0b0703e567bcec3b2a8b7d7a2cf4e91b0ac20057ed68e79737f29aa0efba6eb67866843c9437c8b46fb569f281a5fe4d440eb42425220a6c34a65bac673aa2581ee20ab27cdd7c542ded864765c4c053df9b4a430f206d48afe7648805016d259bcddcf271b988b18a57d92119fd4aeaf9049ae2eb5faededff798d9c",
+    "N": "ea316e4581e1ee206e299def9bdbf248136e81a98a195b99fcd17f7a8ff163f6bd583d935705779b587c6c9bdbf60259d265fbeba77a972b5cdfb07e118792f6f38d3c8c9a596cbba130c989c7e77ef2bad73a2b71d1514aa1ed6c8a723c2fbcfcc933eb4e19c6bb8d50704aee1e17ef59a8ae872f67272478d74974a2ac7b325a8443b0b0703e567bcec3b2a8b7d7a2cf4e91b0ac20057ed68e79737f29aa0efba6eb67866843c9437c8b46fb569f281a5fe4d440eb42425220a6c34a65bac673aa2581ee20ab27cdd7c542ded864765c4c053df9b4a430f206d48afe7648805016d259bcddcf271b988b18a57d92119fd4aeaf9049ae2eb5faededff798d9b",
     "NT": "d732a7a46bf87b14bc8a80b47a2867203148a8e6835f02d0788a0624a0161fe67c447f4e542bab2ebc19afb9a4c279f06c3f3797ee6a98bc86f9ecf92118547db3c8a7241e3f184934d227b408f68958cba730b5889b159ef3f75f466228788455fbfecba32d3e7fc1e384b06d116b6f1403ddc9c0974a127dbfb009378fa38fd5042831da323fc7b491f98e4b9dd143fc3c94c339316fee2ead9f19e25047fc67f8ea8b3b11959f544fbdef7da6f663513cf4946d34990d989a8caf60112ec6c1278430715a53c0374d7a1f3834cdd1fb4663637f7a09398ea45950ceddfe667dafbb963f617513f0c65ee0588b85340e268df861369091b3d2d51d963862fd",
     "H1": "d41d49891663dbcc01e437dce537ff0725ae0401feb751c652cd15987704b40cf761792d35dcc120b4a56b30cb57dd24e7fcabef53f12dfb0aa79c5e913d8783d0598cf0c34223d0689e63d3bd6f0f13e7531cc2e1000916ba773d1d812af2217b7bed40b52fd4ff682b56c443790974953c3a5e8d907afde8cc19545f1d3a91f617250d9c7d0a06f1bd9596e1a549c50c963e3630d3179bd1ec0dc2fd36a7cab7a2a623c1d387cc1c3a583aa2a789c8f7309d1b7434306244e644a22037bfa2f330fc3ff4baf09f666010e10837f729e75615d36b0f91b46c4f654860f512e12b1b66d23f4a2866d1cb69eda14af2ea3aa55d6e9dd55cd908e651e3fa02b6cb",
     "H2": "2f538fd8ad28a161cdba7c7669de01174c4452df973a9c68500d16980ec3c0a94cdfc32375b861304ba1a23e1569af4089131add6b1b049c3a942b9bcad2653feb0e19fd53f5817ea73012882e646bd79ab2dd4bad1abe0f33448efc6802bbb6527acc6a18446ef108e38eef8ff4f8ba2c19a625eab1bad018543c4c2abc2bf8e93b644732d79d87ae4e2b74ec09e988e3fdf096b225ebc7a71086fd07487f732a1030ce3f4e60ff76e8647671b165836aca29fe316119b85502e74d901f979fbe06d8e58ae7fece7f29fce552239b0d2304a15d6a86dcadf0f92481475a90cfb220b4b839a0025a9d274b311d00f425676232fda3267ef67c4d3d876e83286c",
@@ -99,7 +99,7 @@
   },
   {
     "TEST": 7,
-    "G": "978b98f54689b59662055e4a8875896edb02e7abc6ce777ea9bf9aa2198c3a966bd4d54458db4a3f467eaa34bd33e4ca76b1b921fe4478f88a984c15bbf5a55226c7d3902b480ed6a82a643fdaf09496a97a354238788d217cc3aa52e0203aa3fd367a8b6baabab5fedd8cb175d8aab21f01c4d51a55c89f8a4d34bf0754375f2aedccc90ae5ca4450f333ff943db0f3178cd31a4c04d36e2162c7359a6d56bbd67b4828815aaa7150e56c92a106a65fe2a945828707225c1f2c036635b74ad1068aec49f414277431c34af777a25d5b520fa5c88c873dcd72fb11f89065d4da184c2b3f4a56c07ffc57331de19dcaef46f805074eccfce47ba240341c87885a",
+    "N": "978b98f54689b59662055e4a8875896edb02e7abc6ce777ea9bf9aa2198c3a966bd4d54458db4a3f467eaa34bd33e4ca76b1b921fe4478f88a984c15bbf5a55226c7d3902b480ed6a82a643fdaf09496a97a354238788d217cc3aa52e0203aa3fd367a8b6baabab5fedd8cb175d8aab21f01c4d51a55c89f8a4d34bf0754375f2aedccc90ae5ca4450f333ff943db0f3178cd31a4c04d36e2162c7359a6d56bbd67b4828815aaa7150e56c92a106a65fe2a945828707225c1f2c036635b74ad1068aec49f414277431c34af777a25d5b520fa5c88c873dcd72fb11f89065d4da184c2b3f4a56c07ffc57331de19dcaef46f805074eccfce47ba240341c878859",
     "NT": "c031847390333f4b8b1fd0bae9a57ddc4b34bb9819f5285d08d0943db0975b61a43286ca3f83e9fa8768d670189f6ecac37cc2b5ab7e1ec3341c21b5c66816c0ad65a3bb2c45825f85a53bb40b31a89c9ead55706eeb55f8a0819c8b3a5489de0c5911a3a3e9ebf42ea1f9cc152401419e33a7e15f8d3abfc4739890374472a2d714e17587350918ff7c82d9be44f5541f74a7de905b4dc9d0c8333fcd185982a5e7a9304551032115ea99e9cd0e33a9b0c3086cb296719394f95dbb0927d4857f8c4cc4d747e0fa14d1d8478a31a124607a91c7694d511e39c295282ba72953c1460958ade560cdd4f53a4a4191aa5a4711cd9dda12f3f778f09b8d72b161ed",
     "H1": "79aa8c281562a1f6430152e6687d777cd6dfcc99d5bd3a76d29ab627804280b73277e72597e706bebd179b51547a2bdfb136b3e6986a06342b1d87182fe1579ef5cc65f0d597badc844e89a44b405a30eba053779666423a867d6787f4f7da1dcae572d2b69d238b729bba183bcc7c78d65fc237e0163a8f479a2442a5cd0864807a7e38c24d95a4e72fb4e008b7adb5e63e2af8a37e7cc1059fb6a661f7bc21ec01bf68358d4439ff79ae6b8b46c3c5046a0fbf50bfd96a4160d07c5265775953bbe22621c100872c4740210662d3c37e8dcc74e6f37372debec2d81e9ba07cdc7fae47681c82c57994ac3d90aa93a0e8e0af8887b10b9b107a9de4775b1e45",
     "H2": "00040dfc291dfce393e7e22ec4a778e892dc3eb51c0a31fbbb06c3117442f71cf992bd1617749260624e0cd07f4f27ed44a73a78728731a023193f906118acc068a3b8d167a71db07e7b2ccc549790d714392e6f80119ee2f0ec174785ecc8f68c715900296237a582db29d901ba898a35fcfff3919354dcd461c17ba8e376887c24098270beb429ba142901a93dcddddabf1f59e62ddc0ee5e6dc377d6a20b56e85c2c577d022740e74f1c9363f0b184212299c2cb3c95705630f7221054c4a2bcd1c87c103eef6ca09eb53dff6fe04532085dde5c037db5e3f456841f154b51169197a722e209be1a65f8160d22ac93dc450a2682fe4ebcd3636ede8a028dd",
@@ -113,7 +113,7 @@
   },
   {
     "TEST": 8,
-    "G": "ad40a06643e7cb20e87dca7867fb821b169f1cc49c58fffe21c0b248c1817945985f0365ebf637a96ee822d2facf7c434403b83b7d83e33e44e36c17e9e2f8a535a2a3babedca297533245198b5b93c8e716ba9cf3b7c54a6e8f9652970e24507be63d0dc659e3eb8e6cfce0eb00d8195ba592755cf7ce7a2502e16ac7c79be8576af6751189b0e6217a3961680cc02e2808332af121d4d1f480ae3e17751e5abe58dc0ab4c4485512a823b046f2a5fb93ee637d990b0ac80a16c6c726534e6cafdfb5325850df4f6be68662c127afaa6c89777441dd8fd1fe616e86452cb47946ec9257e1838d4786cfb716725dbc65c7d2a4271fa39c851ecb873ec9e7dcf2",
+    "N": "ad40a06643e7cb20e87dca7867fb821b169f1cc49c58fffe21c0b248c1817945985f0365ebf637a96ee822d2facf7c434403b83b7d83e33e44e36c17e9e2f8a535a2a3babedca297533245198b5b93c8e716ba9cf3b7c54a6e8f9652970e24507be63d0dc659e3eb8e6cfce0eb00d8195ba592755cf7ce7a2502e16ac7c79be8576af6751189b0e6217a3961680cc02e2808332af121d4d1f480ae3e17751e5abe58dc0ab4c4485512a823b046f2a5fb93ee637d990b0ac80a16c6c726534e6cafdfb5325850df4f6be68662c127afaa6c89777441dd8fd1fe616e86452cb47946ec9257e1838d4786cfb716725dbc65c7d2a4271fa39c851ecb873ec9e7dcf1",
     "NT": "aa3a57faaa2d2859140344aeeb482e83770b6ea2941c4bec7780251c6bdbd2aa247dedeb19642a8cb55f03ba8d129ea4ef10314f9aa73bedafa112afec5dcf54f90e8319cf8bb80acc148bc34cc8d731237a114d9d088ddc89d419f3180a16793dd927e77258e35260d7885aaf53e7c1338ec3e068bcb8e74e244f29caf01bd3b7da0d08a12128601c353b634bc2a85874d86d2849d69987461a68b670b7d414d7c1a6e0cb1f8aef00e647032b44c993f868b6c4940ee7f0b2c5a4ad07657d9ea889bd90aadca65e845af1a3ca449409939b5df9fbf28036b59c44bdb1d24a458d15976e7905e614fbc779094b612415925588398c3daf1d6536f08068d2baf5",
     "H1": "6a15d7c3f04ab2a11ee5447eed938794d231349b5d83774618a924e7c04f806fc0ce273bd23d35c8033d53b1bad8e383546f65d900036f2e306d9a17d60b61ddf96b151b1b9bdd676bf4aa85d38733cfc0f17c8c65c30315ecbf4660b663cd2317fe39f33a18f5395363f483faab94b76a3b1eca90a1b633c0c033bf8018af85f5a5269ce72e86df0b42aa4d593c389490cdc202ca6e440e09f7b8177287dab088b34c3b6cf2cd236812b3f9a6b0221572afba2b93094d9a75c18d4d2c1004e02bb3fffddc7aa79ee38dd1562f7ef50150cdb030d05d35dd190e88685a4d5574e520ac5ebe974680797fc678ad7dabc2699792b7521478d1fbe51b8a27e0c607",
     "H2": "4e5abd7c1823efbba423de6131683083f1de406cf1aa4534990b16609d220428c0aad92207d0f109100f5a3b10c18634153e1cbb36fa16162f22531ce21e44a2b6c6087675289463c0bd2a6ef833d9d7d3ac034748acac91f7979e055031949e3c73ff25ccf7060acb5580892babb056677e6228820bbfa8413ce8e8e7ebce55f29c8ee7a59c1e92c5147ee98f931bcd83fd16c394043e2857a0de9aa0ece1db334b070ab538245e6181d147789bae82cca447d27718bbc625e2f59a3a8439f528c170622f6f5b55b895eec75cca50190ab21cb7cbb52b7a2770180665860b90354f3910e5a7f33e222055eef4ab400eb21fbe629c34b66d7ac8594fad16159a",
@@ -127,7 +127,7 @@
   },
   {
     "TEST": 9,
-    "G": "e53525d37863db74d6af5f4c6a097bca51b2782438c6eba79afc4e8c03c55d8b5f6b02257997eabd7becad005806f8a4697c67c3d854aa710169e9cb87b153b05af331dc2d33d2ace4fa931586ee2e2ee6aa5caf5759239d00e3ca01f28ee1f00f7fc012eda7baa2f09c1df3ff98ef8e2d33278d56cd479f620b26902bb475cbd7f5cdba951baae0f1a0c845a80fcaab151ce457bca70c35b6b25b27279a20774634d91df114c8060c87ced315863bbc12aa01410e9b6f1098549258ef71ad0fea220974299932aa7847cc2798a4d34aa49b90fc65dd40094c4e36a783ce8888e0572744d8aa4063b2e1b97d415c180e9dddbb1eec0229e843b69b4ec8b739fe",
+    "N": "e53525d37863db74d6af5f4c6a097bca51b2782438c6eba79afc4e8c03c55d8b5f6b02257997eabd7becad005806f8a4697c67c3d854aa710169e9cb87b153b05af331dc2d33d2ace4fa931586ee2e2ee6aa5caf5759239d00e3ca01f28ee1f00f7fc012eda7baa2f09c1df3ff98ef8e2d33278d56cd479f620b26902bb475cbd7f5cdba951baae0f1a0c845a80fcaab151ce457bca70c35b6b25b27279a20774634d91df114c8060c87ced315863bbc12aa01410e9b6f1098549258ef71ad0fea220974299932aa7847cc2798a4d34aa49b90fc65dd40094c4e36a783ce8888e0572744d8aa4063b2e1b97d415c180e9dddbb1eec0229e843b69b4ec8b739fd",
     "NT": "e2d11074958171a031686ab23db36f285b0e23f889cf881e66cfaccbbb4d0800fcc9972dc3469b733f0abf4222ad4981eeb748d23d82d8d2be337315b39bb1d87fb782cb59c3c21b14b05d1ba3e080f21c91be2b6a4986e961c03b405d4ab0626f603a992e450268a857e20acf91a0bc913a1d318240cbd8a4a3562fe0f84028931a63df780e9d16f756de3cb837e30412916c0ae01a5f491de64469b7a29cae5b3030314a60ee75d4aad22e0a8c7c523324e3cf402a865815e2f7bc2d51826dbc13527b9a6702f60416d0a72178e82f0e9e06762bd3fe78d4ccfc167e563ffda9bcf7b3eeac25419704d2c7a5e194eb571018529ab69ad6dece43ebd3523145",
     "H1": "2f1a058cd9175dac9e51716a757ecbcbf357ab90688d414560f57c3c9e33695eb3df617776281c386bd519b26fcd8404d73b2faa1c04cd1e400725a8fe3444bb91fac205dd072d42bd8a3e96a1bbeebfa73bc959b7751a2ccddb7586e1fda04031c08a13f31d9962ae9ff50e788afda6e43a985ffd07efb90a00854a7348a5d6b57d1621d6dcd0276a08dd4315a9d7496c503ed94ae3750b724384164acfe24450a96a1a68ba10216e34e9dd3b2a5fb456dbef72f386ca68592bd842937aadec6f499bb3ed9f80c955ab0e831bbc350a7531b7563631e45afa6ddaaf4143b3a2d5791a6b250d80f194f4016dec36f534d9598a575507257d093909613660e19e",
     "H2": "6c147a2e17a0dc8c99e7812fc121e9ef23598663de0094399d52d2cb71516b8e7ffc71ea46925184fc7e84a2ddc760b3fe1e2fcfd9700081cee76767a606019b79f8004bdbc82bc20ea6daa8715e16dcec08e09cab7bba9ecd475f3c906749d779a7db94f630ce7691b79c44b7c51aca6f7270d4d9adc842db26440f4fa9b4b2c9250d9ca65fe85f70b2092dafb59baac8db0163ca19b320eccf96290683fd454c7d9bd4e590d3397063923bcba9f90cb05dcea39773af82b852c056d8184adcf3f33816f395c4d00299846ec4ef449309331a389e2e906b6c402a7f34e27004b18e293b9b0837ec693a918dc50a39d61122cf2f20f8d8ce438ff51f4f296238",
diff --git a/testVectors/mta/mta_challenge.txt b/testVectors/mta/mta_challenge.txt
index a4c260f..5fb7dd4 100644
--- a/testVectors/mta/mta_challenge.txt
+++ b/testVectors/mta/mta_challenge.txt
@@ -1,5 +1,5 @@
 TEST = 0,
-G = 9cd517455aad477a317ab3a141282e52d40ab61864fe0fb683ac8f0f5096c9a7ba886ec715b3d86be08ba60a957799f2f6f6f927a8c14e38e8f8400193bdc8fa1dd9a1dbc24e50796fd481eb5fe6eded842ecd3924847924b77a4f53ca7ca5731a1056e9906d3ca58c66d454db2ceeafc2aae8569dfeb0ad39929082969841ced094a67182bc61d0d93dd73f453af4bf92e2bf13f4fe0c5243089f0983638acaeb9fe509d15681db9ce637af5c7fa7aa1f31fa8451acf44730339b90a1099cb2cbbe65f003b5d7c72b6499d7050ba6e3a936b79586e32ee4e05f75388eb21480e40811b92cc83b09af75525a86c60f71f8aba989c6704693e6e224c68b1bbd68,
+N = 9cd517455aad477a317ab3a141282e52d40ab61864fe0fb683ac8f0f5096c9a7ba886ec715b3d86be08ba60a957799f2f6f6f927a8c14e38e8f8400193bdc8fa1dd9a1dbc24e50796fd481eb5fe6eded842ecd3924847924b77a4f53ca7ca5731a1056e9906d3ca58c66d454db2ceeafc2aae8569dfeb0ad39929082969841ced094a67182bc61d0d93dd73f453af4bf92e2bf13f4fe0c5243089f0983638acaeb9fe509d15681db9ce637af5c7fa7aa1f31fa8451acf44730339b90a1099cb2cbbe65f003b5d7c72b6499d7050ba6e3a936b79586e32ee4e05f75388eb21480e40811b92cc83b09af75525a86c60f71f8aba989c6704693e6e224c68b1bbd67,
 NT = b5eed17dc8d2b334110128bd1b19e58d97c3286e2505283a9f8d060527e8aa76b08771ca8b16ac020b4e022f85f70422abe7ea8f78a0e066188a2ca022a01af3ab93b7c39ba2558425664ae00a3ac13540b9e73ffd44973fd0ed9030850d242cdbd7c8825ef164eb04de336f3e9565b3b9fedefcf5269f54c68d5d2751bd77142f2ddbe3eda0fb68f2397899515057729b7ef88e7c8a459f88b39c33592cd2d95461185522c90c4d8b0feed1c9d4e1d68b7eff16d0439b2a687b24b242521ef3af8ed11151e3b8d50bddf39d90d0d34ba6a13ddec9b0b1cea034ac6c87d9e550335b8e8268094770d137d022d51122dbaaa403a9ffaa3258c8e1bedfc6ef6421,
 H1 = 2f96915406a7a08fec7da6f6000effe9ca4e4c7f8f76106e5813e6c392857f75114f5a6983f164f6051669943980936461eb8b120d482ed5bbb0f6867211db874fcab23165b99359bdb29c27f03f7616dd3360c4d8fa1616a0980536b3fcc4d81503ebbbed50bfd99294070fc7a84ce0e56129c33d17b2e67abf47d5db5e184eab4abc2bd16fc3c393a9194d446bf28144d3c083893b31774d195796757284eab783f63978e9367b06eb3e11f90ce5fbf674c2893733b7b8d36ae787d89e7339a9b58a93ebbce28686d64d18d4353053306a8a14e1b47ba1134b6f52284ca93f2c945f3a8903c7af684c0f7fd5d18dbd4b239c51d44f4c039ab8b31b592325c6,
 H2 = 4c20914184a0779ead339f8d5dc6582e3b55664220edb3f6cbe8df0a1ddb3972292a96b346365a8858bfca224ac95afa78ef641c461bef0bdefa6150a9357cad646855404274634de22c0201e40783addb5937dc0b48812fb7699e7cdb2cdb0f71830a130fe09b1e22e33a4a9764cc17a55744115c7aedcf5358fdc2687ece01183681bb479f53976776ac876b1987c955289c2fc6f2007d71e8be99ec03a3cd676c2765e04c1802ffcc19a4f53386b59f5ed4641a3df5de51fd4a569a0b22e562f6d5ce7baeba7e492fea809e0049973cef60384d6685af8e1a5c5f94a89ed20bd0bed59ae3b4fa6727e4ab29e3b984613b06ad9acaf0b36f52d364154ae890,
@@ -12,7 +12,7 @@
 E = 97ff490764f46501169280897363cc93ceedd2ad3a5bfdf346e82564d0307ddd,
 
 TEST = 1,
-G = b801b8775c8a8ec476b860ddae3890018135fc8a9c5c4e76541cc7c4463e8e4c4cbeb3173f6c3fb5abdcda48f9a5d1580e426bdb6b7adfdc0c01bd8115a5b033e7e29971508f0c42ddf72d06eaf22608520c2547590fcbfa67af7b4334d78fd83e2934660351a4dcd634d7b36135006e0d9c72cb34576f424fd653cae17bb92ea70873cd9aea0aaa3ff750076a8dcc1bf83d3c71a7616dcd1125e0a828773601ed34a07b95f1b3d4ec4feb536525bdcbadee2d7cba30bc837f64195d47a74ece9b0820a4ec97f639ff28b63f0ef6ba098198cb2c4335323b211e5942208c59b696f39f4ea605d417d5ce857902cf8624280ad13a74644354af786683c638c08c,
+N = b801b8775c8a8ec476b860ddae3890018135fc8a9c5c4e76541cc7c4463e8e4c4cbeb3173f6c3fb5abdcda48f9a5d1580e426bdb6b7adfdc0c01bd8115a5b033e7e29971508f0c42ddf72d06eaf22608520c2547590fcbfa67af7b4334d78fd83e2934660351a4dcd634d7b36135006e0d9c72cb34576f424fd653cae17bb92ea70873cd9aea0aaa3ff750076a8dcc1bf83d3c71a7616dcd1125e0a828773601ed34a07b95f1b3d4ec4feb536525bdcbadee2d7cba30bc837f64195d47a74ece9b0820a4ec97f639ff28b63f0ef6ba098198cb2c4335323b211e5942208c59b696f39f4ea605d417d5ce857902cf8624280ad13a74644354af786683c638c08b,
 NT = c1b8aab9caaf1f9021fcd135ef022089792684e7cdb1467ff522e46713609e7ebb633f19ad52e597f7dbdb59f6684f204f368b7104116a1fd8eabdc9ef7eb4b64867ad1f007f74bc57f2fb77b0b9b518af7df355e7a5d99217df442358543b76a51798e8ef194437fb4b58378943cc812942805a0b3d30eccae13fb56ea3500a781549d1d6fbd0b2ac57d63aedaa05987298201d8434b6e51b3c0e75bbd7eeb3cfbd4f79d28692110738954720784d269fabf4d4280d61e4fb8581803dd75e1be888d29d8ca419b68ea9850919c0d5563104c084f9fe0730b496b70612aa131b20b951ea8eb61c30b186a684698f22bf09d2b02b82504a1cb3491ad01fceadad,
 H1 = 8050d241f017da386be85d6723958d518420007ce6b8431cf4ef8846449efdfcc6df2fa53e52b6c6a11925ba6b61da61f71dc57c436e8e3001abf692b79eb5e5909c20ffdaa42b15d39bd09304396610898d5e7e7454fb70bf03f10928f77c8bb08343c7c771460d7f5019df3c6fc08ea3ad220d8686a8dfe77b839422413b93f0b904ec09e74c32944fa2ac3c50a43acbbcbeedf8f2f683db79ddd03458a35a673507fef917e82bb1ec3828b16401ec65a20de4bd5311794db8b56d7f2c52a333ad0804f1883559614686cb9e6c72e6019ec8ba6e0a4496127bc145077700a2c31dfc89f395af0fdf0b68d8d434baed63fce0500f800463f251bb6474278bbc,
 H2 = 607b0634e80c24da87e49ca4d82024653d3252696a5a7ec0948d25a0a255d8d064381b25d4fef287ad7a19673288a12d01ab158652b2af942417a086de6dca57d27ddf421037bed2f602d757f9c85eac55a49b4973e61735acdd6d803a21e7ce2446adb19fb3d6a9e37e20fc2ad7a5d796c57f0a9f8af27b023e921801c0e714409d2a87eea5bcc5e9416c02e63b1d00f95ead4a564d78ddecb456932365e034931c953b5681ba862b3a575eb3322ba09d129c262e5331e720a5cb7196d6fc5909398674a9b13ff98ff097e7595858f7bcee029e1b061824da423ac5561055db5e69905d94c001074f0f5ad1aa713bbb4844beaeaaacebf834fa42cb73b09b52,
@@ -25,7 +25,7 @@
 E = 69f74b339298ea41abb978780a877392933fdda2de884b1d130b7b19f84e8be2,
 
 TEST = 2,
-G = 9129e1d814e72df5cd31e2c2fc99b6c873362f5f057735f418001374f2013fddd8312c84f53b8c44af68cbc0bc9c1ce8e78038037e895fe5a2f79394718370dcf98951688c03b441d26c871f9f7a02bb9a28a102275597030bf3d020a3b1596f92cbe0c94a4adf6382f5049da1e02c9953067320ab524bcc85861ea46d807d7fc0836a807998927955486986d83846febd37d92737430e45f8d9269d45f76cdeb0a5712231bb892d5eeb9301b2f30cfa166b6998fbbcf4f0a19ebc550341c29500e465cfc2ba8cce80a1c9c0fe14c5f300ea25492dfe5894cbc90b3c17b7b99424e9a5396ba6c062e9a31f058176fae1451771665bec9f6b663649d259be049c,
+N = 9129e1d814e72df5cd31e2c2fc99b6c873362f5f057735f418001374f2013fddd8312c84f53b8c44af68cbc0bc9c1ce8e78038037e895fe5a2f79394718370dcf98951688c03b441d26c871f9f7a02bb9a28a102275597030bf3d020a3b1596f92cbe0c94a4adf6382f5049da1e02c9953067320ab524bcc85861ea46d807d7fc0836a807998927955486986d83846febd37d92737430e45f8d9269d45f76cdeb0a5712231bb892d5eeb9301b2f30cfa166b6998fbbcf4f0a19ebc550341c29500e465cfc2ba8cce80a1c9c0fe14c5f300ea25492dfe5894cbc90b3c17b7b99424e9a5396ba6c062e9a31f058176fae1451771665bec9f6b663649d259be049b,
 NT = dfbdfc2a4784522a0bcd93a9925e2d185ec9af22e3c76af9e3a55552ef2d22e01c3a9e5155420383305ae63787a6451f91d2ee741c24a695272fa1f3b7ed6830d7c9f519fe3afefd97b956029c9bb781ea3efe49bc9cfd911dd132f7b1c12d9002fe73782c148b299144b664200246b3a5336b46768afe63e8b508efb0aeb71022e27307663d1ff104865310e59edeb9220630561530a7de5e3c5a74abaa4549b80d37e851c8affc44eb1024387c63a7854346ba6cf9c9305d04350b93db8cde33c3260789feff3b3c4d55cd50216e4473db4fd83d138e6bf25a9d609f010769895dd1844fdaed0cca3a773ecb734a6687ec07422d5ec7496238cba08fd08fa9,
 H1 = 8b8efe9eafe8ef40ee9bcb29f015772e7ad5e9d11a1834e2cf429eee910f8d7079c13d7d9abb215efb88fa07bc34aadc43c27e737021ffe4f0a3871f457abc8f6738e9c9143f3260a7bab73fc8b8f443434a34ea33581811ae2609f772bb45bdd15114039729c075b00fea87b8d16628cbaa91aac1bc3cf385ad8e440f172a68940d7ea20b633818dfe79b5f1de2e2bb4b8e3522300f791b0260d879832e6f1068f1d031577400050e23e661f26dccac50929b416a5e835cc0607919596b128ee3a6a84f0720a1dd4dd7182365e6bc60801e355b03bba8692477bbf38a245e2d11a7a1fb1f4c367ffea9a14a32fed04c2a248b53993038877b0f9cef7f483507,
 H2 = bbcb60dfa5cd7b240c856b57150716cea5d0708db5ed5be68bbd445da8a457499800c24836fcd545ff15f030c6acc2b57cbdf62a1520a3794efb8058c8bb9251625216d6939441d0517ce0519dd3029046361560cfe0126bfe03b9b9834835e3822d41c7573fa4dcf9d2ae68016b9438815439142021ebfeea3ca58c055b00d5b4d7915ffa32355fe1d5e38b165accd483d4b747e035f9d45285a2b7b71fafd073f905cb2fb2033c386bfc2cdec064545e387ec0820bd81e21464fba6d8c6b949a706b44b628258b6dfc5567b892f362fac8a08cbabfa9432e6e67e4c22a3ab8ad53ea3fdac33db9782c56569475bacd7044ed4dc93a1c2d9e954872d05f4872,
@@ -38,7 +38,7 @@
 E = 4605756550ac877e51b6d7f17795cbcdbf9f8e2f692f62f3be4ccad640dc1c61,
 
 TEST = 3,
-G = a5ee8b6391781d2b9118214e68c595a0e78d7dd1a72de4a6c95f031251dd8448dbd26e5f2e4f020b4d2c00a5358f9f611c2bae884b1f4d39114bf8390d8cd5a207d092c84f18c89c2a83d4fd63e7e1eff5cf93750404df72d02bbe608202f1ad0f647f923f7f0aece4d240244af910e66fa0f47f69c3ab180c8f594a8541b1bfad3f50202734ea36f18337ba5045d7b9b48e8b2eae00c03501a1a2a8a576a1d193a2364d2698d8a0329c44d18d31c54d1ce0c68e3dffef9b9fa069959661b69e3d57aca56f02c928bd0e23e3425d0e72fb51e564a729f992199fae4d4fa0bd37375d00eb9d5a5f83b84f83d5134cd990bd8365c78fd3b0ce239dda1ff83e36b8,
+N = a5ee8b6391781d2b9118214e68c595a0e78d7dd1a72de4a6c95f031251dd8448dbd26e5f2e4f020b4d2c00a5358f9f611c2bae884b1f4d39114bf8390d8cd5a207d092c84f18c89c2a83d4fd63e7e1eff5cf93750404df72d02bbe608202f1ad0f647f923f7f0aece4d240244af910e66fa0f47f69c3ab180c8f594a8541b1bfad3f50202734ea36f18337ba5045d7b9b48e8b2eae00c03501a1a2a8a576a1d193a2364d2698d8a0329c44d18d31c54d1ce0c68e3dffef9b9fa069959661b69e3d57aca56f02c928bd0e23e3425d0e72fb51e564a729f992199fae4d4fa0bd37375d00eb9d5a5f83b84f83d5134cd990bd8365c78fd3b0ce239dda1ff83e36b7,
 NT = a86824e86c82674f33904dbdcb24e39d2464f3f906a90702ae2af8f71be38e87cb974493dbdfc40ec9477fde12be9f9c3d8ce49b31a9a55e8e7b56909b263106025cacbb8d454375f0078689f2c7df41e6c0a92a10aee5e53718ff1ed4ce08ac3eeef87d42e41e485f457720dd0173bea2d6aec0c6aa0046965e09c755244bf365c92f884dc2c38c415e041fda53b0226147ba3d8ded0b8d1cfb36f4aad7b98cf24f46dcbc6c83e9f40aa44d50c3c0cabc27d4c52a0c6e6fcc4736303bb65c5149a7a263a4524abdb512407a5a84267ee90412aef31d81251e20ed3735ce6f3ad0051138b21f58d95dc0bfa1b73b5b5adae3548d5a160faac4b865a2b85b0c6d,
 H1 = 252e34c0cfdf60a78d347c737a56540b21f628ea2b4bbe053b205735396dad5a3986d87e70ed15e58a877e9f7c446688ae8359d93633aee584459e858ab1032df1bf180515cd8df4a0f367f59d3240b8f3657019ff395f1cc7e3976616b917465edbb8edf928b6a344a510858b019a74dabad05cd053ac2a7c5b60f49bd93dcd0444071cd66f8be36a73bd7a541dc7ef58b00562bf2543091e8205c43d843d5eb7066436b30b95e0b788d48c32a3d1e6095ab03ac5f2a92a2bebf3d6f8dc5aafcb1d084aa5ecbb83559588dd1e5f3417943afabbef27dd30ee67d42c86f7e3550955f829fc9af3f9efe15246a7e80071f4660eae20ab0cda22538bddbec34caf,
 H2 = 22bdc357948ea906d8ccc3cc96dd8c1b36b33e117c2c640c2a5aa0d5a96c202ff6ebd428388dd31921f36b2fda41691cdfffb8ee6252f5d16d253b4802e772f4ad87ff753a29e861562d11d6f05ca6e21c83ca54b9c9845836e3d6e834e8aea3d1e36225390fef9ed0a596dfa54d72efa5a4cd1be094f6a57d3d020b28198049e179340ee25fef5be429c9cb66b10cb9cab927f41e46a408a12da2d5a53e2c82affc5102ca1d39e5c164f0a7cf9e467ddd3975301eca0bc023b8eb5b3695cec81d04e79f8f61bbfaddaae6345fe7dda078bcd70828801a7ae0d20bac47aad3a9978db5d226c88f73b406e65f8b542c515520002b6b3d1e605181e25d85d8724b,
@@ -51,7 +51,7 @@
 E = 04a13871136b6fce0d5735e87cdcbb72f0c12f4fe24e87853e709f07c289c5c9,
 
 TEST = 4,
-G = d48dfdbc4f250471b611508a7c7add5a7244db8b4a6eb1c3823c970a39a6c6c60b2408854c8fba5fd12e8ed9584492d4a46a8150d2e3f30c1febd3d843a253927656facd573a662ea6bcd8c35c91e8367951915c7d51d84fae94d8873d2b6f244f659132b8f56fb6a8719cc11e0e8b3dda51faaf301a4945553fb692648fc68d9d64c9be1f358c6839ed2f9046e41374b66b7022a2dab66ff5dc3a903183447e21e503ad8310ce6bef1fc957675cbddb0dbc1b96d092958c88f16510ff1cd1f89e24658db3304040c6d2bd38df2cb298f54ecd8ccc96bd75b172a7ad74df8487aaed5d7352011f0fa7c5d6b0d22533b5ee695fe89f98dbb6448bc8141a86044c,
+N = d48dfdbc4f250471b611508a7c7add5a7244db8b4a6eb1c3823c970a39a6c6c60b2408854c8fba5fd12e8ed9584492d4a46a8150d2e3f30c1febd3d843a253927656facd573a662ea6bcd8c35c91e8367951915c7d51d84fae94d8873d2b6f244f659132b8f56fb6a8719cc11e0e8b3dda51faaf301a4945553fb692648fc68d9d64c9be1f358c6839ed2f9046e41374b66b7022a2dab66ff5dc3a903183447e21e503ad8310ce6bef1fc957675cbddb0dbc1b96d092958c88f16510ff1cd1f89e24658db3304040c6d2bd38df2cb298f54ecd8ccc96bd75b172a7ad74df8487aaed5d7352011f0fa7c5d6b0d22533b5ee695fe89f98dbb6448bc8141a86044b,
 NT = 9c9bc9253874a40a5a355579224cba50de2b41b28e6090aff68358b3b427b6c1d380dd159830af170deb982bc00eced7f4fd1767584d8c2d9679112404d565caec1ab17d20a2f0266fdf318a98cebd98def0aaab434e5de8e2231f899cd48db142b2893bc3c61bf679e6ab1132969cf78764f27b42fc2fef54d08ef578d8b26fd6809e65540d8433d3d7624a0932b80a71733788371789c3fbc6328020e844e8b9630346bae67e04b6ef762321dc75aa4def408a27ff0b2954a7de9c6daff0a21a3081ffa60a98af89ffea10337c6a8644afe0f5072cf1748fec2653337a85a8bee2d088510863383893c86be8d76682a5b1d4b19fd4e7a040c4c50d14bfef49,
 H1 = 034c5940d7cc492f6c479f226eeac10db123df64dd085a6588862dfba444e3f2928c204dcab8419c33cabd3ee2fb01091bee30de4f5e40ee26f8d28008845154c40f650b62caa70778ead907dd5fd26d98210435d5874a83de0842b87708fe1ee7c386a219a7e02d0aa16d36d5d2a3586bac9e88a3ab225edb67746f6c3e372d983d41c5af047066804dff304e7f2c8b812d16f7548f490b48b013a1af18ea3a67b840f25186ae2d8882f5116d762fc02742e1517073b7505b019cf392eeabda00de97a2319f8dddbc240ab4da079c4177db7659f8b47d312a3d24f5b3769942a3b434d38f2d92c19a4d3b186c105e46bc7cf1a8ef204876ebaec11a1efd7506,
 H2 = 96aac3c3a74882d292b1ed765f1c2cbe7ff1a8a92f237fade8e03791984937b7c4ca3ff3374422ede93056ee942496e6e5296771916c296ac9960da39f85de3c440666f6220efd7eaed20c10cc42eb23539b2d8087ec6ef7fcb117b0986f18652e15297cd1b4a18bb9f9ea1eea40b358effbb223c019be2fb5e9a9d6c39b7df9bc4bb2ec55610bd2f0ffd907d3ffd789982f3213da9f24fb75bdd7008b1a51000d3b17ff1a5a8e232604cab11d5d7ddbc98c219e0ae551ea49a5884fd9e5579366a270d746bbf7faf465612e9996729bdfdca44f8f2611c4baf9e9fe4c83386b13f77c8cbcc335fadae19025677cf7d4f35067763a5c89e2564ee1e7e3ec12a3,
@@ -64,7 +64,7 @@
 E = 5a5975a080f9d1da2aa92973f841fc31a0459df1403522dc7970a166ab95fb26,
 
 TEST = 5,
-G = 84a717f2853cf21d3812d6ef4662d01152976d8920e0f45b888a02e6ee8f75a5cb38c900cf2066d3a56b985b801a65ded7124757662ce3423863875faea832d7fb9e774fe9b43147638cf18b93162a3f301723339fc56936c96d348d65ef179575db56eae2ed13156ed62897d0942330b0d433701dc56ef5ac813bc34a6248bb63156dc71a10964581e1a09a56a747688ea9df7a8d4f67842e529e4a6030040f5f34e083b0e061ad1750f0329844b35cb19091904ddad2ff21efa3a1efd224b6aed314b12d813fc67ff1c889e88c2053743518300ac56cbce6cca5abefe9b6e1ea64b7733f4cdfbb5aabcea7d33e64e09b5843bd40df8192f275b1efe353de32,
+N = 84a717f2853cf21d3812d6ef4662d01152976d8920e0f45b888a02e6ee8f75a5cb38c900cf2066d3a56b985b801a65ded7124757662ce3423863875faea832d7fb9e774fe9b43147638cf18b93162a3f301723339fc56936c96d348d65ef179575db56eae2ed13156ed62897d0942330b0d433701dc56ef5ac813bc34a6248bb63156dc71a10964581e1a09a56a747688ea9df7a8d4f67842e529e4a6030040f5f34e083b0e061ad1750f0329844b35cb19091904ddad2ff21efa3a1efd224b6aed314b12d813fc67ff1c889e88c2053743518300ac56cbce6cca5abefe9b6e1ea64b7733f4cdfbb5aabcea7d33e64e09b5843bd40df8192f275b1efe353de31,
 NT = b8d5562cebee1ba65ed1bc96f5a10d7f76f804ff76065ae71ef8e9224c1e8ecaec249e4ef4794053866b9052780ca0adbb656e56427d5e7e041b358a5f23036655a3bf3d180a5795f1aea576670ddc9ee3403dfa1c17babc5d86bd569c8932e404d727dd4ce769646413617a00c11527d40ffaff50b205ceb73de9591a3e614c65f92e1bc01d6f78bc8a7bc349eac9f4d432efa76be3a18d89f49abe6ad2e8fca17a2f100103e6622e290adcaa7b9d80b5fd61c2cffb533de4b9a8c8a0376a595c360f193319bce77256812e972f1e4bb2e38895783f870f7958033a59e3023224da56f5479d6fd8d990d361c4b28987232ae33fa84a24ebc5c041e78b5093d1,
 H1 = 8813ac8c401e067dad7f30de169b86d8e94137d5880b748b2ca96b2b3e04c70985d0fd22de1270870c51cf4d47a4bda6e993e2e9238e659acfac809313fb3ffe872966e875a20237cc2c9d5daadf90f6ed63f9c2398609122541f652a1bc8d08d2519fa3a260ed5e4b9be2be0b008605ce7e6cfbad1fa67187869135e40191fc018d5f125a924881dc5173f0eedd3fbb2dd7c3528ef0e015f5bcd312397626b0e56044e88a11c9f6bfa162392dfeef8b1884edce2cbc563fe519e1614c8b1f64a48a926a0448aa9cf998c20bc0f0ddbb7a0fb2adf32527896be21263a1d7bb91d2486c2ca3fa9c23b5598b327b932179b69b30f50b27684ee962419ca7691eb7,
 H2 = 8d4bde65d7e3a6663aba8ca06c3a2853f60c6df6e18a0ae845a889d97e2406cd564ab087c56483d049ce976277c14b0b7384c64f810466b86d2e0532b95a972d41c0494e57e2747cf6271bbabf43e4169833e76b36b1bc4d067bf4777dccff36432e688322168c8a9c057fa6adda30a0be0677f8854e1381a20cd4b77345a1ff76c25ed3ab6f47e1ecef81145143cc4386c93d899261c1efd57b57a1321ec110c04f193136e6785d398d64562ec82d07e00c7b3ee8d55caac7bf9ff14822c25ce5f5e4d215b6bc9208f25dd45918840ef0c349e3c013bbee3817c96803d8ab9154b2a68fc8272841c9c373203a67a6885d952e485e818e4d3225570be2732c0d,
@@ -77,7 +77,7 @@
 E = 1ea860b99698106934e924558bf9787b6c5cc253e83154c220f9fdd3c2a74f77,
 
 TEST = 6,
-G = ea316e4581e1ee206e299def9bdbf248136e81a98a195b99fcd17f7a8ff163f6bd583d935705779b587c6c9bdbf60259d265fbeba77a972b5cdfb07e118792f6f38d3c8c9a596cbba130c989c7e77ef2bad73a2b71d1514aa1ed6c8a723c2fbcfcc933eb4e19c6bb8d50704aee1e17ef59a8ae872f67272478d74974a2ac7b325a8443b0b0703e567bcec3b2a8b7d7a2cf4e91b0ac20057ed68e79737f29aa0efba6eb67866843c9437c8b46fb569f281a5fe4d440eb42425220a6c34a65bac673aa2581ee20ab27cdd7c542ded864765c4c053df9b4a430f206d48afe7648805016d259bcddcf271b988b18a57d92119fd4aeaf9049ae2eb5faededff798d9c,
+N = ea316e4581e1ee206e299def9bdbf248136e81a98a195b99fcd17f7a8ff163f6bd583d935705779b587c6c9bdbf60259d265fbeba77a972b5cdfb07e118792f6f38d3c8c9a596cbba130c989c7e77ef2bad73a2b71d1514aa1ed6c8a723c2fbcfcc933eb4e19c6bb8d50704aee1e17ef59a8ae872f67272478d74974a2ac7b325a8443b0b0703e567bcec3b2a8b7d7a2cf4e91b0ac20057ed68e79737f29aa0efba6eb67866843c9437c8b46fb569f281a5fe4d440eb42425220a6c34a65bac673aa2581ee20ab27cdd7c542ded864765c4c053df9b4a430f206d48afe7648805016d259bcddcf271b988b18a57d92119fd4aeaf9049ae2eb5faededff798d9b,
 NT = d732a7a46bf87b14bc8a80b47a2867203148a8e6835f02d0788a0624a0161fe67c447f4e542bab2ebc19afb9a4c279f06c3f3797ee6a98bc86f9ecf92118547db3c8a7241e3f184934d227b408f68958cba730b5889b159ef3f75f466228788455fbfecba32d3e7fc1e384b06d116b6f1403ddc9c0974a127dbfb009378fa38fd5042831da323fc7b491f98e4b9dd143fc3c94c339316fee2ead9f19e25047fc67f8ea8b3b11959f544fbdef7da6f663513cf4946d34990d989a8caf60112ec6c1278430715a53c0374d7a1f3834cdd1fb4663637f7a09398ea45950ceddfe667dafbb963f617513f0c65ee0588b85340e268df861369091b3d2d51d963862fd,
 H1 = d41d49891663dbcc01e437dce537ff0725ae0401feb751c652cd15987704b40cf761792d35dcc120b4a56b30cb57dd24e7fcabef53f12dfb0aa79c5e913d8783d0598cf0c34223d0689e63d3bd6f0f13e7531cc2e1000916ba773d1d812af2217b7bed40b52fd4ff682b56c443790974953c3a5e8d907afde8cc19545f1d3a91f617250d9c7d0a06f1bd9596e1a549c50c963e3630d3179bd1ec0dc2fd36a7cab7a2a623c1d387cc1c3a583aa2a789c8f7309d1b7434306244e644a22037bfa2f330fc3ff4baf09f666010e10837f729e75615d36b0f91b46c4f654860f512e12b1b66d23f4a2866d1cb69eda14af2ea3aa55d6e9dd55cd908e651e3fa02b6cb,
 H2 = 2f538fd8ad28a161cdba7c7669de01174c4452df973a9c68500d16980ec3c0a94cdfc32375b861304ba1a23e1569af4089131add6b1b049c3a942b9bcad2653feb0e19fd53f5817ea73012882e646bd79ab2dd4bad1abe0f33448efc6802bbb6527acc6a18446ef108e38eef8ff4f8ba2c19a625eab1bad018543c4c2abc2bf8e93b644732d79d87ae4e2b74ec09e988e3fdf096b225ebc7a71086fd07487f732a1030ce3f4e60ff76e8647671b165836aca29fe316119b85502e74d901f979fbe06d8e58ae7fece7f29fce552239b0d2304a15d6a86dcadf0f92481475a90cfb220b4b839a0025a9d274b311d00f425676232fda3267ef67c4d3d876e83286c,
@@ -90,7 +90,7 @@
 E = f60fe6e8c6f745ecdc687e8a39d8eb85ac2b9b5c267571ca5e9e1cf4de15e135,
 
 TEST = 7,
-G = 978b98f54689b59662055e4a8875896edb02e7abc6ce777ea9bf9aa2198c3a966bd4d54458db4a3f467eaa34bd33e4ca76b1b921fe4478f88a984c15bbf5a55226c7d3902b480ed6a82a643fdaf09496a97a354238788d217cc3aa52e0203aa3fd367a8b6baabab5fedd8cb175d8aab21f01c4d51a55c89f8a4d34bf0754375f2aedccc90ae5ca4450f333ff943db0f3178cd31a4c04d36e2162c7359a6d56bbd67b4828815aaa7150e56c92a106a65fe2a945828707225c1f2c036635b74ad1068aec49f414277431c34af777a25d5b520fa5c88c873dcd72fb11f89065d4da184c2b3f4a56c07ffc57331de19dcaef46f805074eccfce47ba240341c87885a,
+N = 978b98f54689b59662055e4a8875896edb02e7abc6ce777ea9bf9aa2198c3a966bd4d54458db4a3f467eaa34bd33e4ca76b1b921fe4478f88a984c15bbf5a55226c7d3902b480ed6a82a643fdaf09496a97a354238788d217cc3aa52e0203aa3fd367a8b6baabab5fedd8cb175d8aab21f01c4d51a55c89f8a4d34bf0754375f2aedccc90ae5ca4450f333ff943db0f3178cd31a4c04d36e2162c7359a6d56bbd67b4828815aaa7150e56c92a106a65fe2a945828707225c1f2c036635b74ad1068aec49f414277431c34af777a25d5b520fa5c88c873dcd72fb11f89065d4da184c2b3f4a56c07ffc57331de19dcaef46f805074eccfce47ba240341c878859,
 NT = c031847390333f4b8b1fd0bae9a57ddc4b34bb9819f5285d08d0943db0975b61a43286ca3f83e9fa8768d670189f6ecac37cc2b5ab7e1ec3341c21b5c66816c0ad65a3bb2c45825f85a53bb40b31a89c9ead55706eeb55f8a0819c8b3a5489de0c5911a3a3e9ebf42ea1f9cc152401419e33a7e15f8d3abfc4739890374472a2d714e17587350918ff7c82d9be44f5541f74a7de905b4dc9d0c8333fcd185982a5e7a9304551032115ea99e9cd0e33a9b0c3086cb296719394f95dbb0927d4857f8c4cc4d747e0fa14d1d8478a31a124607a91c7694d511e39c295282ba72953c1460958ade560cdd4f53a4a4191aa5a4711cd9dda12f3f778f09b8d72b161ed,
 H1 = 79aa8c281562a1f6430152e6687d777cd6dfcc99d5bd3a76d29ab627804280b73277e72597e706bebd179b51547a2bdfb136b3e6986a06342b1d87182fe1579ef5cc65f0d597badc844e89a44b405a30eba053779666423a867d6787f4f7da1dcae572d2b69d238b729bba183bcc7c78d65fc237e0163a8f479a2442a5cd0864807a7e38c24d95a4e72fb4e008b7adb5e63e2af8a37e7cc1059fb6a661f7bc21ec01bf68358d4439ff79ae6b8b46c3c5046a0fbf50bfd96a4160d07c5265775953bbe22621c100872c4740210662d3c37e8dcc74e6f37372debec2d81e9ba07cdc7fae47681c82c57994ac3d90aa93a0e8e0af8887b10b9b107a9de4775b1e45,
 H2 = 00040dfc291dfce393e7e22ec4a778e892dc3eb51c0a31fbbb06c3117442f71cf992bd1617749260624e0cd07f4f27ed44a73a78728731a023193f906118acc068a3b8d167a71db07e7b2ccc549790d714392e6f80119ee2f0ec174785ecc8f68c715900296237a582db29d901ba898a35fcfff3919354dcd461c17ba8e376887c24098270beb429ba142901a93dcddddabf1f59e62ddc0ee5e6dc377d6a20b56e85c2c577d022740e74f1c9363f0b184212299c2cb3c95705630f7221054c4a2bcd1c87c103eef6ca09eb53dff6fe04532085dde5c037db5e3f456841f154b51169197a722e209be1a65f8160d22ac93dc450a2682fe4ebcd3636ede8a028dd,
@@ -103,7 +103,7 @@
 E = 80038dc9e2d14953b07ec009c279e2c67bfd63b66e9a5b9c3fc38f619b1b1e83,
 
 TEST = 8,
-G = ad40a06643e7cb20e87dca7867fb821b169f1cc49c58fffe21c0b248c1817945985f0365ebf637a96ee822d2facf7c434403b83b7d83e33e44e36c17e9e2f8a535a2a3babedca297533245198b5b93c8e716ba9cf3b7c54a6e8f9652970e24507be63d0dc659e3eb8e6cfce0eb00d8195ba592755cf7ce7a2502e16ac7c79be8576af6751189b0e6217a3961680cc02e2808332af121d4d1f480ae3e17751e5abe58dc0ab4c4485512a823b046f2a5fb93ee637d990b0ac80a16c6c726534e6cafdfb5325850df4f6be68662c127afaa6c89777441dd8fd1fe616e86452cb47946ec9257e1838d4786cfb716725dbc65c7d2a4271fa39c851ecb873ec9e7dcf2,
+N = ad40a06643e7cb20e87dca7867fb821b169f1cc49c58fffe21c0b248c1817945985f0365ebf637a96ee822d2facf7c434403b83b7d83e33e44e36c17e9e2f8a535a2a3babedca297533245198b5b93c8e716ba9cf3b7c54a6e8f9652970e24507be63d0dc659e3eb8e6cfce0eb00d8195ba592755cf7ce7a2502e16ac7c79be8576af6751189b0e6217a3961680cc02e2808332af121d4d1f480ae3e17751e5abe58dc0ab4c4485512a823b046f2a5fb93ee637d990b0ac80a16c6c726534e6cafdfb5325850df4f6be68662c127afaa6c89777441dd8fd1fe616e86452cb47946ec9257e1838d4786cfb716725dbc65c7d2a4271fa39c851ecb873ec9e7dcf1,
 NT = aa3a57faaa2d2859140344aeeb482e83770b6ea2941c4bec7780251c6bdbd2aa247dedeb19642a8cb55f03ba8d129ea4ef10314f9aa73bedafa112afec5dcf54f90e8319cf8bb80acc148bc34cc8d731237a114d9d088ddc89d419f3180a16793dd927e77258e35260d7885aaf53e7c1338ec3e068bcb8e74e244f29caf01bd3b7da0d08a12128601c353b634bc2a85874d86d2849d69987461a68b670b7d414d7c1a6e0cb1f8aef00e647032b44c993f868b6c4940ee7f0b2c5a4ad07657d9ea889bd90aadca65e845af1a3ca449409939b5df9fbf28036b59c44bdb1d24a458d15976e7905e614fbc779094b612415925588398c3daf1d6536f08068d2baf5,
 H1 = 6a15d7c3f04ab2a11ee5447eed938794d231349b5d83774618a924e7c04f806fc0ce273bd23d35c8033d53b1bad8e383546f65d900036f2e306d9a17d60b61ddf96b151b1b9bdd676bf4aa85d38733cfc0f17c8c65c30315ecbf4660b663cd2317fe39f33a18f5395363f483faab94b76a3b1eca90a1b633c0c033bf8018af85f5a5269ce72e86df0b42aa4d593c389490cdc202ca6e440e09f7b8177287dab088b34c3b6cf2cd236812b3f9a6b0221572afba2b93094d9a75c18d4d2c1004e02bb3fffddc7aa79ee38dd1562f7ef50150cdb030d05d35dd190e88685a4d5574e520ac5ebe974680797fc678ad7dabc2699792b7521478d1fbe51b8a27e0c607,
 H2 = 4e5abd7c1823efbba423de6131683083f1de406cf1aa4534990b16609d220428c0aad92207d0f109100f5a3b10c18634153e1cbb36fa16162f22531ce21e44a2b6c6087675289463c0bd2a6ef833d9d7d3ac034748acac91f7979e055031949e3c73ff25ccf7060acb5580892babb056677e6228820bbfa8413ce8e8e7ebce55f29c8ee7a59c1e92c5147ee98f931bcd83fd16c394043e2857a0de9aa0ece1db334b070ab538245e6181d147789bae82cca447d27718bbc625e2f59a3a8439f528c170622f6f5b55b895eec75cca50190ab21cb7cbb52b7a2770180665860b90354f3910e5a7f33e222055eef4ab400eb21fbe629c34b66d7ac8594fad16159a,
@@ -116,7 +116,7 @@
 E = 6822f883f526effc4f9b7fc0cd21b83db2953207434fdb062c54d86dbb8429e5,
 
 TEST = 9,
-G = e53525d37863db74d6af5f4c6a097bca51b2782438c6eba79afc4e8c03c55d8b5f6b02257997eabd7becad005806f8a4697c67c3d854aa710169e9cb87b153b05af331dc2d33d2ace4fa931586ee2e2ee6aa5caf5759239d00e3ca01f28ee1f00f7fc012eda7baa2f09c1df3ff98ef8e2d33278d56cd479f620b26902bb475cbd7f5cdba951baae0f1a0c845a80fcaab151ce457bca70c35b6b25b27279a20774634d91df114c8060c87ced315863bbc12aa01410e9b6f1098549258ef71ad0fea220974299932aa7847cc2798a4d34aa49b90fc65dd40094c4e36a783ce8888e0572744d8aa4063b2e1b97d415c180e9dddbb1eec0229e843b69b4ec8b739fe,
+N = e53525d37863db74d6af5f4c6a097bca51b2782438c6eba79afc4e8c03c55d8b5f6b02257997eabd7becad005806f8a4697c67c3d854aa710169e9cb87b153b05af331dc2d33d2ace4fa931586ee2e2ee6aa5caf5759239d00e3ca01f28ee1f00f7fc012eda7baa2f09c1df3ff98ef8e2d33278d56cd479f620b26902bb475cbd7f5cdba951baae0f1a0c845a80fcaab151ce457bca70c35b6b25b27279a20774634d91df114c8060c87ced315863bbc12aa01410e9b6f1098549258ef71ad0fea220974299932aa7847cc2798a4d34aa49b90fc65dd40094c4e36a783ce8888e0572744d8aa4063b2e1b97d415c180e9dddbb1eec0229e843b69b4ec8b739fd,
 NT = e2d11074958171a031686ab23db36f285b0e23f889cf881e66cfaccbbb4d0800fcc9972dc3469b733f0abf4222ad4981eeb748d23d82d8d2be337315b39bb1d87fb782cb59c3c21b14b05d1ba3e080f21c91be2b6a4986e961c03b405d4ab0626f603a992e450268a857e20acf91a0bc913a1d318240cbd8a4a3562fe0f84028931a63df780e9d16f756de3cb837e30412916c0ae01a5f491de64469b7a29cae5b3030314a60ee75d4aad22e0a8c7c523324e3cf402a865815e2f7bc2d51826dbc13527b9a6702f60416d0a72178e82f0e9e06762bd3fe78d4ccfc167e563ffda9bcf7b3eeac25419704d2c7a5e194eb571018529ab69ad6dece43ebd3523145,
 H1 = 2f1a058cd9175dac9e51716a757ecbcbf357ab90688d414560f57c3c9e33695eb3df617776281c386bd519b26fcd8404d73b2faa1c04cd1e400725a8fe3444bb91fac205dd072d42bd8a3e96a1bbeebfa73bc959b7751a2ccddb7586e1fda04031c08a13f31d9962ae9ff50e788afda6e43a985ffd07efb90a00854a7348a5d6b57d1621d6dcd0276a08dd4315a9d7496c503ed94ae3750b724384164acfe24450a96a1a68ba10216e34e9dd3b2a5fb456dbef72f386ca68592bd842937aadec6f499bb3ed9f80c955ab0e831bbc350a7531b7563631e45afa6ddaaf4143b3a2d5791a6b250d80f194f4016dec36f534d9598a575507257d093909613660e19e,
 H2 = 6c147a2e17a0dc8c99e7812fc121e9ef23598663de0094399d52d2cb71516b8e7ffc71ea46925184fc7e84a2ddc760b3fe1e2fcfd9700081cee76767a606019b79f8004bdbc82bc20ea6daa8715e16dcec08e09cab7bba9ecd475f3c906749d779a7db94f630ce7691b79c44b7c51aca6f7270d4d9adc842db26440f4fa9b4b2c9250d9ca65fe85f70b2092dafb59baac8db0163ca19b320eccf96290683fd454c7d9bd4e590d3397063923bcba9f90cb05dcea39773af82b852c056d8184adcf3f33816f395c4d00299846ec4ef449309331a389e2e906b6c402a7f34e27004b18e293b9b0837ec693a918dc50a39d61122cf2f20f8d8ce438ff51f4f296238,
diff --git a/testVectors/mta/mtawc_challenge.json b/testVectors/mta/mtawc_challenge.json
index e781c9e..d499637 100644
--- a/testVectors/mta/mtawc_challenge.json
+++ b/testVectors/mta/mtawc_challenge.json
@@ -1,7 +1,7 @@
 [
   {
     "TEST": 0,
-    "G": "9d2ebfc5c01624ea48a4f47c2c5e4d1d089809cb1b1b9a2cb7e78d2c385e41000dfc21b876d1570954e0eef4841d34b4081e60f77ec49fe79f6c170862d341fbc8e5014190a9705006001f11d94d12a8b9edcab45318dd187b8db09c2ee10146ec09fa115c3cb294bacb8830cdfafc214f5762d55721baeb37c53e89a4e5f0506e78e196f6565671da34b9ded4fb6ba24f027b7b5d5c5885044cf6d65fe7d95ef78384a4da7abbee49a1f8390d3347f0f28727f3b0dfe97cda42bd9c4430875d04e03c66ef9bd555e06ea9647ba77cf2dfb1e7462bfb1c42962241d4e9cc276eb7526f4ef2eeed4c51314715cd4625156c28c654ac10997fd28ae84268376154",
+    "N": "9d2ebfc5c01624ea48a4f47c2c5e4d1d089809cb1b1b9a2cb7e78d2c385e41000dfc21b876d1570954e0eef4841d34b4081e60f77ec49fe79f6c170862d341fbc8e5014190a9705006001f11d94d12a8b9edcab45318dd187b8db09c2ee10146ec09fa115c3cb294bacb8830cdfafc214f5762d55721baeb37c53e89a4e5f0506e78e196f6565671da34b9ded4fb6ba24f027b7b5d5c5885044cf6d65fe7d95ef78384a4da7abbee49a1f8390d3347f0f28727f3b0dfe97cda42bd9c4430875d04e03c66ef9bd555e06ea9647ba77cf2dfb1e7462bfb1c42962241d4e9cc276eb7526f4ef2eeed4c51314715cd4625156c28c654ac10997fd28ae84268376153",
     "NT": "b5eed17dc8d2b334110128bd1b19e58d97c3286e2505283a9f8d060527e8aa76b08771ca8b16ac020b4e022f85f70422abe7ea8f78a0e066188a2ca022a01af3ab93b7c39ba2558425664ae00a3ac13540b9e73ffd44973fd0ed9030850d242cdbd7c8825ef164eb04de336f3e9565b3b9fedefcf5269f54c68d5d2751bd77142f2ddbe3eda0fb68f2397899515057729b7ef88e7c8a459f88b39c33592cd2d95461185522c90c4d8b0feed1c9d4e1d68b7eff16d0439b2a687b24b242521ef3af8ed11151e3b8d50bddf39d90d0d34ba6a13ddec9b0b1cea034ac6c87d9e550335b8e8268094770d137d022d51122dbaaa403a9ffaa3258c8e1bedfc6ef6421",
     "H1": "2972df4590aa4e22a6b7b4d66e3acdb31cf77ce110a0872bba1a85f18764cacdbf698116b55537b79b2115348b2a28cefbaa98a5080c68eed75cf93767c4e594f8923307a70af1e59c8fd0204d5f38d5fa9b2e89fc5f297459f676c664636ced014669c9b2140deb99905d122f37e01f11993ea175a14696379d45a78b44ee6f297793936c21e384857ae8dab08b5f871cd8e95dbba82183024773d918fd584c6007443b26db8ef8c83f5724b769736e24e94ddad9d3513348dd61dd9f8e459f906e646bd7ab8e2a1928ff84a76a43e4618c655565bd30d8abe41b785211ebe0b379764b4e4d177f95a45f18ddd29b74345efc7636fee95786f9b5c74d9850fc",
     "H2": "afebd610e000f306ac033cd8c0f70ff7cfa1d582a26f76dd8375a36a609caabcb7bee307e295a03588c01e184d0780d8435a1a970cba375cbffa18a88be9f824e4b6d4e49f4af7ec0872cded761b38c4477a90d46532e3c7639bf758c27a6068e1737ab5a94093bf320dfd1d8cb8375612b81de678dfc320e9255c046df54ece98a18880284377277c44ded1f8b8b5371bfeed25faf73511fbf2042e6792530494ca505b5e5b37a283c52ccfbda2d60802011431cdf04a991c98a9f51e6f59f226dade13714a58e64ac37d2f90220ea5842de5cc9cda29611dcd4a8a8ec7426ef04d016d9e527aafae9ac534f1bd19dea57b526b9207806ffbb19ad8a20fcbe1",
@@ -18,7 +18,7 @@
   },
   {
     "TEST": 1,
-    "G": "abef1343f695ae701e248ceb981aae088891b7aa9fedc2863c201d51f20b7d4f7c8ca4ff21b3e58e06c0f1e7071d083e77b03b0c077d02f0c2afcad5282d505040efcb2b35190bcb7b7039f425e050a31c89bb441c3be69d0a583e8665e14a26e81baeb67ea0a97f0d5aab92445bc84e859aa65816e44ab9cf2a0bbf4425902cfb93a9929ffabcc20c90451da86fcfd319d0875e61c9cf02a2bf7acad485414b6f8af86dd4d9340f164bc69585d3ef510b56c1f2ae255138df6587518345771f91db5299c6d68196f3a63513f0463fa140d860151860f2bbc6d8cfa9f5b55b49b98787f9b177f474a2c119131b796e2861e6b06d0b9825ade28970bec9a4fe88",
+    "N": "abef1343f695ae701e248ceb981aae088891b7aa9fedc2863c201d51f20b7d4f7c8ca4ff21b3e58e06c0f1e7071d083e77b03b0c077d02f0c2afcad5282d505040efcb2b35190bcb7b7039f425e050a31c89bb441c3be69d0a583e8665e14a26e81baeb67ea0a97f0d5aab92445bc84e859aa65816e44ab9cf2a0bbf4425902cfb93a9929ffabcc20c90451da86fcfd319d0875e61c9cf02a2bf7acad485414b6f8af86dd4d9340f164bc69585d3ef510b56c1f2ae255138df6587518345771f91db5299c6d68196f3a63513f0463fa140d860151860f2bbc6d8cfa9f5b55b49b98787f9b177f474a2c119131b796e2861e6b06d0b9825ade28970bec9a4fe87",
     "NT": "c1b8aab9caaf1f9021fcd135ef022089792684e7cdb1467ff522e46713609e7ebb633f19ad52e597f7dbdb59f6684f204f368b7104116a1fd8eabdc9ef7eb4b64867ad1f007f74bc57f2fb77b0b9b518af7df355e7a5d99217df442358543b76a51798e8ef194437fb4b58378943cc812942805a0b3d30eccae13fb56ea3500a781549d1d6fbd0b2ac57d63aedaa05987298201d8434b6e51b3c0e75bbd7eeb3cfbd4f79d28692110738954720784d269fabf4d4280d61e4fb8581803dd75e1be888d29d8ca419b68ea9850919c0d5563104c084f9fe0730b496b70612aa131b20b951ea8eb61c30b186a684698f22bf09d2b02b82504a1cb3491ad01fceadad",
     "H1": "5c4a4492b2d0979f73fe00b53a1a27583c294ea5aef17ba4841b7b31bfa05e6c6b03b2e6d251a4ea8e82a7ae124dd33d401720a621e7d60405ed60ed72885063947e13f76346255ce9f7f39478c241e0ab4b3551b783e50f03e7820db446a8386542bf65404b06d741fcc8f3be232a02f5121123a58a4d2cb8a1e1dc937b17d71a07efa045794e88c6e79d7f83c64e8c8538521b61f5e6562c35b29d67c8f56f60e3d6cc8be18a081501aecf69289daac769b7b068bb9d656d7f517bc8b8a9fbb64628772801fc7acc447be862f9253c2072f097fac318928f64da494fb07f2141cc55f4c68f7bd5c84f025f3d0716d9b07bb9b9846d0e24786a426eef74aeec",
     "H2": "6b577e5a3fa30d7e2d7c38b327eb6e7f09634d57dffe0abb2f3d6c33929507fc19dd137b16c2afdbfb09cf12e896519b8de8dc4f3aefac800e29b9bba3c1a761ef7439a2cf5c0fd3334e87b3b62196e2d63c3da27d3708acdd5f08a9fef65b8b84ef2787afdd5711b8d9aace89067c4f9720450221532d1f0c76f23d41b76d3e96436be0756830f6851c966ca507ccdb1bef7d5d9064221c9b3eaeaf506f92fcb9df77996c731279317f190aa35f1955de3005448bc436d16ecdfdfc03592fdceeacd98a127cc28a55d734040cee90531a9a8e45896c8342073635e3d1f6ec2dd51c4215cd22679b7f84ada3dcf23464362b79dd6dbdb13e16336edcd4b106d9",
@@ -35,7 +35,7 @@
   },
   {
     "TEST": 2,
-    "G": "a337d9eff0632aa56a74706edb4b456e91a78f55b788e1eba279ffa911149e4afafcb20d5f3d80ab55af2f84470fe4aaac6d7d89e18180465442c98399ecca5d1509be124e48d68f6ad1032539926e4104aef6bb3bee0e10cf4d48669955d9440815dc8906e6030ddd7adc6455389ad6dd32daeeba68e58cc6d1720669bfe4922510067288f94d077e3551e1c64722806d9981898c7147e13372bccdd087552e9d702ae37e280bc878e235a85d13230f62acdfc932270e1ce68d8bf10a5a7ae6f0c96e8d89c73b3a764418d1ff74277f98469a9e500c3ae46af71f3b92c6fa3cb0cc57dedafd2ee488e507550468b30c72eaa53f5948fda15700a1cdfe1589e2",
+    "N": "a337d9eff0632aa56a74706edb4b456e91a78f55b788e1eba279ffa911149e4afafcb20d5f3d80ab55af2f84470fe4aaac6d7d89e18180465442c98399ecca5d1509be124e48d68f6ad1032539926e4104aef6bb3bee0e10cf4d48669955d9440815dc8906e6030ddd7adc6455389ad6dd32daeeba68e58cc6d1720669bfe4922510067288f94d077e3551e1c64722806d9981898c7147e13372bccdd087552e9d702ae37e280bc878e235a85d13230f62acdfc932270e1ce68d8bf10a5a7ae6f0c96e8d89c73b3a764418d1ff74277f98469a9e500c3ae46af71f3b92c6fa3cb0cc57dedafd2ee488e507550468b30c72eaa53f5948fda15700a1cdfe1589e1",
     "NT": "dfbdfc2a4784522a0bcd93a9925e2d185ec9af22e3c76af9e3a55552ef2d22e01c3a9e5155420383305ae63787a6451f91d2ee741c24a695272fa1f3b7ed6830d7c9f519fe3afefd97b956029c9bb781ea3efe49bc9cfd911dd132f7b1c12d9002fe73782c148b299144b664200246b3a5336b46768afe63e8b508efb0aeb71022e27307663d1ff104865310e59edeb9220630561530a7de5e3c5a74abaa4549b80d37e851c8affc44eb1024387c63a7854346ba6cf9c9305d04350b93db8cde33c3260789feff3b3c4d55cd50216e4473db4fd83d138e6bf25a9d609f010769895dd1844fdaed0cca3a773ecb734a6687ec07422d5ec7496238cba08fd08fa9",
     "H1": "c78729b328d0e847ddd3e8833214206a2ab0f17b969bf4495ccfe9290423aa7b2c8e60e08da1876226d540a987e3b9e5b907bdf49afec130678bd471da3ea108a959f2ebe86a328bb50fa9f8a1670becf254c350dfa6ef11ae6ce5d0d50871d11cc7afa408b2f4434c38a8242dac6ae81b21707d19d123bb3417ae138260885c761b60ae48e3b95b819023ce0c6f1f131014bbc088fb0e8a1e03f32cb674e9dd4a950d1f9616f9ea17cfde92e648344b3ac0b5fcacae71bcbcad062d09265bf1fe563fa24558ab1f771cb9e64453672e11db350df544325e294cefccd989492abb3aa34291ebdcdf286cc6bc7efd9361cd3e2dc7cf32059e819a863c80b10d8a",
     "H2": "265af6df1ba4727660abafa959877f18db62cf9a80ce191afc2b8689dc6bbb0b1fccdd001d3b53f67f946d8342f179b78bef22d66612d2b6c1b37b7ed735470512c726bd6b686b1dd25a9e307ad7880ac0cfc0453943248175aa58484a5cf505dc9fad0f45ccb219c5e072826b0e6e445a73fcd0d3c52e31d160b4056a896221692cd17b1ff04a2da5d7c3c36e7afd1042d5943f6de276ffc26c4155f7572b5a051e967887475d74fc0a58692abca863317eef69be91dc51c733280ab4e06f8cfc246efc5dc4a94067d6a6e4f8aec053dfe69e492abb128ca92905ea6a9fdf5687bc239a1d4690a82aacd0e95e06e4c04f2e2884a0c4eb47ff818e05aab1a203",
@@ -52,7 +52,7 @@
   },
   {
     "TEST": 3,
-    "G": "cb1fcf6c130265c5a7b369319a3c51b919a2850cfbcff80e22c4f3a3f376ae5a0a4b19ee0e1832e52d7ed86be4d0296074dcbac05d3fd4214d33fcb3f2b7f357960044ce80ea1429b62af8b94351d22bdbf875f2ebeeb67d01f592beed9a4a5ea0a9514791bb56776496158166cc3f65090a215c99d5d6805dc1fecf01cd29361315c9c6421b6b4f8a55925cbcb0dc70b20c45c0a67c4560a7e832fdad26db0bdc8cdce75ca675e06c81db9032d384849b2852b456d02941875927c1acd993c303d9beafd325462dd55b505e8108f16b5ffe8642496e633652c0c0306f8d54621f4e32ec7074242550493950bc23d756f37da05615591b1352592a3a5f718116",
+    "N": "cb1fcf6c130265c5a7b369319a3c51b919a2850cfbcff80e22c4f3a3f376ae5a0a4b19ee0e1832e52d7ed86be4d0296074dcbac05d3fd4214d33fcb3f2b7f357960044ce80ea1429b62af8b94351d22bdbf875f2ebeeb67d01f592beed9a4a5ea0a9514791bb56776496158166cc3f65090a215c99d5d6805dc1fecf01cd29361315c9c6421b6b4f8a55925cbcb0dc70b20c45c0a67c4560a7e832fdad26db0bdc8cdce75ca675e06c81db9032d384849b2852b456d02941875927c1acd993c303d9beafd325462dd55b505e8108f16b5ffe8642496e633652c0c0306f8d54621f4e32ec7074242550493950bc23d756f37da05615591b1352592a3a5f718115",
     "NT": "a86824e86c82674f33904dbdcb24e39d2464f3f906a90702ae2af8f71be38e87cb974493dbdfc40ec9477fde12be9f9c3d8ce49b31a9a55e8e7b56909b263106025cacbb8d454375f0078689f2c7df41e6c0a92a10aee5e53718ff1ed4ce08ac3eeef87d42e41e485f457720dd0173bea2d6aec0c6aa0046965e09c755244bf365c92f884dc2c38c415e041fda53b0226147ba3d8ded0b8d1cfb36f4aad7b98cf24f46dcbc6c83e9f40aa44d50c3c0cabc27d4c52a0c6e6fcc4736303bb65c5149a7a263a4524abdb512407a5a84267ee90412aef31d81251e20ed3735ce6f3ad0051138b21f58d95dc0bfa1b73b5b5adae3548d5a160faac4b865a2b85b0c6d",
     "H1": "72737de20e079bcaddde646987f621ddcf64300159541ac9a883789755f98f988244f390077cf5e5090824bdb4b69915aaae2572c19ce68d56e832feeda3d9c3c1c2f0c28bd5341267c24ce6301d6a06146673e6a6563ac45b98989d7b7fbb89d5bfa28e1256f9b1e1f378834c91e15b05b360c9a2e29d9d3fc33db9654fbfed0673251d20f83a16db700c3605715f9f5fa7f0a726bbb34bd32b749aa63e7e8f77ff92f7fe01fcf6ee2ac8fbd0b851d6252dc4d99f22e1c2787bc8cdba8c74c9a883ed20ca9a237c03150e78e12cb65ce7ea0ce54226021ce037253996554ebaaaf783093850912ce6ca27f197eb8bd7b91403f843c657ec8a725dfaa26d1795",
     "H2": "0dc3fa17b51f4eb6f81d045563ee4bd1cd83bdfc9389111b0e48b96434c92c64c2a68943d604431e748b810b6dd5aa0cceeeb9f9ee3ec26fe6fd938d6056599302c364b43bb3c4adfb02a6037e60add4e4bd4c4eeda69a0ae16fffa6807af82801e82ac0ca724ffcb67e284eaf04c97413804a2a5ea96521875a5f4bdf8034cb940602d9787af35294b9c257f3bfdfae6d99b0c6b976a31af59a0dc4d6bbc60105a5075aa9d9866a72944060738dfc2a94386042e00db3c2198893600b4c76bf7e1fa7058b605f7f8f42c40625721c869a400b0328533877968a50e4bd6f6e297002f2c7389f2d93f5921480a6a51335ffef002a09302200dd4276def19bda42",
@@ -69,7 +69,7 @@
   },
   {
     "TEST": 4,
-    "G": "bbbd7ed9e7c3aa15dcfbfc5a72147243214667e99d6a152b2dc4cd9367256da65cf8aef48b53a4f56ebe2b4a4c8a8a450da3f8b2745f7777d4e820271d82e2e781ce0060d51027f99198b5bae2be83de52944a9ed7350cc20fc292cb23d5d8b6e181b47697591fdea8e229c2583abd6ffa041b93a94a4e8670381eee9b490ca99c1187b0a3c124c52e7057d4a3505859ed5ec3fdb01808c1672b3eb9c20fead407e256c7dfc8125336e43490207effd95377f0db93a439d1e8e49c3227fbb4e06df0c58eb5aa2524cc74547d56b7d31d78d712a09f6f0e2f103d692109d295d6c234d481d487c1eca2b4eb3b6a4814095b42260546f7f1bdcb86df28dd368a6c",
+    "N": "bbbd7ed9e7c3aa15dcfbfc5a72147243214667e99d6a152b2dc4cd9367256da65cf8aef48b53a4f56ebe2b4a4c8a8a450da3f8b2745f7777d4e820271d82e2e781ce0060d51027f99198b5bae2be83de52944a9ed7350cc20fc292cb23d5d8b6e181b47697591fdea8e229c2583abd6ffa041b93a94a4e8670381eee9b490ca99c1187b0a3c124c52e7057d4a3505859ed5ec3fdb01808c1672b3eb9c20fead407e256c7dfc8125336e43490207effd95377f0db93a439d1e8e49c3227fbb4e06df0c58eb5aa2524cc74547d56b7d31d78d712a09f6f0e2f103d692109d295d6c234d481d487c1eca2b4eb3b6a4814095b42260546f7f1bdcb86df28dd368a6b",
     "NT": "9c9bc9253874a40a5a355579224cba50de2b41b28e6090aff68358b3b427b6c1d380dd159830af170deb982bc00eced7f4fd1767584d8c2d9679112404d565caec1ab17d20a2f0266fdf318a98cebd98def0aaab434e5de8e2231f899cd48db142b2893bc3c61bf679e6ab1132969cf78764f27b42fc2fef54d08ef578d8b26fd6809e65540d8433d3d7624a0932b80a71733788371789c3fbc6328020e844e8b9630346bae67e04b6ef762321dc75aa4def408a27ff0b2954a7de9c6daff0a21a3081ffa60a98af89ffea10337c6a8644afe0f5072cf1748fec2653337a85a8bee2d088510863383893c86be8d76682a5b1d4b19fd4e7a040c4c50d14bfef49",
     "H1": "7fb15b64d377580b6f5d4eaf8434921cfb854753bbfefd24715508dc46e47fada23f64190d5d66efe8486776649e72af958bfb5713f1b6fddfac13611a3704f177a3da756efa69cab0de5e5e146dcb7adca6e9ea72e8ffbe9ad83a7c3c58576466a06c8194bf397832f0ffa51a144aea12150262e12da670307e19791e03d8392ac1831a02b38d6e902c4ef289b04926f0e73e51c4ce668e1b455ac7508b8bbd541cc5b7f974ce75e92c514dab01f7e02698db7bfa539a6800a6d9a2a3fa00a56137e71462bd764eaa9482decaabd7214b1e4b06e36b57bfab857457086989a987724fc934a4ef7eaaa60c818c94b14113692dff534180ffd4257f2885badb97",
     "H2": "21b2cbd7078cd10589305a6c252325b3339824978e98cd8505a352f3c9c780b5318a79731839eb86def41236bd1513a63d63f38829d98c3b5e0ab91d019ae2ab04a6df3516ab5b673abfdad932ecae02372cdc70d3c7caaf79a2045d1c07d38c10efad377c811158db18362c9379c4799a924a2c47b2d914673db731e0cfab42b7f5de10a9ca461e1420f504710f8add8374b4dad5a45c0d7d62a6b0f39c82313d04812aeb7bb11aecc8971b6ef79e9cc3e15e6c0aaa77658bdb6557a1f5bf54885b914122bb1bd56393849b077bcc87e17331d03ce1bb80d4c667d2e5fbf463dacc47653bc309c6c5ff1c667fc44e483228b499427704f5084700acdb04c117",
@@ -86,7 +86,7 @@
   },
   {
     "TEST": 5,
-    "G": "e39046d5574b45d5a8c7d83400cac6434675c8ac2d0836e7e7434b18f466ab4c892e764cd25f2e7c3aa12937f7027830784dadd8062795a87c8d035b5a69b762b051fb8e4946021bc5a6841c30c0508a8b5dd924616179214d5eeb91980afe440dad11d98c104beefef1afc14f5cddcaa944e89885c2b54c3bb198e4cee85318cf0889682f0a1f703310776ce47b165691684ec9ca887b38b3489a648d885f816e1c11610955340fab8822b4800b62f99fa30dc96f2930bee98961ee498f967db01d16f731922d044b5cbad91473a10456fc8e87cea81409ad44bcf563cfa3481a779368b859acd9b53205649239b0824c2f8dd2095fc2005bccdc3d3d62064a",
+    "N": "e39046d5574b45d5a8c7d83400cac6434675c8ac2d0836e7e7434b18f466ab4c892e764cd25f2e7c3aa12937f7027830784dadd8062795a87c8d035b5a69b762b051fb8e4946021bc5a6841c30c0508a8b5dd924616179214d5eeb91980afe440dad11d98c104beefef1afc14f5cddcaa944e89885c2b54c3bb198e4cee85318cf0889682f0a1f703310776ce47b165691684ec9ca887b38b3489a648d885f816e1c11610955340fab8822b4800b62f99fa30dc96f2930bee98961ee498f967db01d16f731922d044b5cbad91473a10456fc8e87cea81409ad44bcf563cfa3481a779368b859acd9b53205649239b0824c2f8dd2095fc2005bccdc3d3d620649",
     "NT": "b8d5562cebee1ba65ed1bc96f5a10d7f76f804ff76065ae71ef8e9224c1e8ecaec249e4ef4794053866b9052780ca0adbb656e56427d5e7e041b358a5f23036655a3bf3d180a5795f1aea576670ddc9ee3403dfa1c17babc5d86bd569c8932e404d727dd4ce769646413617a00c11527d40ffaff50b205ceb73de9591a3e614c65f92e1bc01d6f78bc8a7bc349eac9f4d432efa76be3a18d89f49abe6ad2e8fca17a2f100103e6622e290adcaa7b9d80b5fd61c2cffb533de4b9a8c8a0376a595c360f193319bce77256812e972f1e4bb2e38895783f870f7958033a59e3023224da56f5479d6fd8d990d361c4b28987232ae33fa84a24ebc5c041e78b5093d1",
     "H1": "8bae778f2251927e3f12e7f09066eaaea045ba0ea438644d90b7e0d92b2fb622891c9fa3f7a8fbb60b952e5ae0dbab5d775a6e75b6e0cddeb9939b528abdde87db2c53b4d8ab3d037fd4b0e3a5eaa544a3ed851b1488760247f50c6c9019f51061149285db5c9cdda321576f4b5860e2910b9089fc08176704e1355cc7b817db660b1b5db45611b76b26f64583816c6185a98f8e8ae3b4e32850514b1d257c0eed4a7ecdf742e19e6f306ce8d4d7a5f0c31d25ca81942fa361ddf4e09d2bcda669913c7e32b931c38e803503d771c4a1273ea97c9692f6efc58c196f6647f24570795a0408111871db50965e448af151cb1ba50280e391e0d616d8ab6322baef",
     "H2": "9c065939d555a3e69048d00fb90657ade5b886e72ad427004e8fc22ac80d386faefd0c726e5c17b4d9cab3ae297a2f6d74415e3a40d0e48d98efaabd569ed86da13fea4f5f3ca29c50e06c3a07379899ac78ff1e7d5cb606f861934644319481148e7c709bd891aa5a8e969a4d232006607613a9024be96bdfdf3f451613bae36c6019423d8ba6e8498fa95175805b7fbf3bbb2e6dba5de158da9ac0c2226f218f68823365c9a93b084b6942194c16a713f23d7ffc4dd24f79b233e8309b4b29cfea58302ae0de31d744bf07ec8bac125586dfe8cf3414a80e1f7974ca40fb5b5a2ecb6914f871ce0ab977230a4ef6978c1232dbca396554a8ba4c3aeab80396",
@@ -103,7 +103,7 @@
   },
   {
     "TEST": 6,
-    "G": "e38a88dc1ab54960e73a8c11d1471dd070bdc3d3c0bd2bf60b9cbe8bf67afb84ebd3e9415cae89798802ec124b12ed054a92b9100229ff472ca3d53bc86bf570ca6f0938451a77dcd15dc898725358e8097ed014588a83f67a9af21517830a9ab99b71605df13094e2723ce14ce136a9d7a9130e4f84ac8fa25a714f6bf8df935e0976c349d0f57427ce18de4cc46b699b4298ba66644fe9bacad0cbfd45ba45fe338c90e7970a5a3f85a338785db5980e03d243594e9895355a9ebc7dccc23be803313191cb75587b711c01f6bcfd6a0dc5c0ecad5d60da23b19ad3150a95a19b768acbb3b8203258f971c752037a2c21ebbb780b6a845a2c1ed267fbfdb516",
+    "N": "e38a88dc1ab54960e73a8c11d1471dd070bdc3d3c0bd2bf60b9cbe8bf67afb84ebd3e9415cae89798802ec124b12ed054a92b9100229ff472ca3d53bc86bf570ca6f0938451a77dcd15dc898725358e8097ed014588a83f67a9af21517830a9ab99b71605df13094e2723ce14ce136a9d7a9130e4f84ac8fa25a714f6bf8df935e0976c349d0f57427ce18de4cc46b699b4298ba66644fe9bacad0cbfd45ba45fe338c90e7970a5a3f85a338785db5980e03d243594e9895355a9ebc7dccc23be803313191cb75587b711c01f6bcfd6a0dc5c0ecad5d60da23b19ad3150a95a19b768acbb3b8203258f971c752037a2c21ebbb780b6a845a2c1ed267fbfdb515",
     "NT": "d732a7a46bf87b14bc8a80b47a2867203148a8e6835f02d0788a0624a0161fe67c447f4e542bab2ebc19afb9a4c279f06c3f3797ee6a98bc86f9ecf92118547db3c8a7241e3f184934d227b408f68958cba730b5889b159ef3f75f466228788455fbfecba32d3e7fc1e384b06d116b6f1403ddc9c0974a127dbfb009378fa38fd5042831da323fc7b491f98e4b9dd143fc3c94c339316fee2ead9f19e25047fc67f8ea8b3b11959f544fbdef7da6f663513cf4946d34990d989a8caf60112ec6c1278430715a53c0374d7a1f3834cdd1fb4663637f7a09398ea45950ceddfe667dafbb963f617513f0c65ee0588b85340e268df861369091b3d2d51d963862fd",
     "H1": "5b597dafdf245acc13c8edf3f28c1ce39fcb88faa53fdfa9dc4303add5a290e6bdbebb16908c9a892520f9ddb504772dbb7f3c4bb446003aa1d564953f3683c799d7fee697d78490ed5f7b0f4c78f321239e20e64b1d04c180f681a786180d381bae5844e51e1da50807f138e8df3b36f8d1074e7413e33338c211e207beb67e27f5c5cdf89fd75b9165961e14e66cd12c17bdee57f53d55f58a62ef0acb01c3b5fd8ce715482c8372229a532491d1d5adfed338015f178076ceb9567cbda05250f645bcdc49113972153e53bcc7f2e7842c85080ea95008397aad2cc0380c20cdf6b90902f34c39d988b7a7be8768ef9a4e0b1e37a5979b262e6f0de900ca22",
     "H2": "70816d748f1149c7ede4f974c8ac4589871e9f5c5f78b1db0e2edc364e3f71ad613b48f07748fd5b430e505001fed2af6c87933b966ed7c53420083f454aa5deb9d04679b52ae1ea2bf6d9a9949a165b3b6c37f262726761087d657bd21ee57301d6aacf439ebdefb5af685599b9f28c01683eb1863c337110e8a48a1f172a6cf8cb9b0a1101f0d54494ce1fece25c0d1cfa28e865cccdbb6d4b3df355978b9f9669872fa3c967865de0a6cfa6957c813081d81f4f776362e94eeaf81c82ec001b62f4197bb85d76bd37f214df39f3b0a60ab1fdd137915f5f8bcef4eca7880573aa024c81801db3eca3f0c2a086bb4ebad848f1630c01ddb4fee8be0622201d",
@@ -120,7 +120,7 @@
   },
   {
     "TEST": 7,
-    "G": "bfc95d648ddb5a5dd253cbf7a335011bd5fc6d074762f0769e68ea94e2ace6bb9a0e75c1cb1c5f5e5954aee77b062b3109cd7e3d5353aa8ddc449726bec2905adf224f1dd7f0c6ea01d09fe79d32e1ff5f8fee9db1936de005216bb20dd59e0be15757920d74d868f7ae33af0f9c2646933e30086d8670d540ecc0fdbf3835ec2a9f09282cac72272d4bfc7e839dd88bbd8b52b73b3779be4ddcf275e6950694e61f822b1acfe264a3c3355bd7de39a22bb1206fc638e667d800871062cf034b0630bba395bdc00a01fcb035d7a75aa98f650de4cc69bd63f9aca2aa63e2008741c959a3b43203339f0666c58e528a0e7218fac5a3344799505112212fd9d61e",
+    "N": "bfc95d648ddb5a5dd253cbf7a335011bd5fc6d074762f0769e68ea94e2ace6bb9a0e75c1cb1c5f5e5954aee77b062b3109cd7e3d5353aa8ddc449726bec2905adf224f1dd7f0c6ea01d09fe79d32e1ff5f8fee9db1936de005216bb20dd59e0be15757920d74d868f7ae33af0f9c2646933e30086d8670d540ecc0fdbf3835ec2a9f09282cac72272d4bfc7e839dd88bbd8b52b73b3779be4ddcf275e6950694e61f822b1acfe264a3c3355bd7de39a22bb1206fc638e667d800871062cf034b0630bba395bdc00a01fcb035d7a75aa98f650de4cc69bd63f9aca2aa63e2008741c959a3b43203339f0666c58e528a0e7218fac5a3344799505112212fd9d61d",
     "NT": "c031847390333f4b8b1fd0bae9a57ddc4b34bb9819f5285d08d0943db0975b61a43286ca3f83e9fa8768d670189f6ecac37cc2b5ab7e1ec3341c21b5c66816c0ad65a3bb2c45825f85a53bb40b31a89c9ead55706eeb55f8a0819c8b3a5489de0c5911a3a3e9ebf42ea1f9cc152401419e33a7e15f8d3abfc4739890374472a2d714e17587350918ff7c82d9be44f5541f74a7de905b4dc9d0c8333fcd185982a5e7a9304551032115ea99e9cd0e33a9b0c3086cb296719394f95dbb0927d4857f8c4cc4d747e0fa14d1d8478a31a124607a91c7694d511e39c295282ba72953c1460958ade560cdd4f53a4a4191aa5a4711cd9dda12f3f778f09b8d72b161ed",
     "H1": "a7e0a954477a035b922534c00ecda2df1cec5ab11923c54373c4bc04005c2a56addc80919ad15a2960f10f786d5cb873989d7f2f7a1a6981bacaf384558f891d796b679bf0beff3fec6887f893ea10dd59f3d5598d2e2e20a2637441de6f60fb4c96dab5f9cd64d09c4da388b09cb1b70c16d682edd218350840651f8b03e65899ea1d86ccb0460064e36226a1c217f92dc4c4792912c65775feb86eb7cbd1d2dfd522ae72ab0008516a036f06e15bd727112893fce882c942108571482f8037b333ac4dd12f3c6dcb73e8341024165120d74635ef258c3c255d771e51100d0cf7636a674f9002bb8cad68dde65806e2f4ae032a3f3f68e8ecfd15a808109f98",
     "H2": "62c1cd11ce1bd8c31f24057833ab6d03662761c56755f2bc89bd98c028242c03c8b335c4767a7369bacff7ba9a590fda240be0e1ee82be76a9122cedf521786cac53be3c2e67f78e09183e28ff83da0dfff57338fdfbfef8e17d37cc3c49774abfcdc667e7350e8f56f1512493162bbef7eea2f4ad7f34fe7a5997a1d481ce8db0d5e91242cb2be8aa540ce02821e0d3138d6228391e9f543c6a59a4da0a05073c0ae0dd206b3c07ff3d31e103ad11167d81cf2725b500ee1f9ddf28c5313336f645af6fc81af21b9b052a65f0cdf335208d778792887f8d302c76d172f9d7310dd7025963477e8a477e4863129e721e01acfc96b7941c93f8aac8ba2c9d18f5",
@@ -137,7 +137,7 @@
   },
   {
     "TEST": 8,
-    "G": "8339d672f1659194613682fc8037774d5f78c43e6f943d3b78f607e4f6dc2a36d7d41f004c82f1465033d91ac1e6238c1a1a1d95d12df5478dbc701e64b930c5bd59ccf7654511ff346f5afa5a32b5a7497650b24c2bd402fe742288ec5a65ce6b9273488d82e5f080d3d44b3e2997ef0a3b9245ae4387f4515bb8fca45a371d9708530e26df1f5aa21448c294609fd39b139c6ccb7280b127922071e3d7a0a702b5a2ac7972ca562632c39c7bfcbcefe9bf92b3d611a982f61992d6030ad48677010fbf22fb0770bee0a3d7ef9e62647d410726b1fa8d013652788705a7431ae61303f8939d191217ce415f6e7526310b595e8dd9a958289545009d7900b63e",
+    "N": "8339d672f1659194613682fc8037774d5f78c43e6f943d3b78f607e4f6dc2a36d7d41f004c82f1465033d91ac1e6238c1a1a1d95d12df5478dbc701e64b930c5bd59ccf7654511ff346f5afa5a32b5a7497650b24c2bd402fe742288ec5a65ce6b9273488d82e5f080d3d44b3e2997ef0a3b9245ae4387f4515bb8fca45a371d9708530e26df1f5aa21448c294609fd39b139c6ccb7280b127922071e3d7a0a702b5a2ac7972ca562632c39c7bfcbcefe9bf92b3d611a982f61992d6030ad48677010fbf22fb0770bee0a3d7ef9e62647d410726b1fa8d013652788705a7431ae61303f8939d191217ce415f6e7526310b595e8dd9a958289545009d7900b63d",
     "NT": "aa3a57faaa2d2859140344aeeb482e83770b6ea2941c4bec7780251c6bdbd2aa247dedeb19642a8cb55f03ba8d129ea4ef10314f9aa73bedafa112afec5dcf54f90e8319cf8bb80acc148bc34cc8d731237a114d9d088ddc89d419f3180a16793dd927e77258e35260d7885aaf53e7c1338ec3e068bcb8e74e244f29caf01bd3b7da0d08a12128601c353b634bc2a85874d86d2849d69987461a68b670b7d414d7c1a6e0cb1f8aef00e647032b44c993f868b6c4940ee7f0b2c5a4ad07657d9ea889bd90aadca65e845af1a3ca449409939b5df9fbf28036b59c44bdb1d24a458d15976e7905e614fbc779094b612415925588398c3daf1d6536f08068d2baf5",
     "H1": "319f6b60cefc47098857ea81bc79bad4c648e1099f40294c5b776fe7834e6aa6b7851b8ece4f06e7e56f7fe202fb01284d439b4ac4aafb7ab315c8f05c5b45dfd3219598b40d12825b640cf2fd6d9c5c59d6c442a9830dc9ba4791adb6766cc9d219c72b9dfa29e8e482ec21e15791a3de9d3cfa5656571c794eb88777404897d6e0c3ccbf84fa2807dfc40f41095625da8658e7745d7193bc1714c55728f097ba31d3ca3f666e56951b17695a923266f2d1f8893dceb9c9d7f2c8e36cf7d43c57ef9e38dcbdbf2128641a7cfef82b66567ef6d6be75005f4416abe3bd288cc3b2c13ca0b91603016922bd0e819420523ad7b0ee24f6fcc1f8aad89e59020f8d",
     "H2": "57c85884a4636b590c0fade30f98b91c0553e4ed064fbd9b04169e4da12296a3c5bfa8ab5347e5e8156681833cc61a57176e68cbef884ec3548756f49ad9d7d5b32ebf7537df028a172eddeafa9fe9278f76decc008a3f76f35bb5f33453f1c19759e378a4bda8a1d687a5481236f0764a0c3375bd241d6138798a3f7bb0e6fff5b29760844cbf3b8996de70bb9ff8c7f01249ef72012e5bf693c76fb324a4ad76eeb3088f06e0d99f4a0194ac716b80c77e8e70d35e204b31aae1d7ce2ae22151454d2fd37f5b3915fa817f734247389eb44abb9d415de92ec27e10383a11286666abcf409da198e27d86dbe4283ccb6b042329fdf0be7e09642ef04b317e07",
@@ -154,7 +154,7 @@
   },
   {
     "TEST": 9,
-    "G": "d2a49830ae7336c5544f2c570c5ea31d1b681efe51556781a3f875c8d7031d8f0fe4edec5730d662f35bd0aafe6bbfbe73f3ffdaf483d4c9c8dc3a14390577abcb28b3490d80d69d5e7d0bc4a5c51c398327543385f46b1039facce7314e6827a2663f4b447fd899665eead01c2b635a022c5e786fb9f31504fe1f379c40c6bffaaf3732d8bccb41de60d499d2060f0536fef8ac25c48b03edb4207798ff6c86b8b173e4018b2b410b30b59e7bbe3e8ee3b6ac9fe14e66f3bf544926af5e3199ec55f91023381002fdd9818fed89627cfbeba8fd7cb7c0eff55370fb4425275a5cd03fc9170e1569ba23f150fcc884aea61133a5bb21acffba1780887516c6da",
+    "N": "d2a49830ae7336c5544f2c570c5ea31d1b681efe51556781a3f875c8d7031d8f0fe4edec5730d662f35bd0aafe6bbfbe73f3ffdaf483d4c9c8dc3a14390577abcb28b3490d80d69d5e7d0bc4a5c51c398327543385f46b1039facce7314e6827a2663f4b447fd899665eead01c2b635a022c5e786fb9f31504fe1f379c40c6bffaaf3732d8bccb41de60d499d2060f0536fef8ac25c48b03edb4207798ff6c86b8b173e4018b2b410b30b59e7bbe3e8ee3b6ac9fe14e66f3bf544926af5e3199ec55f91023381002fdd9818fed89627cfbeba8fd7cb7c0eff55370fb4425275a5cd03fc9170e1569ba23f150fcc884aea61133a5bb21acffba1780887516c6d9",
     "NT": "e2d11074958171a031686ab23db36f285b0e23f889cf881e66cfaccbbb4d0800fcc9972dc3469b733f0abf4222ad4981eeb748d23d82d8d2be337315b39bb1d87fb782cb59c3c21b14b05d1ba3e080f21c91be2b6a4986e961c03b405d4ab0626f603a992e450268a857e20acf91a0bc913a1d318240cbd8a4a3562fe0f84028931a63df780e9d16f756de3cb837e30412916c0ae01a5f491de64469b7a29cae5b3030314a60ee75d4aad22e0a8c7c523324e3cf402a865815e2f7bc2d51826dbc13527b9a6702f60416d0a72178e82f0e9e06762bd3fe78d4ccfc167e563ffda9bcf7b3eeac25419704d2c7a5e194eb571018529ab69ad6dece43ebd3523145",
     "H1": "d29649e0030610d4f4b9dc6a23a9624134e74156656f2cf39e330e6594f7ea87135beb2065dc2bb63177e21961577d5a328b283dd86b41dc717ba3bbaa3769354d80dc3f30b24128c3761294384e96bc1c621c142491bc617417042afcf6538fb607af3a0ff0ccbc354aad007d1df9498a649b448ac29e127add7eb9b6969da9ded461de699f623cdbfa56cdf141d9305715d746dbbc0d71146eb0fa8c7e3057bf91c94eefd5c9f32dded720f87dde1748f318a65f32d0e27e5357e98ee526d306424d418b5528a2ea29ceaa0e98a9231e5f11d2a93fa5cbd221fd0ebbc81e2cf9dfca6b5854d5dbabf61e643cb88b8cdd50eb518757c48f35440d3f03818e1c",
     "H2": "caa315313033cbf708624019d7ba14ab823885763f64a6050649e87341cc4b05a30b13896ad6b922ccbf47620772d0473a7614d140c8965588cf15ccb93e07fab59c5685e07f961eda65d77659fdc3ade1758902d371045b6a36c6b7fcfb345b2cb11cbd01cd6e623faa1f63a984a840054d8caae14ee109dd92b694a9df2caa69faaaf3e1a8aff0ec888d962bd38e06e13ebc57d8c0de333752a765be67fda5607f7ca643cdc12b2440aa4e089cc0180bd636858f76b4aa3538c433b309879616c2c817f744550d61ced5901ce15b29d618a4aac4eb71a7e676a35e00f5ae0396ad58458921b482022f98dbd76f9396aaddda43350a0c6d43336af1edb2ea87",
diff --git a/testVectors/mta/mtawc_challenge.txt b/testVectors/mta/mtawc_challenge.txt
index 44ec798..dbc4b0e 100644
--- a/testVectors/mta/mtawc_challenge.txt
+++ b/testVectors/mta/mtawc_challenge.txt
@@ -1,5 +1,5 @@
 TEST = 0,
-G = 9d2ebfc5c01624ea48a4f47c2c5e4d1d089809cb1b1b9a2cb7e78d2c385e41000dfc21b876d1570954e0eef4841d34b4081e60f77ec49fe79f6c170862d341fbc8e5014190a9705006001f11d94d12a8b9edcab45318dd187b8db09c2ee10146ec09fa115c3cb294bacb8830cdfafc214f5762d55721baeb37c53e89a4e5f0506e78e196f6565671da34b9ded4fb6ba24f027b7b5d5c5885044cf6d65fe7d95ef78384a4da7abbee49a1f8390d3347f0f28727f3b0dfe97cda42bd9c4430875d04e03c66ef9bd555e06ea9647ba77cf2dfb1e7462bfb1c42962241d4e9cc276eb7526f4ef2eeed4c51314715cd4625156c28c654ac10997fd28ae84268376154,
+N = 9d2ebfc5c01624ea48a4f47c2c5e4d1d089809cb1b1b9a2cb7e78d2c385e41000dfc21b876d1570954e0eef4841d34b4081e60f77ec49fe79f6c170862d341fbc8e5014190a9705006001f11d94d12a8b9edcab45318dd187b8db09c2ee10146ec09fa115c3cb294bacb8830cdfafc214f5762d55721baeb37c53e89a4e5f0506e78e196f6565671da34b9ded4fb6ba24f027b7b5d5c5885044cf6d65fe7d95ef78384a4da7abbee49a1f8390d3347f0f28727f3b0dfe97cda42bd9c4430875d04e03c66ef9bd555e06ea9647ba77cf2dfb1e7462bfb1c42962241d4e9cc276eb7526f4ef2eeed4c51314715cd4625156c28c654ac10997fd28ae84268376153,
 NT = b5eed17dc8d2b334110128bd1b19e58d97c3286e2505283a9f8d060527e8aa76b08771ca8b16ac020b4e022f85f70422abe7ea8f78a0e066188a2ca022a01af3ab93b7c39ba2558425664ae00a3ac13540b9e73ffd44973fd0ed9030850d242cdbd7c8825ef164eb04de336f3e9565b3b9fedefcf5269f54c68d5d2751bd77142f2ddbe3eda0fb68f2397899515057729b7ef88e7c8a459f88b39c33592cd2d95461185522c90c4d8b0feed1c9d4e1d68b7eff16d0439b2a687b24b242521ef3af8ed11151e3b8d50bddf39d90d0d34ba6a13ddec9b0b1cea034ac6c87d9e550335b8e8268094770d137d022d51122dbaaa403a9ffaa3258c8e1bedfc6ef6421,
 H1 = 2972df4590aa4e22a6b7b4d66e3acdb31cf77ce110a0872bba1a85f18764cacdbf698116b55537b79b2115348b2a28cefbaa98a5080c68eed75cf93767c4e594f8923307a70af1e59c8fd0204d5f38d5fa9b2e89fc5f297459f676c664636ced014669c9b2140deb99905d122f37e01f11993ea175a14696379d45a78b44ee6f297793936c21e384857ae8dab08b5f871cd8e95dbba82183024773d918fd584c6007443b26db8ef8c83f5724b769736e24e94ddad9d3513348dd61dd9f8e459f906e646bd7ab8e2a1928ff84a76a43e4618c655565bd30d8abe41b785211ebe0b379764b4e4d177f95a45f18ddd29b74345efc7636fee95786f9b5c74d9850fc,
 H2 = afebd610e000f306ac033cd8c0f70ff7cfa1d582a26f76dd8375a36a609caabcb7bee307e295a03588c01e184d0780d8435a1a970cba375cbffa18a88be9f824e4b6d4e49f4af7ec0872cded761b38c4477a90d46532e3c7639bf758c27a6068e1737ab5a94093bf320dfd1d8cb8375612b81de678dfc320e9255c046df54ece98a18880284377277c44ded1f8b8b5371bfeed25faf73511fbf2042e6792530494ca505b5e5b37a283c52ccfbda2d60802011431cdf04a991c98a9f51e6f59f226dade13714a58e64ac37d2f90220ea5842de5cc9cda29611dcd4a8a8ec7426ef04d016d9e527aafae9ac534f1bd19dea57b526b9207806ffbb19ad8a20fcbe1,
@@ -15,7 +15,7 @@
 U = 0201f8f261191afb3f06c5c16e0de05aa7519214919161811df62f66a57cbedfe2,
 
 TEST = 1,
-G = abef1343f695ae701e248ceb981aae088891b7aa9fedc2863c201d51f20b7d4f7c8ca4ff21b3e58e06c0f1e7071d083e77b03b0c077d02f0c2afcad5282d505040efcb2b35190bcb7b7039f425e050a31c89bb441c3be69d0a583e8665e14a26e81baeb67ea0a97f0d5aab92445bc84e859aa65816e44ab9cf2a0bbf4425902cfb93a9929ffabcc20c90451da86fcfd319d0875e61c9cf02a2bf7acad485414b6f8af86dd4d9340f164bc69585d3ef510b56c1f2ae255138df6587518345771f91db5299c6d68196f3a63513f0463fa140d860151860f2bbc6d8cfa9f5b55b49b98787f9b177f474a2c119131b796e2861e6b06d0b9825ade28970bec9a4fe88,
+N = abef1343f695ae701e248ceb981aae088891b7aa9fedc2863c201d51f20b7d4f7c8ca4ff21b3e58e06c0f1e7071d083e77b03b0c077d02f0c2afcad5282d505040efcb2b35190bcb7b7039f425e050a31c89bb441c3be69d0a583e8665e14a26e81baeb67ea0a97f0d5aab92445bc84e859aa65816e44ab9cf2a0bbf4425902cfb93a9929ffabcc20c90451da86fcfd319d0875e61c9cf02a2bf7acad485414b6f8af86dd4d9340f164bc69585d3ef510b56c1f2ae255138df6587518345771f91db5299c6d68196f3a63513f0463fa140d860151860f2bbc6d8cfa9f5b55b49b98787f9b177f474a2c119131b796e2861e6b06d0b9825ade28970bec9a4fe87,
 NT = c1b8aab9caaf1f9021fcd135ef022089792684e7cdb1467ff522e46713609e7ebb633f19ad52e597f7dbdb59f6684f204f368b7104116a1fd8eabdc9ef7eb4b64867ad1f007f74bc57f2fb77b0b9b518af7df355e7a5d99217df442358543b76a51798e8ef194437fb4b58378943cc812942805a0b3d30eccae13fb56ea3500a781549d1d6fbd0b2ac57d63aedaa05987298201d8434b6e51b3c0e75bbd7eeb3cfbd4f79d28692110738954720784d269fabf4d4280d61e4fb8581803dd75e1be888d29d8ca419b68ea9850919c0d5563104c084f9fe0730b496b70612aa131b20b951ea8eb61c30b186a684698f22bf09d2b02b82504a1cb3491ad01fceadad,
 H1 = 5c4a4492b2d0979f73fe00b53a1a27583c294ea5aef17ba4841b7b31bfa05e6c6b03b2e6d251a4ea8e82a7ae124dd33d401720a621e7d60405ed60ed72885063947e13f76346255ce9f7f39478c241e0ab4b3551b783e50f03e7820db446a8386542bf65404b06d741fcc8f3be232a02f5121123a58a4d2cb8a1e1dc937b17d71a07efa045794e88c6e79d7f83c64e8c8538521b61f5e6562c35b29d67c8f56f60e3d6cc8be18a081501aecf69289daac769b7b068bb9d656d7f517bc8b8a9fbb64628772801fc7acc447be862f9253c2072f097fac318928f64da494fb07f2141cc55f4c68f7bd5c84f025f3d0716d9b07bb9b9846d0e24786a426eef74aeec,
 H2 = 6b577e5a3fa30d7e2d7c38b327eb6e7f09634d57dffe0abb2f3d6c33929507fc19dd137b16c2afdbfb09cf12e896519b8de8dc4f3aefac800e29b9bba3c1a761ef7439a2cf5c0fd3334e87b3b62196e2d63c3da27d3708acdd5f08a9fef65b8b84ef2787afdd5711b8d9aace89067c4f9720450221532d1f0c76f23d41b76d3e96436be0756830f6851c966ca507ccdb1bef7d5d9064221c9b3eaeaf506f92fcb9df77996c731279317f190aa35f1955de3005448bc436d16ecdfdfc03592fdceeacd98a127cc28a55d734040cee90531a9a8e45896c8342073635e3d1f6ec2dd51c4215cd22679b7f84ada3dcf23464362b79dd6dbdb13e16336edcd4b106d9,
@@ -31,7 +31,7 @@
 U = 03f3c6b17ebb81280ae82d48a692acc883b73d94add7d5acf15bce7ca05a8656ab,
 
 TEST = 2,
-G = a337d9eff0632aa56a74706edb4b456e91a78f55b788e1eba279ffa911149e4afafcb20d5f3d80ab55af2f84470fe4aaac6d7d89e18180465442c98399ecca5d1509be124e48d68f6ad1032539926e4104aef6bb3bee0e10cf4d48669955d9440815dc8906e6030ddd7adc6455389ad6dd32daeeba68e58cc6d1720669bfe4922510067288f94d077e3551e1c64722806d9981898c7147e13372bccdd087552e9d702ae37e280bc878e235a85d13230f62acdfc932270e1ce68d8bf10a5a7ae6f0c96e8d89c73b3a764418d1ff74277f98469a9e500c3ae46af71f3b92c6fa3cb0cc57dedafd2ee488e507550468b30c72eaa53f5948fda15700a1cdfe1589e2,
+N = a337d9eff0632aa56a74706edb4b456e91a78f55b788e1eba279ffa911149e4afafcb20d5f3d80ab55af2f84470fe4aaac6d7d89e18180465442c98399ecca5d1509be124e48d68f6ad1032539926e4104aef6bb3bee0e10cf4d48669955d9440815dc8906e6030ddd7adc6455389ad6dd32daeeba68e58cc6d1720669bfe4922510067288f94d077e3551e1c64722806d9981898c7147e13372bccdd087552e9d702ae37e280bc878e235a85d13230f62acdfc932270e1ce68d8bf10a5a7ae6f0c96e8d89c73b3a764418d1ff74277f98469a9e500c3ae46af71f3b92c6fa3cb0cc57dedafd2ee488e507550468b30c72eaa53f5948fda15700a1cdfe1589e1,
 NT = dfbdfc2a4784522a0bcd93a9925e2d185ec9af22e3c76af9e3a55552ef2d22e01c3a9e5155420383305ae63787a6451f91d2ee741c24a695272fa1f3b7ed6830d7c9f519fe3afefd97b956029c9bb781ea3efe49bc9cfd911dd132f7b1c12d9002fe73782c148b299144b664200246b3a5336b46768afe63e8b508efb0aeb71022e27307663d1ff104865310e59edeb9220630561530a7de5e3c5a74abaa4549b80d37e851c8affc44eb1024387c63a7854346ba6cf9c9305d04350b93db8cde33c3260789feff3b3c4d55cd50216e4473db4fd83d138e6bf25a9d609f010769895dd1844fdaed0cca3a773ecb734a6687ec07422d5ec7496238cba08fd08fa9,
 H1 = c78729b328d0e847ddd3e8833214206a2ab0f17b969bf4495ccfe9290423aa7b2c8e60e08da1876226d540a987e3b9e5b907bdf49afec130678bd471da3ea108a959f2ebe86a328bb50fa9f8a1670becf254c350dfa6ef11ae6ce5d0d50871d11cc7afa408b2f4434c38a8242dac6ae81b21707d19d123bb3417ae138260885c761b60ae48e3b95b819023ce0c6f1f131014bbc088fb0e8a1e03f32cb674e9dd4a950d1f9616f9ea17cfde92e648344b3ac0b5fcacae71bcbcad062d09265bf1fe563fa24558ab1f771cb9e64453672e11db350df544325e294cefccd989492abb3aa34291ebdcdf286cc6bc7efd9361cd3e2dc7cf32059e819a863c80b10d8a,
 H2 = 265af6df1ba4727660abafa959877f18db62cf9a80ce191afc2b8689dc6bbb0b1fccdd001d3b53f67f946d8342f179b78bef22d66612d2b6c1b37b7ed735470512c726bd6b686b1dd25a9e307ad7880ac0cfc0453943248175aa58484a5cf505dc9fad0f45ccb219c5e072826b0e6e445a73fcd0d3c52e31d160b4056a896221692cd17b1ff04a2da5d7c3c36e7afd1042d5943f6de276ffc26c4155f7572b5a051e967887475d74fc0a58692abca863317eef69be91dc51c733280ab4e06f8cfc246efc5dc4a94067d6a6e4f8aec053dfe69e492abb128ca92905ea6a9fdf5687bc239a1d4690a82aacd0e95e06e4c04f2e2884a0c4eb47ff818e05aab1a203,
@@ -47,7 +47,7 @@
 U = 021184436b3c268646eee269e6f31f20bf34abcfbe8842ca251f484de5ae539c22,
 
 TEST = 3,
-G = cb1fcf6c130265c5a7b369319a3c51b919a2850cfbcff80e22c4f3a3f376ae5a0a4b19ee0e1832e52d7ed86be4d0296074dcbac05d3fd4214d33fcb3f2b7f357960044ce80ea1429b62af8b94351d22bdbf875f2ebeeb67d01f592beed9a4a5ea0a9514791bb56776496158166cc3f65090a215c99d5d6805dc1fecf01cd29361315c9c6421b6b4f8a55925cbcb0dc70b20c45c0a67c4560a7e832fdad26db0bdc8cdce75ca675e06c81db9032d384849b2852b456d02941875927c1acd993c303d9beafd325462dd55b505e8108f16b5ffe8642496e633652c0c0306f8d54621f4e32ec7074242550493950bc23d756f37da05615591b1352592a3a5f718116,
+N = cb1fcf6c130265c5a7b369319a3c51b919a2850cfbcff80e22c4f3a3f376ae5a0a4b19ee0e1832e52d7ed86be4d0296074dcbac05d3fd4214d33fcb3f2b7f357960044ce80ea1429b62af8b94351d22bdbf875f2ebeeb67d01f592beed9a4a5ea0a9514791bb56776496158166cc3f65090a215c99d5d6805dc1fecf01cd29361315c9c6421b6b4f8a55925cbcb0dc70b20c45c0a67c4560a7e832fdad26db0bdc8cdce75ca675e06c81db9032d384849b2852b456d02941875927c1acd993c303d9beafd325462dd55b505e8108f16b5ffe8642496e633652c0c0306f8d54621f4e32ec7074242550493950bc23d756f37da05615591b1352592a3a5f718115,
 NT = a86824e86c82674f33904dbdcb24e39d2464f3f906a90702ae2af8f71be38e87cb974493dbdfc40ec9477fde12be9f9c3d8ce49b31a9a55e8e7b56909b263106025cacbb8d454375f0078689f2c7df41e6c0a92a10aee5e53718ff1ed4ce08ac3eeef87d42e41e485f457720dd0173bea2d6aec0c6aa0046965e09c755244bf365c92f884dc2c38c415e041fda53b0226147ba3d8ded0b8d1cfb36f4aad7b98cf24f46dcbc6c83e9f40aa44d50c3c0cabc27d4c52a0c6e6fcc4736303bb65c5149a7a263a4524abdb512407a5a84267ee90412aef31d81251e20ed3735ce6f3ad0051138b21f58d95dc0bfa1b73b5b5adae3548d5a160faac4b865a2b85b0c6d,
 H1 = 72737de20e079bcaddde646987f621ddcf64300159541ac9a883789755f98f988244f390077cf5e5090824bdb4b69915aaae2572c19ce68d56e832feeda3d9c3c1c2f0c28bd5341267c24ce6301d6a06146673e6a6563ac45b98989d7b7fbb89d5bfa28e1256f9b1e1f378834c91e15b05b360c9a2e29d9d3fc33db9654fbfed0673251d20f83a16db700c3605715f9f5fa7f0a726bbb34bd32b749aa63e7e8f77ff92f7fe01fcf6ee2ac8fbd0b851d6252dc4d99f22e1c2787bc8cdba8c74c9a883ed20ca9a237c03150e78e12cb65ce7ea0ce54226021ce037253996554ebaaaf783093850912ce6ca27f197eb8bd7b91403f843c657ec8a725dfaa26d1795,
 H2 = 0dc3fa17b51f4eb6f81d045563ee4bd1cd83bdfc9389111b0e48b96434c92c64c2a68943d604431e748b810b6dd5aa0cceeeb9f9ee3ec26fe6fd938d6056599302c364b43bb3c4adfb02a6037e60add4e4bd4c4eeda69a0ae16fffa6807af82801e82ac0ca724ffcb67e284eaf04c97413804a2a5ea96521875a5f4bdf8034cb940602d9787af35294b9c257f3bfdfae6d99b0c6b976a31af59a0dc4d6bbc60105a5075aa9d9866a72944060738dfc2a94386042e00db3c2198893600b4c76bf7e1fa7058b605f7f8f42c40625721c869a400b0328533877968a50e4bd6f6e297002f2c7389f2d93f5921480a6a51335ffef002a09302200dd4276def19bda42,
@@ -63,7 +63,7 @@
 U = 02faad46ee4a0fbcd2eefe70037d09be327e5f48789efecd36f74d63095bf82d4a,
 
 TEST = 4,
-G = bbbd7ed9e7c3aa15dcfbfc5a72147243214667e99d6a152b2dc4cd9367256da65cf8aef48b53a4f56ebe2b4a4c8a8a450da3f8b2745f7777d4e820271d82e2e781ce0060d51027f99198b5bae2be83de52944a9ed7350cc20fc292cb23d5d8b6e181b47697591fdea8e229c2583abd6ffa041b93a94a4e8670381eee9b490ca99c1187b0a3c124c52e7057d4a3505859ed5ec3fdb01808c1672b3eb9c20fead407e256c7dfc8125336e43490207effd95377f0db93a439d1e8e49c3227fbb4e06df0c58eb5aa2524cc74547d56b7d31d78d712a09f6f0e2f103d692109d295d6c234d481d487c1eca2b4eb3b6a4814095b42260546f7f1bdcb86df28dd368a6c,
+N = bbbd7ed9e7c3aa15dcfbfc5a72147243214667e99d6a152b2dc4cd9367256da65cf8aef48b53a4f56ebe2b4a4c8a8a450da3f8b2745f7777d4e820271d82e2e781ce0060d51027f99198b5bae2be83de52944a9ed7350cc20fc292cb23d5d8b6e181b47697591fdea8e229c2583abd6ffa041b93a94a4e8670381eee9b490ca99c1187b0a3c124c52e7057d4a3505859ed5ec3fdb01808c1672b3eb9c20fead407e256c7dfc8125336e43490207effd95377f0db93a439d1e8e49c3227fbb4e06df0c58eb5aa2524cc74547d56b7d31d78d712a09f6f0e2f103d692109d295d6c234d481d487c1eca2b4eb3b6a4814095b42260546f7f1bdcb86df28dd368a6b,
 NT = 9c9bc9253874a40a5a355579224cba50de2b41b28e6090aff68358b3b427b6c1d380dd159830af170deb982bc00eced7f4fd1767584d8c2d9679112404d565caec1ab17d20a2f0266fdf318a98cebd98def0aaab434e5de8e2231f899cd48db142b2893bc3c61bf679e6ab1132969cf78764f27b42fc2fef54d08ef578d8b26fd6809e65540d8433d3d7624a0932b80a71733788371789c3fbc6328020e844e8b9630346bae67e04b6ef762321dc75aa4def408a27ff0b2954a7de9c6daff0a21a3081ffa60a98af89ffea10337c6a8644afe0f5072cf1748fec2653337a85a8bee2d088510863383893c86be8d76682a5b1d4b19fd4e7a040c4c50d14bfef49,
 H1 = 7fb15b64d377580b6f5d4eaf8434921cfb854753bbfefd24715508dc46e47fada23f64190d5d66efe8486776649e72af958bfb5713f1b6fddfac13611a3704f177a3da756efa69cab0de5e5e146dcb7adca6e9ea72e8ffbe9ad83a7c3c58576466a06c8194bf397832f0ffa51a144aea12150262e12da670307e19791e03d8392ac1831a02b38d6e902c4ef289b04926f0e73e51c4ce668e1b455ac7508b8bbd541cc5b7f974ce75e92c514dab01f7e02698db7bfa539a6800a6d9a2a3fa00a56137e71462bd764eaa9482decaabd7214b1e4b06e36b57bfab857457086989a987724fc934a4ef7eaaa60c818c94b14113692dff534180ffd4257f2885badb97,
 H2 = 21b2cbd7078cd10589305a6c252325b3339824978e98cd8505a352f3c9c780b5318a79731839eb86def41236bd1513a63d63f38829d98c3b5e0ab91d019ae2ab04a6df3516ab5b673abfdad932ecae02372cdc70d3c7caaf79a2045d1c07d38c10efad377c811158db18362c9379c4799a924a2c47b2d914673db731e0cfab42b7f5de10a9ca461e1420f504710f8add8374b4dad5a45c0d7d62a6b0f39c82313d04812aeb7bb11aecc8971b6ef79e9cc3e15e6c0aaa77658bdb6557a1f5bf54885b914122bb1bd56393849b077bcc87e17331d03ce1bb80d4c667d2e5fbf463dacc47653bc309c6c5ff1c667fc44e483228b499427704f5084700acdb04c117,
@@ -79,7 +79,7 @@
 U = 034c192f4bd3461311e5dfdc482e9989cf54877a2f8f0949cf9e204e7012a3b339,
 
 TEST = 5,
-G = e39046d5574b45d5a8c7d83400cac6434675c8ac2d0836e7e7434b18f466ab4c892e764cd25f2e7c3aa12937f7027830784dadd8062795a87c8d035b5a69b762b051fb8e4946021bc5a6841c30c0508a8b5dd924616179214d5eeb91980afe440dad11d98c104beefef1afc14f5cddcaa944e89885c2b54c3bb198e4cee85318cf0889682f0a1f703310776ce47b165691684ec9ca887b38b3489a648d885f816e1c11610955340fab8822b4800b62f99fa30dc96f2930bee98961ee498f967db01d16f731922d044b5cbad91473a10456fc8e87cea81409ad44bcf563cfa3481a779368b859acd9b53205649239b0824c2f8dd2095fc2005bccdc3d3d62064a,
+N = e39046d5574b45d5a8c7d83400cac6434675c8ac2d0836e7e7434b18f466ab4c892e764cd25f2e7c3aa12937f7027830784dadd8062795a87c8d035b5a69b762b051fb8e4946021bc5a6841c30c0508a8b5dd924616179214d5eeb91980afe440dad11d98c104beefef1afc14f5cddcaa944e89885c2b54c3bb198e4cee85318cf0889682f0a1f703310776ce47b165691684ec9ca887b38b3489a648d885f816e1c11610955340fab8822b4800b62f99fa30dc96f2930bee98961ee498f967db01d16f731922d044b5cbad91473a10456fc8e87cea81409ad44bcf563cfa3481a779368b859acd9b53205649239b0824c2f8dd2095fc2005bccdc3d3d620649,
 NT = b8d5562cebee1ba65ed1bc96f5a10d7f76f804ff76065ae71ef8e9224c1e8ecaec249e4ef4794053866b9052780ca0adbb656e56427d5e7e041b358a5f23036655a3bf3d180a5795f1aea576670ddc9ee3403dfa1c17babc5d86bd569c8932e404d727dd4ce769646413617a00c11527d40ffaff50b205ceb73de9591a3e614c65f92e1bc01d6f78bc8a7bc349eac9f4d432efa76be3a18d89f49abe6ad2e8fca17a2f100103e6622e290adcaa7b9d80b5fd61c2cffb533de4b9a8c8a0376a595c360f193319bce77256812e972f1e4bb2e38895783f870f7958033a59e3023224da56f5479d6fd8d990d361c4b28987232ae33fa84a24ebc5c041e78b5093d1,
 H1 = 8bae778f2251927e3f12e7f09066eaaea045ba0ea438644d90b7e0d92b2fb622891c9fa3f7a8fbb60b952e5ae0dbab5d775a6e75b6e0cddeb9939b528abdde87db2c53b4d8ab3d037fd4b0e3a5eaa544a3ed851b1488760247f50c6c9019f51061149285db5c9cdda321576f4b5860e2910b9089fc08176704e1355cc7b817db660b1b5db45611b76b26f64583816c6185a98f8e8ae3b4e32850514b1d257c0eed4a7ecdf742e19e6f306ce8d4d7a5f0c31d25ca81942fa361ddf4e09d2bcda669913c7e32b931c38e803503d771c4a1273ea97c9692f6efc58c196f6647f24570795a0408111871db50965e448af151cb1ba50280e391e0d616d8ab6322baef,
 H2 = 9c065939d555a3e69048d00fb90657ade5b886e72ad427004e8fc22ac80d386faefd0c726e5c17b4d9cab3ae297a2f6d74415e3a40d0e48d98efaabd569ed86da13fea4f5f3ca29c50e06c3a07379899ac78ff1e7d5cb606f861934644319481148e7c709bd891aa5a8e969a4d232006607613a9024be96bdfdf3f451613bae36c6019423d8ba6e8498fa95175805b7fbf3bbb2e6dba5de158da9ac0c2226f218f68823365c9a93b084b6942194c16a713f23d7ffc4dd24f79b233e8309b4b29cfea58302ae0de31d744bf07ec8bac125586dfe8cf3414a80e1f7974ca40fb5b5a2ecb6914f871ce0ab977230a4ef6978c1232dbca396554a8ba4c3aeab80396,
@@ -95,7 +95,7 @@
 U = 023430c041eceb49e5180b2151958dd76192f014a9a982709822f7f637c5ac4426,
 
 TEST = 6,
-G = e38a88dc1ab54960e73a8c11d1471dd070bdc3d3c0bd2bf60b9cbe8bf67afb84ebd3e9415cae89798802ec124b12ed054a92b9100229ff472ca3d53bc86bf570ca6f0938451a77dcd15dc898725358e8097ed014588a83f67a9af21517830a9ab99b71605df13094e2723ce14ce136a9d7a9130e4f84ac8fa25a714f6bf8df935e0976c349d0f57427ce18de4cc46b699b4298ba66644fe9bacad0cbfd45ba45fe338c90e7970a5a3f85a338785db5980e03d243594e9895355a9ebc7dccc23be803313191cb75587b711c01f6bcfd6a0dc5c0ecad5d60da23b19ad3150a95a19b768acbb3b8203258f971c752037a2c21ebbb780b6a845a2c1ed267fbfdb516,
+N = e38a88dc1ab54960e73a8c11d1471dd070bdc3d3c0bd2bf60b9cbe8bf67afb84ebd3e9415cae89798802ec124b12ed054a92b9100229ff472ca3d53bc86bf570ca6f0938451a77dcd15dc898725358e8097ed014588a83f67a9af21517830a9ab99b71605df13094e2723ce14ce136a9d7a9130e4f84ac8fa25a714f6bf8df935e0976c349d0f57427ce18de4cc46b699b4298ba66644fe9bacad0cbfd45ba45fe338c90e7970a5a3f85a338785db5980e03d243594e9895355a9ebc7dccc23be803313191cb75587b711c01f6bcfd6a0dc5c0ecad5d60da23b19ad3150a95a19b768acbb3b8203258f971c752037a2c21ebbb780b6a845a2c1ed267fbfdb515,
 NT = d732a7a46bf87b14bc8a80b47a2867203148a8e6835f02d0788a0624a0161fe67c447f4e542bab2ebc19afb9a4c279f06c3f3797ee6a98bc86f9ecf92118547db3c8a7241e3f184934d227b408f68958cba730b5889b159ef3f75f466228788455fbfecba32d3e7fc1e384b06d116b6f1403ddc9c0974a127dbfb009378fa38fd5042831da323fc7b491f98e4b9dd143fc3c94c339316fee2ead9f19e25047fc67f8ea8b3b11959f544fbdef7da6f663513cf4946d34990d989a8caf60112ec6c1278430715a53c0374d7a1f3834cdd1fb4663637f7a09398ea45950ceddfe667dafbb963f617513f0c65ee0588b85340e268df861369091b3d2d51d963862fd,
 H1 = 5b597dafdf245acc13c8edf3f28c1ce39fcb88faa53fdfa9dc4303add5a290e6bdbebb16908c9a892520f9ddb504772dbb7f3c4bb446003aa1d564953f3683c799d7fee697d78490ed5f7b0f4c78f321239e20e64b1d04c180f681a786180d381bae5844e51e1da50807f138e8df3b36f8d1074e7413e33338c211e207beb67e27f5c5cdf89fd75b9165961e14e66cd12c17bdee57f53d55f58a62ef0acb01c3b5fd8ce715482c8372229a532491d1d5adfed338015f178076ceb9567cbda05250f645bcdc49113972153e53bcc7f2e7842c85080ea95008397aad2cc0380c20cdf6b90902f34c39d988b7a7be8768ef9a4e0b1e37a5979b262e6f0de900ca22,
 H2 = 70816d748f1149c7ede4f974c8ac4589871e9f5c5f78b1db0e2edc364e3f71ad613b48f07748fd5b430e505001fed2af6c87933b966ed7c53420083f454aa5deb9d04679b52ae1ea2bf6d9a9949a165b3b6c37f262726761087d657bd21ee57301d6aacf439ebdefb5af685599b9f28c01683eb1863c337110e8a48a1f172a6cf8cb9b0a1101f0d54494ce1fece25c0d1cfa28e865cccdbb6d4b3df355978b9f9669872fa3c967865de0a6cfa6957c813081d81f4f776362e94eeaf81c82ec001b62f4197bb85d76bd37f214df39f3b0a60ab1fdd137915f5f8bcef4eca7880573aa024c81801db3eca3f0c2a086bb4ebad848f1630c01ddb4fee8be0622201d,
@@ -111,7 +111,7 @@
 U = 0394d9b186ff1b941fb9302c97640bfe72cdf1c524947a0450d675dabc92178b76,
 
 TEST = 7,
-G = bfc95d648ddb5a5dd253cbf7a335011bd5fc6d074762f0769e68ea94e2ace6bb9a0e75c1cb1c5f5e5954aee77b062b3109cd7e3d5353aa8ddc449726bec2905adf224f1dd7f0c6ea01d09fe79d32e1ff5f8fee9db1936de005216bb20dd59e0be15757920d74d868f7ae33af0f9c2646933e30086d8670d540ecc0fdbf3835ec2a9f09282cac72272d4bfc7e839dd88bbd8b52b73b3779be4ddcf275e6950694e61f822b1acfe264a3c3355bd7de39a22bb1206fc638e667d800871062cf034b0630bba395bdc00a01fcb035d7a75aa98f650de4cc69bd63f9aca2aa63e2008741c959a3b43203339f0666c58e528a0e7218fac5a3344799505112212fd9d61e,
+N = bfc95d648ddb5a5dd253cbf7a335011bd5fc6d074762f0769e68ea94e2ace6bb9a0e75c1cb1c5f5e5954aee77b062b3109cd7e3d5353aa8ddc449726bec2905adf224f1dd7f0c6ea01d09fe79d32e1ff5f8fee9db1936de005216bb20dd59e0be15757920d74d868f7ae33af0f9c2646933e30086d8670d540ecc0fdbf3835ec2a9f09282cac72272d4bfc7e839dd88bbd8b52b73b3779be4ddcf275e6950694e61f822b1acfe264a3c3355bd7de39a22bb1206fc638e667d800871062cf034b0630bba395bdc00a01fcb035d7a75aa98f650de4cc69bd63f9aca2aa63e2008741c959a3b43203339f0666c58e528a0e7218fac5a3344799505112212fd9d61d,
 NT = c031847390333f4b8b1fd0bae9a57ddc4b34bb9819f5285d08d0943db0975b61a43286ca3f83e9fa8768d670189f6ecac37cc2b5ab7e1ec3341c21b5c66816c0ad65a3bb2c45825f85a53bb40b31a89c9ead55706eeb55f8a0819c8b3a5489de0c5911a3a3e9ebf42ea1f9cc152401419e33a7e15f8d3abfc4739890374472a2d714e17587350918ff7c82d9be44f5541f74a7de905b4dc9d0c8333fcd185982a5e7a9304551032115ea99e9cd0e33a9b0c3086cb296719394f95dbb0927d4857f8c4cc4d747e0fa14d1d8478a31a124607a91c7694d511e39c295282ba72953c1460958ade560cdd4f53a4a4191aa5a4711cd9dda12f3f778f09b8d72b161ed,
 H1 = a7e0a954477a035b922534c00ecda2df1cec5ab11923c54373c4bc04005c2a56addc80919ad15a2960f10f786d5cb873989d7f2f7a1a6981bacaf384558f891d796b679bf0beff3fec6887f893ea10dd59f3d5598d2e2e20a2637441de6f60fb4c96dab5f9cd64d09c4da388b09cb1b70c16d682edd218350840651f8b03e65899ea1d86ccb0460064e36226a1c217f92dc4c4792912c65775feb86eb7cbd1d2dfd522ae72ab0008516a036f06e15bd727112893fce882c942108571482f8037b333ac4dd12f3c6dcb73e8341024165120d74635ef258c3c255d771e51100d0cf7636a674f9002bb8cad68dde65806e2f4ae032a3f3f68e8ecfd15a808109f98,
 H2 = 62c1cd11ce1bd8c31f24057833ab6d03662761c56755f2bc89bd98c028242c03c8b335c4767a7369bacff7ba9a590fda240be0e1ee82be76a9122cedf521786cac53be3c2e67f78e09183e28ff83da0dfff57338fdfbfef8e17d37cc3c49774abfcdc667e7350e8f56f1512493162bbef7eea2f4ad7f34fe7a5997a1d481ce8db0d5e91242cb2be8aa540ce02821e0d3138d6228391e9f543c6a59a4da0a05073c0ae0dd206b3c07ff3d31e103ad11167d81cf2725b500ee1f9ddf28c5313336f645af6fc81af21b9b052a65f0cdf335208d778792887f8d302c76d172f9d7310dd7025963477e8a477e4863129e721e01acfc96b7941c93f8aac8ba2c9d18f5,
@@ -127,7 +127,7 @@
 U = 029924410687adba39cea801fb07e0c46d556a41e0070ae719b2299322c0ea318f,
 
 TEST = 8,
-G = 8339d672f1659194613682fc8037774d5f78c43e6f943d3b78f607e4f6dc2a36d7d41f004c82f1465033d91ac1e6238c1a1a1d95d12df5478dbc701e64b930c5bd59ccf7654511ff346f5afa5a32b5a7497650b24c2bd402fe742288ec5a65ce6b9273488d82e5f080d3d44b3e2997ef0a3b9245ae4387f4515bb8fca45a371d9708530e26df1f5aa21448c294609fd39b139c6ccb7280b127922071e3d7a0a702b5a2ac7972ca562632c39c7bfcbcefe9bf92b3d611a982f61992d6030ad48677010fbf22fb0770bee0a3d7ef9e62647d410726b1fa8d013652788705a7431ae61303f8939d191217ce415f6e7526310b595e8dd9a958289545009d7900b63e,
+N = 8339d672f1659194613682fc8037774d5f78c43e6f943d3b78f607e4f6dc2a36d7d41f004c82f1465033d91ac1e6238c1a1a1d95d12df5478dbc701e64b930c5bd59ccf7654511ff346f5afa5a32b5a7497650b24c2bd402fe742288ec5a65ce6b9273488d82e5f080d3d44b3e2997ef0a3b9245ae4387f4515bb8fca45a371d9708530e26df1f5aa21448c294609fd39b139c6ccb7280b127922071e3d7a0a702b5a2ac7972ca562632c39c7bfcbcefe9bf92b3d611a982f61992d6030ad48677010fbf22fb0770bee0a3d7ef9e62647d410726b1fa8d013652788705a7431ae61303f8939d191217ce415f6e7526310b595e8dd9a958289545009d7900b63d,
 NT = aa3a57faaa2d2859140344aeeb482e83770b6ea2941c4bec7780251c6bdbd2aa247dedeb19642a8cb55f03ba8d129ea4ef10314f9aa73bedafa112afec5dcf54f90e8319cf8bb80acc148bc34cc8d731237a114d9d088ddc89d419f3180a16793dd927e77258e35260d7885aaf53e7c1338ec3e068bcb8e74e244f29caf01bd3b7da0d08a12128601c353b634bc2a85874d86d2849d69987461a68b670b7d414d7c1a6e0cb1f8aef00e647032b44c993f868b6c4940ee7f0b2c5a4ad07657d9ea889bd90aadca65e845af1a3ca449409939b5df9fbf28036b59c44bdb1d24a458d15976e7905e614fbc779094b612415925588398c3daf1d6536f08068d2baf5,
 H1 = 319f6b60cefc47098857ea81bc79bad4c648e1099f40294c5b776fe7834e6aa6b7851b8ece4f06e7e56f7fe202fb01284d439b4ac4aafb7ab315c8f05c5b45dfd3219598b40d12825b640cf2fd6d9c5c59d6c442a9830dc9ba4791adb6766cc9d219c72b9dfa29e8e482ec21e15791a3de9d3cfa5656571c794eb88777404897d6e0c3ccbf84fa2807dfc40f41095625da8658e7745d7193bc1714c55728f097ba31d3ca3f666e56951b17695a923266f2d1f8893dceb9c9d7f2c8e36cf7d43c57ef9e38dcbdbf2128641a7cfef82b66567ef6d6be75005f4416abe3bd288cc3b2c13ca0b91603016922bd0e819420523ad7b0ee24f6fcc1f8aad89e59020f8d,
 H2 = 57c85884a4636b590c0fade30f98b91c0553e4ed064fbd9b04169e4da12296a3c5bfa8ab5347e5e8156681833cc61a57176e68cbef884ec3548756f49ad9d7d5b32ebf7537df028a172eddeafa9fe9278f76decc008a3f76f35bb5f33453f1c19759e378a4bda8a1d687a5481236f0764a0c3375bd241d6138798a3f7bb0e6fff5b29760844cbf3b8996de70bb9ff8c7f01249ef72012e5bf693c76fb324a4ad76eeb3088f06e0d99f4a0194ac716b80c77e8e70d35e204b31aae1d7ce2ae22151454d2fd37f5b3915fa817f734247389eb44abb9d415de92ec27e10383a11286666abcf409da198e27d86dbe4283ccb6b042329fdf0be7e09642ef04b317e07,
@@ -143,7 +143,7 @@
 U = 03b3077043d8f6b8088be10fdf63ed7c5298835543c37542f26bdf6d5ce8692092,
 
 TEST = 9,
-G = d2a49830ae7336c5544f2c570c5ea31d1b681efe51556781a3f875c8d7031d8f0fe4edec5730d662f35bd0aafe6bbfbe73f3ffdaf483d4c9c8dc3a14390577abcb28b3490d80d69d5e7d0bc4a5c51c398327543385f46b1039facce7314e6827a2663f4b447fd899665eead01c2b635a022c5e786fb9f31504fe1f379c40c6bffaaf3732d8bccb41de60d499d2060f0536fef8ac25c48b03edb4207798ff6c86b8b173e4018b2b410b30b59e7bbe3e8ee3b6ac9fe14e66f3bf544926af5e3199ec55f91023381002fdd9818fed89627cfbeba8fd7cb7c0eff55370fb4425275a5cd03fc9170e1569ba23f150fcc884aea61133a5bb21acffba1780887516c6da,
+N = d2a49830ae7336c5544f2c570c5ea31d1b681efe51556781a3f875c8d7031d8f0fe4edec5730d662f35bd0aafe6bbfbe73f3ffdaf483d4c9c8dc3a14390577abcb28b3490d80d69d5e7d0bc4a5c51c398327543385f46b1039facce7314e6827a2663f4b447fd899665eead01c2b635a022c5e786fb9f31504fe1f379c40c6bffaaf3732d8bccb41de60d499d2060f0536fef8ac25c48b03edb4207798ff6c86b8b173e4018b2b410b30b59e7bbe3e8ee3b6ac9fe14e66f3bf544926af5e3199ec55f91023381002fdd9818fed89627cfbeba8fd7cb7c0eff55370fb4425275a5cd03fc9170e1569ba23f150fcc884aea61133a5bb21acffba1780887516c6d9,
 NT = e2d11074958171a031686ab23db36f285b0e23f889cf881e66cfaccbbb4d0800fcc9972dc3469b733f0abf4222ad4981eeb748d23d82d8d2be337315b39bb1d87fb782cb59c3c21b14b05d1ba3e080f21c91be2b6a4986e961c03b405d4ab0626f603a992e450268a857e20acf91a0bc913a1d318240cbd8a4a3562fe0f84028931a63df780e9d16f756de3cb837e30412916c0ae01a5f491de64469b7a29cae5b3030314a60ee75d4aad22e0a8c7c523324e3cf402a865815e2f7bc2d51826dbc13527b9a6702f60416d0a72178e82f0e9e06762bd3fe78d4ccfc167e563ffda9bcf7b3eeac25419704d2c7a5e194eb571018529ab69ad6dece43ebd3523145,
 H1 = d29649e0030610d4f4b9dc6a23a9624134e74156656f2cf39e330e6594f7ea87135beb2065dc2bb63177e21961577d5a328b283dd86b41dc717ba3bbaa3769354d80dc3f30b24128c3761294384e96bc1c621c142491bc617417042afcf6538fb607af3a0ff0ccbc354aad007d1df9498a649b448ac29e127add7eb9b6969da9ded461de699f623cdbfa56cdf141d9305715d746dbbc0d71146eb0fa8c7e3057bf91c94eefd5c9f32dded720f87dde1748f318a65f32d0e27e5357e98ee526d306424d418b5528a2ea29ceaa0e98a9231e5f11d2a93fa5cbd221fd0ebbc81e2cf9dfca6b5854d5dbabf61e643cb88b8cdd50eb518757c48f35440d3f03818e1c,
 H2 = caa315313033cbf708624019d7ba14ab823885763f64a6050649e87341cc4b05a30b13896ad6b922ccbf47620772d0473a7614d140c8965588cf15ccb93e07fab59c5685e07f961eda65d77659fdc3ade1758902d371045b6a36c6b7fcfb345b2cb11cbd01cd6e623faa1f63a984a840054d8caae14ee109dd92b694a9df2caa69faaaf3e1a8aff0ec888d962bd38e06e13ebc57d8c0de333752a765be67fda5607f7ca643cdc12b2440aa4e089cc0180bd636858f76b4aa3538c433b309879616c2c817f744550d61ced5901ce15b29d618a4aac4eb71a7e676a35e00f5ae0396ad58458921b482022f98dbd76f9396aaddda43350a0c6d43336af1edb2ea87,
diff --git a/testVectors/mta/rp_challenge.json b/testVectors/mta/rp_challenge.json
index b8b7bfb..63f2ead 100644
--- a/testVectors/mta/rp_challenge.json
+++ b/testVectors/mta/rp_challenge.json
@@ -1,7 +1,7 @@
 [
   {
     "TEST": 0,
-    "G": "ac902c74e7221a6695725f811e4c4ebb7e9061606f2a6923b8cb8f9cebae54cf42b4c3332f612370aaba69568f74e60b04fd3ef2f18dc825bfd1efbb81fd64d2b5c3f90e8e3e8ced51d1423e63f33b444c0569dbe6eaa9674cb3d90cad06847072c0443a92d3063841aa56cbbba92fc94497319e3222a565e57b1de39a4765a909f1915771360f52030bfd69375c353cf97b5ef8aa5b7aa5bfe711316ed503bafa7f0e40c6df25f540611a80a6e5a8d61e3138bd4051668c228e118895c321f1474088d07ed2e5c2dd1f447d530a9bde3296d4d459607522ac88c40c391e08a479e985cc9f0d0801086899ba335d5e0c94a93132de0919031ec81713e088357e",
+    "N": "ac902c74e7221a6695725f811e4c4ebb7e9061606f2a6923b8cb8f9cebae54cf42b4c3332f612370aaba69568f74e60b04fd3ef2f18dc825bfd1efbb81fd64d2b5c3f90e8e3e8ced51d1423e63f33b444c0569dbe6eaa9674cb3d90cad06847072c0443a92d3063841aa56cbbba92fc94497319e3222a565e57b1de39a4765a909f1915771360f52030bfd69375c353cf97b5ef8aa5b7aa5bfe711316ed503bafa7f0e40c6df25f540611a80a6e5a8d61e3138bd4051668c228e118895c321f1474088d07ed2e5c2dd1f447d530a9bde3296d4d459607522ac88c40c391e08a479e985cc9f0d0801086899ba335d5e0c94a93132de0919031ec81713e088357d",
     "NT": "b5eed17dc8d2b334110128bd1b19e58d97c3286e2505283a9f8d060527e8aa76b08771ca8b16ac020b4e022f85f70422abe7ea8f78a0e066188a2ca022a01af3ab93b7c39ba2558425664ae00a3ac13540b9e73ffd44973fd0ed9030850d242cdbd7c8825ef164eb04de336f3e9565b3b9fedefcf5269f54c68d5d2751bd77142f2ddbe3eda0fb68f2397899515057729b7ef88e7c8a459f88b39c33592cd2d95461185522c90c4d8b0feed1c9d4e1d68b7eff16d0439b2a687b24b242521ef3af8ed11151e3b8d50bddf39d90d0d34ba6a13ddec9b0b1cea034ac6c87d9e550335b8e8268094770d137d022d51122dbaaa403a9ffaa3258c8e1bedfc6ef6421",
     "H1": "998c278733890439c87e5b68e766b1625c288c20c8aa0a2ec2fa78162168ce14527c63f2a2a272b6455a120c8695b9d66800e42b4b5da207e4d9e5b1c7114dfd28b961952fbc817f74bed848025ac97920a2a3edff4f9cc9711a72370a25406ff1ac43d807a4f0ce64418536330ddbc839be75fe8970090c75b07b86a8fe03c9ce79edc362f7c88d79f1794285582c012df31f219bf59806aff8b5fd0e85c1f0f24daec6431cc9257caa72ea1e57567ab71bf2bff4b8ff4f12d9a3f741bb0b8d87700dd86a44bab25e231eed97547b28771e385dde150e844525da43b90b08ed47e79315f44bb10612d19e9a52df737d9dac35d60efd1ac92c6eabda6390f26d",
     "H2": "279dde351a605cc6524af37276ee8116fe50f1a7bfed17e7b876c7e5c0a9efdef8222658e724c3276ba47528f4ed63bc08a3a8db0153f2e7959d6f3ffcf8b41a462c0dd6ee41e123a9fd25bc0b2df052875b90ca6f2503bfe239fdfdd42a1333b318ebf0646b457e8a97d9fd8620c1de230f54d28f46ab51fb7761234425ce85b149415424d26179edc34e8ab9da16547fdae416915df9776297861c8224871703ca486e1aaf2e5242e2e482dbe55055c3c2516b9c1ef26adc376acd1df987d875816dc84ca0e69b94caf580c89dafbfb6bfe6d4e8cce2046c8d0a99c2c52428d9f54a6fcdab99cd6eff6e41ddee1ba9656b63ab6f82ff08413ffe97deeefe9b",
@@ -13,7 +13,7 @@
   },
   {
     "TEST": 1,
-    "G": "b4f6067667eea27c3abc8094bdf8e3b8ef42f023ab31e3b3c6a879844b1702611ec7e5b5d43d3a6876a12f712135ccc17ac253bcf01800ed33dbc774680e6eee0b01924852e14bb37980a2e9fbcb33f3ab50af18c16709d1acf8e5e62a7bdc1ff22e691ea1d333ab32264b8f3d4cc9e28dc5878f0ccc4cd0c687a511e5b4dabe112cfbb54fb3724471786f5f8e619ee7c7d1bbaba6fca40512e4144bcfc50d3dd3a674af04016d5ca2c5f48fbadaae959442003d01fa01d041b2f433bd003d227eb545d34d1e63c09d05cef33660e7eb73d5ff63d827099fa6b599488abc708e819480df6ede2efd49fe8e0321c90f311bbd5da43f853ae3d9ae6fb76287421e",
+    "N": "b4f6067667eea27c3abc8094bdf8e3b8ef42f023ab31e3b3c6a879844b1702611ec7e5b5d43d3a6876a12f712135ccc17ac253bcf01800ed33dbc774680e6eee0b01924852e14bb37980a2e9fbcb33f3ab50af18c16709d1acf8e5e62a7bdc1ff22e691ea1d333ab32264b8f3d4cc9e28dc5878f0ccc4cd0c687a511e5b4dabe112cfbb54fb3724471786f5f8e619ee7c7d1bbaba6fca40512e4144bcfc50d3dd3a674af04016d5ca2c5f48fbadaae959442003d01fa01d041b2f433bd003d227eb545d34d1e63c09d05cef33660e7eb73d5ff63d827099fa6b599488abc708e819480df6ede2efd49fe8e0321c90f311bbd5da43f853ae3d9ae6fb76287421d",
     "NT": "c1b8aab9caaf1f9021fcd135ef022089792684e7cdb1467ff522e46713609e7ebb633f19ad52e597f7dbdb59f6684f204f368b7104116a1fd8eabdc9ef7eb4b64867ad1f007f74bc57f2fb77b0b9b518af7df355e7a5d99217df442358543b76a51798e8ef194437fb4b58378943cc812942805a0b3d30eccae13fb56ea3500a781549d1d6fbd0b2ac57d63aedaa05987298201d8434b6e51b3c0e75bbd7eeb3cfbd4f79d28692110738954720784d269fabf4d4280d61e4fb8581803dd75e1be888d29d8ca419b68ea9850919c0d5563104c084f9fe0730b496b70612aa131b20b951ea8eb61c30b186a684698f22bf09d2b02b82504a1cb3491ad01fceadad",
     "H1": "753d2203f3eeb0f3cda0ed8c1a222468138f5c4a16a9f324ee76cd3a55fb4afb7ddc445018b55979937175b88fe2d12918a75779c39bbb7b6f3795e0dd0f756c0f01c440d87d37e5e07fb1f305157d3b555b5b2eb1ddc49222f821687c032a8a45360732c49ac8e469c375719e20e00efb57a98960a3f3fede5fd062da8716d088edc978d1c1eebb564605784949edcc6b779ae6ee459044ea66ee8ac82987583e3a46936757fd13c9631fe8aab6dc4c3cfe14c11e3db3b4ef6c9d12e92cbe58a828fd2d5342bef22694c5210a2661e4de1537962f427646ab741a680c08b509a8587aa5a5730416bc0ec06b7689bc9ddc4a53012f4c312fe7ba3e721ca8ece2",
     "H2": "93a9d5c7c85d9ec6594fa9417128a76405d960891e33f9914a6e9adb5ab09b8207b5b2ae65c5a08d3bb60535469cffc762bfd5453745c64423639fc888282468a279d3f391e2d6315a17e4353d40cc8cebad8c2ed6254bdac327d792365ff328f48ac6cface694ba49866341a624df2ad121f70d42e21f101b5059884f3b92d3dd29e3c9ac94bc8285373e4aa1f4cc7f0837ab6a6f89ad0258f7882e9fb731b74c84042723cf590f603a41012e3c8af384a8ca2f140bf0a30e1481e202881b82a2833a27f46ae20980bf74ec50d1189028abb2be13fe35b2c98254b729f9a05fefb1419a5ee6a41ae990c62b486b5c011e5830dcd28490224048d7cb56dbbb83",
@@ -25,7 +25,7 @@
   },
   {
     "TEST": 2,
-    "G": "d0b5ed441de0c29be9d92ef3c1538c0c0d81f616dab33966ed6150e4a5895422b8b58219291c8e3a5f542fb92767ed7ba46a97e67ec927dd0b2555935bcee97de1d40bdf94c6a877d865318bee573a86936df6edabe719bf98d15e7d77cd9641234d022558dd60d29197d23f7263b4a83c22aae2f1b044448b6103c8f7fcc4bbf149e0f6f638ac6dd2fda5abf0a3e8dfc3c79b78d67c70a8a213df26a755fa6b39690d4eda814be11a44f9bfc5091f18ebdd77f7c5fd99379d01151741286da58b821a156a46945943be484eb7b50ce177b093bb2c9cd7fd5dd6ae27832e25dce15eca635bce866ff76328660cecae3cd0e046bf085255cf87909909a63bf788",
+    "N": "d0b5ed441de0c29be9d92ef3c1538c0c0d81f616dab33966ed6150e4a5895422b8b58219291c8e3a5f542fb92767ed7ba46a97e67ec927dd0b2555935bcee97de1d40bdf94c6a877d865318bee573a86936df6edabe719bf98d15e7d77cd9641234d022558dd60d29197d23f7263b4a83c22aae2f1b044448b6103c8f7fcc4bbf149e0f6f638ac6dd2fda5abf0a3e8dfc3c79b78d67c70a8a213df26a755fa6b39690d4eda814be11a44f9bfc5091f18ebdd77f7c5fd99379d01151741286da58b821a156a46945943be484eb7b50ce177b093bb2c9cd7fd5dd6ae27832e25dce15eca635bce866ff76328660cecae3cd0e046bf085255cf87909909a63bf787",
     "NT": "dfbdfc2a4784522a0bcd93a9925e2d185ec9af22e3c76af9e3a55552ef2d22e01c3a9e5155420383305ae63787a6451f91d2ee741c24a695272fa1f3b7ed6830d7c9f519fe3afefd97b956029c9bb781ea3efe49bc9cfd911dd132f7b1c12d9002fe73782c148b299144b664200246b3a5336b46768afe63e8b508efb0aeb71022e27307663d1ff104865310e59edeb9220630561530a7de5e3c5a74abaa4549b80d37e851c8affc44eb1024387c63a7854346ba6cf9c9305d04350b93db8cde33c3260789feff3b3c4d55cd50216e4473db4fd83d138e6bf25a9d609f010769895dd1844fdaed0cca3a773ecb734a6687ec07422d5ec7496238cba08fd08fa9",
     "H1": "49e218ab98a9bb1e6524b17b18aa4612c85aa7f50ecb8edf9cf08b5ad0fae00103f49105571a9a6d0cc14946f893b8a2118efc91a3c9c1746beeb5b12c0216380ab38d2021326f31029390959e02c2c977da86000e5cff9b68f38cd6e1e5319013d6c191c46a85dcf499ee6c6461307e7c38ae93520b4c822477a9bd6126071917f29a8eff05330a193e4129f690b6204f82bc010da130fd93b9fa42a7dba7c574615be03ed50baa2cafff5e5eb3385c51f0056eaa3f062ae559cbdfe06b341d53f59f1dffa866ebc1b0999f13a160cbc8a3670f034484f63d46076fc7a5d9e2fa6d5bf49a97cf354b89e3a986f54eb356cefc87d564c98199dbf5da70df7d67",
     "H2": "0370358ae55d746a5b8e787086ee8f2aad9545ae5e812a81d96611c816db67a7f5e4352908a9e1c012b9ceccd489f555b984153090c816ddecab04f7a2272b6fcfd0e967d16a98f7c703df2e9886646841e92c8a8eaa488491bdef93bd1c090e2b43fa97ca41410de6d7b92ae431332b3773029f1264d81910a6996fb956ef9dc58887e00018e19c867816f04dd60af5eca816dd4d6fbf263e24de7be6767d8c30daec086d066ecc9183228e05a8706638cc9ed994d127752546bf2e17eac23bdd99c95daced91c11a04c123f26331b84647a41827583bd8f2bd855f11780eea5f5ffe9f3e5f86d5b22bb11eaf97cf540ebecfdfa23f88399edb885d128ce1d9",
@@ -37,7 +37,7 @@
   },
   {
     "TEST": 3,
-    "G": "c0360322065da36d12a963f09d5329202c7b2c00e0b9da28cb9a86857fc6c522e9ab7ab667e7ecfd3f1e385a322e6e59dc2ed680f7ba678bdf253ba73647a00a010b249a22b06a24c4c0f5f2d1050fcf65c3d65bbc06a6ca1f7a1ef6d302b8b43171b3e0a71b2ac028098c1561bf96615bdbf1d4f2fb4fd303fd4281b20068ef93e00ae39029ee14abd0f599ee02b7bc1fda9709a7575fb168582c7183511a792c675cd1a8ce1bc0f1306d6bfc7c72c28fea16e2622d59e64bc3de5747bca8c343afd72a956b205368d3c4de0f707bdb1c0d4464489c3379b53fc74958cd539d4a855d627fde96b4f72f8915f2f7c4e89173be73fa07aa1dbfdbd8a59504a9b4",
+    "N": "c0360322065da36d12a963f09d5329202c7b2c00e0b9da28cb9a86857fc6c522e9ab7ab667e7ecfd3f1e385a322e6e59dc2ed680f7ba678bdf253ba73647a00a010b249a22b06a24c4c0f5f2d1050fcf65c3d65bbc06a6ca1f7a1ef6d302b8b43171b3e0a71b2ac028098c1561bf96615bdbf1d4f2fb4fd303fd4281b20068ef93e00ae39029ee14abd0f599ee02b7bc1fda9709a7575fb168582c7183511a792c675cd1a8ce1bc0f1306d6bfc7c72c28fea16e2622d59e64bc3de5747bca8c343afd72a956b205368d3c4de0f707bdb1c0d4464489c3379b53fc74958cd539d4a855d627fde96b4f72f8915f2f7c4e89173be73fa07aa1dbfdbd8a59504a9b3",
     "NT": "a86824e86c82674f33904dbdcb24e39d2464f3f906a90702ae2af8f71be38e87cb974493dbdfc40ec9477fde12be9f9c3d8ce49b31a9a55e8e7b56909b263106025cacbb8d454375f0078689f2c7df41e6c0a92a10aee5e53718ff1ed4ce08ac3eeef87d42e41e485f457720dd0173bea2d6aec0c6aa0046965e09c755244bf365c92f884dc2c38c415e041fda53b0226147ba3d8ded0b8d1cfb36f4aad7b98cf24f46dcbc6c83e9f40aa44d50c3c0cabc27d4c52a0c6e6fcc4736303bb65c5149a7a263a4524abdb512407a5a84267ee90412aef31d81251e20ed3735ce6f3ad0051138b21f58d95dc0bfa1b73b5b5adae3548d5a160faac4b865a2b85b0c6d",
     "H1": "3687d10b2ca353a68158d24b547ff85b29fe96c22a8d64a15314ea00cfe069300bba4a84900f8823b2f92cb70ccefc28971f42dfc3c91afc73ba98a0e7ad13e513a83c8c31f4deeedfa0f2310c7692281d4524de6dd8a0014572b7225dee1bf24595ff3fce06cf9c5658169685d49736eed3bedcd56e29c846eb82727e8477aa7459939997f81590003bc9b6353393cad699c175ac4f39eaa44541f85a5f132a0a3c84c06c975ffae676d6711692dcd9d8e75e2c0e78af8d2b41a846d112ad5831fa1371301809c7054cc5500b2596ef198740ec5ba6bde76e3b7d8bb0891c9e259f3e107c57008df5b45eaef85527aa16c31b17f7953f1592005936cab0a8a3",
     "H2": "471c9984224190f625fc9ceeb53294fc7c4f569b3753cd676feef2cce8549e599888bb317e4d4c2c6d0cd30dae32740bcf19c9be6fd084be01913c29d076afcd4f6f2524d0e038295a8432fee6c8758e9f68bb0947e30493d1f428fde9a7957a14f739c2b787cb469d7864dd46e5cdaffdb26162225cab4ae7d2b77d67a1dcc7e67b638bc53580285b4d7fa369c1533e8346373a311cbcf44c9b4c7a166be4308a14f0d141c77cd5e66dc1fab1babb0bef7a7456c18372800dd3cd52a93bfe418a334981677edf801fa13ba38bb1bf39420b2036dee2fa860fdc11b6d5173d25284263da4e475fd28c2b1428c4035232675986aab16e61ad0aa43b04c6b28637",
@@ -49,7 +49,7 @@
   },
   {
     "TEST": 4,
-    "G": "ceaa366d65f873033b7b02cf73aa611c81a827e8ecc70ce2e95389d442ca526cbc7bf7b8737551f250b871d97f32ab1803d843f4fc7ca799ee91f375b9412bb84113ce015f293f5de6eb81cf3ba521fe52184a552e6aa9a02d8fec6d7fad3830ce764dd2b7039eab29d410881528813c5aa3bf1d94dcfa5b5c9240c041d69ea3d19a75f69962fead1bc7607d08bae8f0da7ce155f32a3727fc5008d1dffd3f9b612725ad992696b6f2bba3127c37c2dff57807f310cbe11c65692886bc052a23a8a323042f43d708d89a62a279ececa6f8574b2b732c3ec0a2ab75c0f4a5bf0fd557d64aeb03fa9d24863287ca69174433a4711db925b9933304bdef0beed788",
+    "N": "ceaa366d65f873033b7b02cf73aa611c81a827e8ecc70ce2e95389d442ca526cbc7bf7b8737551f250b871d97f32ab1803d843f4fc7ca799ee91f375b9412bb84113ce015f293f5de6eb81cf3ba521fe52184a552e6aa9a02d8fec6d7fad3830ce764dd2b7039eab29d410881528813c5aa3bf1d94dcfa5b5c9240c041d69ea3d19a75f69962fead1bc7607d08bae8f0da7ce155f32a3727fc5008d1dffd3f9b612725ad992696b6f2bba3127c37c2dff57807f310cbe11c65692886bc052a23a8a323042f43d708d89a62a279ececa6f8574b2b732c3ec0a2ab75c0f4a5bf0fd557d64aeb03fa9d24863287ca69174433a4711db925b9933304bdef0beed787",
     "NT": "9c9bc9253874a40a5a355579224cba50de2b41b28e6090aff68358b3b427b6c1d380dd159830af170deb982bc00eced7f4fd1767584d8c2d9679112404d565caec1ab17d20a2f0266fdf318a98cebd98def0aaab434e5de8e2231f899cd48db142b2893bc3c61bf679e6ab1132969cf78764f27b42fc2fef54d08ef578d8b26fd6809e65540d8433d3d7624a0932b80a71733788371789c3fbc6328020e844e8b9630346bae67e04b6ef762321dc75aa4def408a27ff0b2954a7de9c6daff0a21a3081ffa60a98af89ffea10337c6a8644afe0f5072cf1748fec2653337a85a8bee2d088510863383893c86be8d76682a5b1d4b19fd4e7a040c4c50d14bfef49",
     "H1": "35915e88b3ab520a1d569e24e95ce6e473e6b58f21bfd5cd26e679bcfad815a9df71651a3be0577ffa01a6b0681a1afccf96475945d0d9a32cc7f965fa308ba70ccf8525a8d602aef2bc9d6b69893f1da962f9f0fd7d9e49011e9d01eb68dafcf0bf412bd5df0717e7367d3d3c22f678e10e0c50eb21a96186bfaf623a0890aa35614ee72f2313acbe3f6a7f7fd72e844fdb895df978aa9981b81368b54d63aa45bdb75390297781f640e4c3a210e82d3cdbdef67abf79ecf092c7c4b0f9616768f442ea62170393f206f65ae6c22f093a9261e4270ff48603246bacce3ad612e62d5bc99a2c8a3132c13661395a69201941560972b926359458ef0c75e99f32",
     "H2": "5a61719cf69e9b8c82e4e6a4c16487ed7e4130ac5165614467327d97db64a5c66d772bb6b50a2ed1f3ec6e66e17bfc022d16e3750c5fcac714fc4482de99f1cf5a6505c239c83cb05129d17db3bee84ddc82159955e56a06281aa5d97e1d9f6ab51070cc1c346b6edd4f934befa63f8673922ba6123d28c4c20391c6ed2fef677ad5ed36ad3afa228848261ceb4a349d22dd9a6b2f2bdb50654a239e21872268f4d451af24e48aa8bb2502e884161017f1785cbdca5f2987b7b1bfe40e48f9547d490a23629867a8ca1a0ad921b3dbd3419b80ff3283a811d8816d4c69b8c5bd0ac660d604fa6db4aa07022d60361545ec3f6718fe746bd0328933c64539771f",
@@ -61,7 +61,7 @@
   },
   {
     "TEST": 5,
-    "G": "a5ab88866062c25ea144790dea4046aa4352a5b98a4aa02356b91ce7be80bd625ed6bacd48ca38340c96ead9f93a51d7d08509194bd159041d60b7e9259a28962c0a0d5632c36266adfcffefa10692ef01b41f74fd52efcb955cc3cc4362466986fd52ceb9fb6273950193f9a763eb65ef63282728899bd8844dee8200679f5a436961e34a185fe5909064e59b23bdfed3c080e1c89c88cf65850fe6b2aa5192dfa81f24588c6c4f0e228b80e9a18a85b5357b35fa92a313087d3458b74d661fe9f7f67d187a158b964ead0248169944651c3dbd6358e96bf33b01afb56e47f7cde0a5a7c85dd20ffbf7fce3d3eb30ab5b813853a6f1cf33f0679659a2e14dc6",
+    "N": "a5ab88866062c25ea144790dea4046aa4352a5b98a4aa02356b91ce7be80bd625ed6bacd48ca38340c96ead9f93a51d7d08509194bd159041d60b7e9259a28962c0a0d5632c36266adfcffefa10692ef01b41f74fd52efcb955cc3cc4362466986fd52ceb9fb6273950193f9a763eb65ef63282728899bd8844dee8200679f5a436961e34a185fe5909064e59b23bdfed3c080e1c89c88cf65850fe6b2aa5192dfa81f24588c6c4f0e228b80e9a18a85b5357b35fa92a313087d3458b74d661fe9f7f67d187a158b964ead0248169944651c3dbd6358e96bf33b01afb56e47f7cde0a5a7c85dd20ffbf7fce3d3eb30ab5b813853a6f1cf33f0679659a2e14dc5",
     "NT": "b8d5562cebee1ba65ed1bc96f5a10d7f76f804ff76065ae71ef8e9224c1e8ecaec249e4ef4794053866b9052780ca0adbb656e56427d5e7e041b358a5f23036655a3bf3d180a5795f1aea576670ddc9ee3403dfa1c17babc5d86bd569c8932e404d727dd4ce769646413617a00c11527d40ffaff50b205ceb73de9591a3e614c65f92e1bc01d6f78bc8a7bc349eac9f4d432efa76be3a18d89f49abe6ad2e8fca17a2f100103e6622e290adcaa7b9d80b5fd61c2cffb533de4b9a8c8a0376a595c360f193319bce77256812e972f1e4bb2e38895783f870f7958033a59e3023224da56f5479d6fd8d990d361c4b28987232ae33fa84a24ebc5c041e78b5093d1",
     "H1": "51996265acb79b38da1abc9a887497220e8a2f250363308d66f7e450ce410086ebd02b91490031258b4f8f63161580ce4dcfbc81071febd15eca81288142425f97c382d9658eca542432dd6f9ad249948ce0da4cb7dc27a0c4b35ed845dbbb6a1c012ab0c3e140d99d012bf6f9e8705c0a1d21bef630b676c98e17662bb17ee51914611396908f1eb136b2da62d299e02803c63122eac108c756023ca48276eb34c54643a9590057ed2ac983f0e2f357b1b221d03477529d91cd9aea58717031496b67346d74bd4cbee7dcd169fdc131ebe2a5bf8fb7648096a350c4bf444c4f3383ab10ea0c1b6f91eb22cfe47f4843ff61214f95c3aa77222c3a5d8af03dff",
     "H2": "9d5f3d80792b1e32619b0c363d29e77c07721be35307da275752c9d12e6ac34f90f5fdf5ee6987b7495c46e161bf571c9678267f1b3a321bd3133172ace0211c0c5ddf535e69f835a7329a377c0fa161eca039fbcb5707ae227cd88659170e64cff0bbdd1b727bc2711c5c4a6c4dd990be26f8289678ac271f884ec18a0cdf2a8294e9f62e34ba2392403566a9e5ab7b1a9504d0166aabf883e5cdebce3d8b2b2b37aca25484f7c275276adccc7209c69794e735a57ad4fe34a98dee86756955002abc8af11ee245f8b6166469835415134d2f2edcaa6da55403686b442cd856e94d6aeec388c3c03de2dceaaaaca47561ccca64d8f37a9fd60b7e11a4788e2b",
@@ -73,7 +73,7 @@
   },
   {
     "TEST": 6,
-    "G": "d141747467098e495a68ad008d3ff95fea2cc060965285afd40971108a84b6922a3950db9ba8c61c7ff8454bdd7c18bd0490467cb8fb848920492b5443fc0daa1ac9295ff967f575ac269ce1c7300c966b82ccc6d9b181eb411c64cd8156735376bce729dceb816b681fd1e62fa080c539d01eaaeffd0584b257f9810c009cbac83fd9bd77e3fc85d1c78478722b15e73a569b26ba956908a7e5c4566d0577e345480550e16e1fcc84f0b0a642379b6e7388adbabbfb4cb92fa2e10f51ab55872c5bef94d48a3a48c316dde2220b5427c6739ac80248a498eca892f581b212807219e4df1fb5d8543acc06c25842224365c73f74f9c1f9587cc9822d11d2a3c0",
+    "N": "d141747467098e495a68ad008d3ff95fea2cc060965285afd40971108a84b6922a3950db9ba8c61c7ff8454bdd7c18bd0490467cb8fb848920492b5443fc0daa1ac9295ff967f575ac269ce1c7300c966b82ccc6d9b181eb411c64cd8156735376bce729dceb816b681fd1e62fa080c539d01eaaeffd0584b257f9810c009cbac83fd9bd77e3fc85d1c78478722b15e73a569b26ba956908a7e5c4566d0577e345480550e16e1fcc84f0b0a642379b6e7388adbabbfb4cb92fa2e10f51ab55872c5bef94d48a3a48c316dde2220b5427c6739ac80248a498eca892f581b212807219e4df1fb5d8543acc06c25842224365c73f74f9c1f9587cc9822d11d2a3bf",
     "NT": "d732a7a46bf87b14bc8a80b47a2867203148a8e6835f02d0788a0624a0161fe67c447f4e542bab2ebc19afb9a4c279f06c3f3797ee6a98bc86f9ecf92118547db3c8a7241e3f184934d227b408f68958cba730b5889b159ef3f75f466228788455fbfecba32d3e7fc1e384b06d116b6f1403ddc9c0974a127dbfb009378fa38fd5042831da323fc7b491f98e4b9dd143fc3c94c339316fee2ead9f19e25047fc67f8ea8b3b11959f544fbdef7da6f663513cf4946d34990d989a8caf60112ec6c1278430715a53c0374d7a1f3834cdd1fb4663637f7a09398ea45950ceddfe667dafbb963f617513f0c65ee0588b85340e268df861369091b3d2d51d963862fd",
     "H1": "ceed20dd304eee603920d97bc0948e2c6cdeb16d4500b1f373b58a5e36aa1b30ea10369a14c0d9146adcd55de1d62063487605a84f6f434856ddf770fe156c92bfa2d30686e9579a5a947d451d0a8255a62687727287716bfb3f3cc6e6491c99abb652979afd2584682e280aff8373b5ec6f407855162470a0bab04ef5ecd6494ccccc0f223b0b0651f756f1ad929ca4536ca147072965ceed8d7d557a90f866fa5a6278fd69f68175dcdcf53d3bc8f429bde0f99457febea2b8ba5e67a47fdf57537211c28c33d3c99f761185249c4d5f0e1d1990611238db3d3e40dee699a45296a275b92ae68ece47d0edde132fd466ddf8d6561cc55b161907e793264f31",
     "H2": "8f3c6d0c04233cdb62b048a89553be90e8709dc496cae3f950aeec9823350773214ab5f841d9cb6a5b2ed8c4fcc8675c1d91101f2b44a687190d45b53b374fc1002bc3c48e38d420a9ed6c4079b623ac68057a02da523c88c094ec2bdfa743e9b329efcc965afe35d8c08f4dc94ba663b8f52e0d2bdf39aa69c9f113caec787c267fafbd8c05868b882e9d0f6f4b13e2e4641e9af59ef17c216e7f8c850168d33b6d3ad65f16e9d88a82bd0c18dbe7c6d0a6066509502d625a403eaf967144aba2b54cfe58f6149e93587aba81e1e5f703bbe32c448b85ae02d25bf19f63e248de4fd116eb7bdca56eed7aeeb1c3fbc33edae5629658b9ed3710dd9e08ef77cf",
@@ -85,7 +85,7 @@
   },
   {
     "TEST": 7,
-    "G": "87f3eb5cabd6eda24013c75625bdfc79dd6b6b41014a72a66f771bec885e194b3ef2fe631d71c3762cfd5d6d97cf010ed0a82cde63071fadbbe4a9ce9ad170f0d58e73689248111e8bb4e630d364dfbde04dee41ba0ae3eb08b85d391a4ed0d854d66881934fe2a82281dad0c30edf6e350f5d972caa0884f186dbd443fae403c7e5dcfaaed9721d2aa157ea814915134e58d29e48d504644a3d9faeee056dfcac145306123cf9d41c7e355463829a0ad9a783dd5b1c23c5d681ba378ee905da7c83d51bcc8f59bddd95a9ef79eaac7cd800aecfe78c2b749f58159478b87f8c50ad917c71bfe904786c2e410d3ba76c4ee7792820d688438db1111f2d944ce8",
+    "N": "87f3eb5cabd6eda24013c75625bdfc79dd6b6b41014a72a66f771bec885e194b3ef2fe631d71c3762cfd5d6d97cf010ed0a82cde63071fadbbe4a9ce9ad170f0d58e73689248111e8bb4e630d364dfbde04dee41ba0ae3eb08b85d391a4ed0d854d66881934fe2a82281dad0c30edf6e350f5d972caa0884f186dbd443fae403c7e5dcfaaed9721d2aa157ea814915134e58d29e48d504644a3d9faeee056dfcac145306123cf9d41c7e355463829a0ad9a783dd5b1c23c5d681ba378ee905da7c83d51bcc8f59bddd95a9ef79eaac7cd800aecfe78c2b749f58159478b87f8c50ad917c71bfe904786c2e410d3ba76c4ee7792820d688438db1111f2d944ce7",
     "NT": "c031847390333f4b8b1fd0bae9a57ddc4b34bb9819f5285d08d0943db0975b61a43286ca3f83e9fa8768d670189f6ecac37cc2b5ab7e1ec3341c21b5c66816c0ad65a3bb2c45825f85a53bb40b31a89c9ead55706eeb55f8a0819c8b3a5489de0c5911a3a3e9ebf42ea1f9cc152401419e33a7e15f8d3abfc4739890374472a2d714e17587350918ff7c82d9be44f5541f74a7de905b4dc9d0c8333fcd185982a5e7a9304551032115ea99e9cd0e33a9b0c3086cb296719394f95dbb0927d4857f8c4cc4d747e0fa14d1d8478a31a124607a91c7694d511e39c295282ba72953c1460958ade560cdd4f53a4a4191aa5a4711cd9dda12f3f778f09b8d72b161ed",
     "H1": "54d7b45e9217f4786588cec892fb4e9ee047537f88a52b8b6b286f959c207bfece1561d7575288477b2db9a56a98a9b5add861298263bf15084e286163c2133234ac8eceb9f75ba1fad64fecbba92ee3a4dd96d10463fa6492ad9d00bfd87835f9a03d5031d36312e3d858747105e165c55bec00746e73bd6c0538a9b01e703b6a2552bbf1252bb9d8096ad030b6877635bfedfcca6ef46e79b04e99770cb5b6d3663801a3812a949b6430c51a6c501027067ea8b4b84da90ee2df8debada67e238b8c508263b96bc1fb51f6c760344256f7b8748c108363f3ff54cd95a6b050547c42a02a9c9ec35b67480cb33f9f285f3fba4a906d4a95a6b0169b85d72c36",
     "H2": "320a7c2ea26d914668ad52c9e747815ded761bf90a0deeae26f2335a9a0d9c538e98968de4c53559cf7cc9e3d0a81d75c524d0119a4ebee9f7c740f44fdd2aebaab2110ca3bdfd79a1a375262c6b69a7d5f8d542434d7bdc6c501cc9b7d53e97e550494029e2501e7b9c1c37b22bc890ebee849e260efe5ae0f5031fa45738351a9532fb50de9951295fb3a96fd980f3180a28e5249914c030fd6a2925d37707c0a50eabff3a73c373a4ee664e65446977a3569a13e5de87fd8cab4abbd04b9398f6b9f5661d656ba04302d5b2549f774088a67e7d39f11dd2fe11f79a548126471f713d3cdc1929252f8815933ac1d1803b928299fa43657f081ee321d72c64",
@@ -97,7 +97,7 @@
   },
   {
     "TEST": 8,
-    "G": "880fd5a34cfc27a8ef1e8536ac1742175510f2ad74ebc1fcb35860c03734a11b54d1f26ebe294e852d5144a31edadc4fa3943e088f6cea9bd2964d3408d55acc3e0bd3f6ba8d5e3debd6e8b2fa64f70715249e110518c9549dc78639b2ed71ef086832289d14eece5dcfdc1c1062bd5f7335b4b00e78b2691d8bdbce6a98c18eca9d6cf52850a1fc0cf7dfc6f595b0c1612510be10d9b92fb277f5227f64515b7658e5c0367eee2c10d44659822f77f382835c68c392fb32407db238fd671c5400916a5448b220a784b745b038b1ae9339e3890861a553d630fe39d16c9efce97de28f1ea8246aa5e65e2d8cce60fb6742faef70b177bae025d3358d5009c55e",
+    "N": "880fd5a34cfc27a8ef1e8536ac1742175510f2ad74ebc1fcb35860c03734a11b54d1f26ebe294e852d5144a31edadc4fa3943e088f6cea9bd2964d3408d55acc3e0bd3f6ba8d5e3debd6e8b2fa64f70715249e110518c9549dc78639b2ed71ef086832289d14eece5dcfdc1c1062bd5f7335b4b00e78b2691d8bdbce6a98c18eca9d6cf52850a1fc0cf7dfc6f595b0c1612510be10d9b92fb277f5227f64515b7658e5c0367eee2c10d44659822f77f382835c68c392fb32407db238fd671c5400916a5448b220a784b745b038b1ae9339e3890861a553d630fe39d16c9efce97de28f1ea8246aa5e65e2d8cce60fb6742faef70b177bae025d3358d5009c55d",
     "NT": "aa3a57faaa2d2859140344aeeb482e83770b6ea2941c4bec7780251c6bdbd2aa247dedeb19642a8cb55f03ba8d129ea4ef10314f9aa73bedafa112afec5dcf54f90e8319cf8bb80acc148bc34cc8d731237a114d9d088ddc89d419f3180a16793dd927e77258e35260d7885aaf53e7c1338ec3e068bcb8e74e244f29caf01bd3b7da0d08a12128601c353b634bc2a85874d86d2849d69987461a68b670b7d414d7c1a6e0cb1f8aef00e647032b44c993f868b6c4940ee7f0b2c5a4ad07657d9ea889bd90aadca65e845af1a3ca449409939b5df9fbf28036b59c44bdb1d24a458d15976e7905e614fbc779094b612415925588398c3daf1d6536f08068d2baf5",
     "H1": "101ab57095185b66296d2081cf22ade9a54bde7a0164ca8ff0d43110ef0a33765b622500a46b14c851cee031a02ff79a61ffbf30fa17c58af4fcb9cb81834dd2bdc4a29ca4425717d9ed926b4eac331bd1b2ea631e1fb00ebeeedf38013dc9db2c9b1454c7f8b050d0e8fa15d9d4d7ab63a99f3fb2803cfff04fdc6de3911ca1ebabda736f5a6ecc71f412a5d15fa9d24181328516284b0cae049944bdc4c999ffaca76e886310b38aa1e021208d015e4a403088b5f74259be57b621ae63efb2fa191cd83addae19e54e2c37071409074f2e1496f62009f8da487420ff898ff06dcb320b3e3ab11514c3ad6449913dcc676909e51de9713d668cd0511d716884",
     "H2": "1e60be404bbd2e43938dcdfad195ed64f71494084f09f789be77ff0e76e9b2a0ef43da3ebe9527dd5ec86ad9f6817ac34e3f150523e190c8eeca5620f03e4f5c59beaa4b4260dd5260884e697cb4cfc701847ba6a3aca4346853828168583942425d82591f3ba62de6a1e5c90a3036432529980b38c5951723c11d6f3d9ca2db5f8bb3e132e46d87c2562b4f4a2f778a329993b40f5f7b8e88900f6616c9ccf680069d12ad0a8baab9ddebe1371e850f49f55b521a65374fc4c1d248751dae1785a610d23883b78d87899eea39859f04334b82eded1bc8505ec35983262ca82f18e1f561c1e7828df7c15a841a15ca67c28434301732a654e0e893a6a965f819",
@@ -109,7 +109,7 @@
   },
   {
     "TEST": 9,
-    "G": "b9563b7a54af1a552b7736fd9a95ba1ce0cc9484f339a0fc86e3103d9730d266d9b814f9c3995cb414acc494150cf85463b297c28f7a239cccdd84ee198c9787e7ea6990931ecbdd6d97447d56c9e0ba4caf15166f2ed4b8f7f15c5bb20f4400a4bf97c9ec42ec7a122989052a4f07803b12f01ba5e75c853ba8244bbc24e67448ad700af0044a5759aa09d494f5953b46795aa8418c97ef939f35db62aa00df1308a2f3cee50b6682115c83131189c5d7e175143ae30ac25a4117391c741842714a7df4150ca197db7be563a4306d5a19670622142c42ff91a74ab44ebca4dd4741a108a654df9009ec3fddb5152045257ef43f0a983112a529296d925fbcda",
+    "N": "b9563b7a54af1a552b7736fd9a95ba1ce0cc9484f339a0fc86e3103d9730d266d9b814f9c3995cb414acc494150cf85463b297c28f7a239cccdd84ee198c9787e7ea6990931ecbdd6d97447d56c9e0ba4caf15166f2ed4b8f7f15c5bb20f4400a4bf97c9ec42ec7a122989052a4f07803b12f01ba5e75c853ba8244bbc24e67448ad700af0044a5759aa09d494f5953b46795aa8418c97ef939f35db62aa00df1308a2f3cee50b6682115c83131189c5d7e175143ae30ac25a4117391c741842714a7df4150ca197db7be563a4306d5a19670622142c42ff91a74ab44ebca4dd4741a108a654df9009ec3fddb5152045257ef43f0a983112a529296d925fbcd9",
     "NT": "e2d11074958171a031686ab23db36f285b0e23f889cf881e66cfaccbbb4d0800fcc9972dc3469b733f0abf4222ad4981eeb748d23d82d8d2be337315b39bb1d87fb782cb59c3c21b14b05d1ba3e080f21c91be2b6a4986e961c03b405d4ab0626f603a992e450268a857e20acf91a0bc913a1d318240cbd8a4a3562fe0f84028931a63df780e9d16f756de3cb837e30412916c0ae01a5f491de64469b7a29cae5b3030314a60ee75d4aad22e0a8c7c523324e3cf402a865815e2f7bc2d51826dbc13527b9a6702f60416d0a72178e82f0e9e06762bd3fe78d4ccfc167e563ffda9bcf7b3eeac25419704d2c7a5e194eb571018529ab69ad6dece43ebd3523145",
     "H1": "ae2d34b2d85e1c2572f08f5c4738bfcca656e0a7a80772e4ae2498d4859e375e745b9056d1b8109b4dc3a30bfa1d5d3dd47d4dbe41e68c0ae7edb61dc194a9d59079691bfba33cc1326628cf7c465f5560960dabf44aed9f19ada435c23c05ecf4f34fee8428288365d1500531aaa4fb3cd8b3a8eee7e6021265165c8f65d6fe0465f12514da8d935c0e5b94f99f1798b2eec02b3115f561d61499be66235972cd723708f9128fa6dcee233458a8b8e7d0ea7ccbb652b7ac4aadbfd6ce854a07719eea5bb6b63d34d41a7e9384cdf1e0307769fb34b19f70fd9742ac561b707e53eb4c85f62fe86a6d4a9bae2f2ed529b9a89ddf1ec16937d37746f25f9e2f49",
     "H2": "8fa7c5e237131b43eb63933d55d342f94825f25dff3a20851ad67eaf9926511ab7d166ae483ef0fa157d56c7b650d76a637302cc0baaa4008d39b738cf0b4045fbbc883ace1e08794afce836de515e702184729f3b8074cb8ac63f8a0ed05585fba40aca04b039c68763e64181b0cbf796da28944bad41ae3abefeebfbf8003a24cf485547be81e9497bf61526a365e697d729d968f0911167e34721c9eaedecf3d012e76b36621ea05e31ed301f413678087f586bbde4efa909701a055cdc8d333939b2b23255daba8de1aeed189aab0b97765e27ecfd6cd894b9de930af3e997a99f4bf7751395fa473899c39fddce60f425e9756e6386a54109a61041a01b",
diff --git a/testVectors/mta/rp_challenge.txt b/testVectors/mta/rp_challenge.txt
index 5acc24e..9aa3850 100644
--- a/testVectors/mta/rp_challenge.txt
+++ b/testVectors/mta/rp_challenge.txt
@@ -1,5 +1,5 @@
 TEST = 0,
-G = ac902c74e7221a6695725f811e4c4ebb7e9061606f2a6923b8cb8f9cebae54cf42b4c3332f612370aaba69568f74e60b04fd3ef2f18dc825bfd1efbb81fd64d2b5c3f90e8e3e8ced51d1423e63f33b444c0569dbe6eaa9674cb3d90cad06847072c0443a92d3063841aa56cbbba92fc94497319e3222a565e57b1de39a4765a909f1915771360f52030bfd69375c353cf97b5ef8aa5b7aa5bfe711316ed503bafa7f0e40c6df25f540611a80a6e5a8d61e3138bd4051668c228e118895c321f1474088d07ed2e5c2dd1f447d530a9bde3296d4d459607522ac88c40c391e08a479e985cc9f0d0801086899ba335d5e0c94a93132de0919031ec81713e088357e,
+N = ac902c74e7221a6695725f811e4c4ebb7e9061606f2a6923b8cb8f9cebae54cf42b4c3332f612370aaba69568f74e60b04fd3ef2f18dc825bfd1efbb81fd64d2b5c3f90e8e3e8ced51d1423e63f33b444c0569dbe6eaa9674cb3d90cad06847072c0443a92d3063841aa56cbbba92fc94497319e3222a565e57b1de39a4765a909f1915771360f52030bfd69375c353cf97b5ef8aa5b7aa5bfe711316ed503bafa7f0e40c6df25f540611a80a6e5a8d61e3138bd4051668c228e118895c321f1474088d07ed2e5c2dd1f447d530a9bde3296d4d459607522ac88c40c391e08a479e985cc9f0d0801086899ba335d5e0c94a93132de0919031ec81713e088357d,
 NT = b5eed17dc8d2b334110128bd1b19e58d97c3286e2505283a9f8d060527e8aa76b08771ca8b16ac020b4e022f85f70422abe7ea8f78a0e066188a2ca022a01af3ab93b7c39ba2558425664ae00a3ac13540b9e73ffd44973fd0ed9030850d242cdbd7c8825ef164eb04de336f3e9565b3b9fedefcf5269f54c68d5d2751bd77142f2ddbe3eda0fb68f2397899515057729b7ef88e7c8a459f88b39c33592cd2d95461185522c90c4d8b0feed1c9d4e1d68b7eff16d0439b2a687b24b242521ef3af8ed11151e3b8d50bddf39d90d0d34ba6a13ddec9b0b1cea034ac6c87d9e550335b8e8268094770d137d022d51122dbaaa403a9ffaa3258c8e1bedfc6ef6421,
 H1 = 998c278733890439c87e5b68e766b1625c288c20c8aa0a2ec2fa78162168ce14527c63f2a2a272b6455a120c8695b9d66800e42b4b5da207e4d9e5b1c7114dfd28b961952fbc817f74bed848025ac97920a2a3edff4f9cc9711a72370a25406ff1ac43d807a4f0ce64418536330ddbc839be75fe8970090c75b07b86a8fe03c9ce79edc362f7c88d79f1794285582c012df31f219bf59806aff8b5fd0e85c1f0f24daec6431cc9257caa72ea1e57567ab71bf2bff4b8ff4f12d9a3f741bb0b8d87700dd86a44bab25e231eed97547b28771e385dde150e844525da43b90b08ed47e79315f44bb10612d19e9a52df737d9dac35d60efd1ac92c6eabda6390f26d,
 H2 = 279dde351a605cc6524af37276ee8116fe50f1a7bfed17e7b876c7e5c0a9efdef8222658e724c3276ba47528f4ed63bc08a3a8db0153f2e7959d6f3ffcf8b41a462c0dd6ee41e123a9fd25bc0b2df052875b90ca6f2503bfe239fdfdd42a1333b318ebf0646b457e8a97d9fd8620c1de230f54d28f46ab51fb7761234425ce85b149415424d26179edc34e8ab9da16547fdae416915df9776297861c8224871703ca486e1aaf2e5242e2e482dbe55055c3c2516b9c1ef26adc376acd1df987d875816dc84ca0e69b94caf580c89dafbfb6bfe6d4e8cce2046c8d0a99c2c52428d9f54a6fcdab99cd6eff6e41ddee1ba9656b63ab6f82ff08413ffe97deeefe9b,
@@ -10,7 +10,7 @@
 E = 095c13c34b40dc49f94689c6ca676b44b0841dd4d412dc3fc432796c6bdbf6a8,
 
 TEST = 1,
-G = b4f6067667eea27c3abc8094bdf8e3b8ef42f023ab31e3b3c6a879844b1702611ec7e5b5d43d3a6876a12f712135ccc17ac253bcf01800ed33dbc774680e6eee0b01924852e14bb37980a2e9fbcb33f3ab50af18c16709d1acf8e5e62a7bdc1ff22e691ea1d333ab32264b8f3d4cc9e28dc5878f0ccc4cd0c687a511e5b4dabe112cfbb54fb3724471786f5f8e619ee7c7d1bbaba6fca40512e4144bcfc50d3dd3a674af04016d5ca2c5f48fbadaae959442003d01fa01d041b2f433bd003d227eb545d34d1e63c09d05cef33660e7eb73d5ff63d827099fa6b599488abc708e819480df6ede2efd49fe8e0321c90f311bbd5da43f853ae3d9ae6fb76287421e,
+N = b4f6067667eea27c3abc8094bdf8e3b8ef42f023ab31e3b3c6a879844b1702611ec7e5b5d43d3a6876a12f712135ccc17ac253bcf01800ed33dbc774680e6eee0b01924852e14bb37980a2e9fbcb33f3ab50af18c16709d1acf8e5e62a7bdc1ff22e691ea1d333ab32264b8f3d4cc9e28dc5878f0ccc4cd0c687a511e5b4dabe112cfbb54fb3724471786f5f8e619ee7c7d1bbaba6fca40512e4144bcfc50d3dd3a674af04016d5ca2c5f48fbadaae959442003d01fa01d041b2f433bd003d227eb545d34d1e63c09d05cef33660e7eb73d5ff63d827099fa6b599488abc708e819480df6ede2efd49fe8e0321c90f311bbd5da43f853ae3d9ae6fb76287421d,
 NT = c1b8aab9caaf1f9021fcd135ef022089792684e7cdb1467ff522e46713609e7ebb633f19ad52e597f7dbdb59f6684f204f368b7104116a1fd8eabdc9ef7eb4b64867ad1f007f74bc57f2fb77b0b9b518af7df355e7a5d99217df442358543b76a51798e8ef194437fb4b58378943cc812942805a0b3d30eccae13fb56ea3500a781549d1d6fbd0b2ac57d63aedaa05987298201d8434b6e51b3c0e75bbd7eeb3cfbd4f79d28692110738954720784d269fabf4d4280d61e4fb8581803dd75e1be888d29d8ca419b68ea9850919c0d5563104c084f9fe0730b496b70612aa131b20b951ea8eb61c30b186a684698f22bf09d2b02b82504a1cb3491ad01fceadad,
 H1 = 753d2203f3eeb0f3cda0ed8c1a222468138f5c4a16a9f324ee76cd3a55fb4afb7ddc445018b55979937175b88fe2d12918a75779c39bbb7b6f3795e0dd0f756c0f01c440d87d37e5e07fb1f305157d3b555b5b2eb1ddc49222f821687c032a8a45360732c49ac8e469c375719e20e00efb57a98960a3f3fede5fd062da8716d088edc978d1c1eebb564605784949edcc6b779ae6ee459044ea66ee8ac82987583e3a46936757fd13c9631fe8aab6dc4c3cfe14c11e3db3b4ef6c9d12e92cbe58a828fd2d5342bef22694c5210a2661e4de1537962f427646ab741a680c08b509a8587aa5a5730416bc0ec06b7689bc9ddc4a53012f4c312fe7ba3e721ca8ece2,
 H2 = 93a9d5c7c85d9ec6594fa9417128a76405d960891e33f9914a6e9adb5ab09b8207b5b2ae65c5a08d3bb60535469cffc762bfd5453745c64423639fc888282468a279d3f391e2d6315a17e4353d40cc8cebad8c2ed6254bdac327d792365ff328f48ac6cface694ba49866341a624df2ad121f70d42e21f101b5059884f3b92d3dd29e3c9ac94bc8285373e4aa1f4cc7f0837ab6a6f89ad0258f7882e9fb731b74c84042723cf590f603a41012e3c8af384a8ca2f140bf0a30e1481e202881b82a2833a27f46ae20980bf74ec50d1189028abb2be13fe35b2c98254b729f9a05fefb1419a5ee6a41ae990c62b486b5c011e5830dcd28490224048d7cb56dbbb83,
@@ -21,7 +21,7 @@
 E = 8135f05be96b92e66c0f60b6767e72607a30d00a5c9676e70375d046b61a48fb,
 
 TEST = 2,
-G = d0b5ed441de0c29be9d92ef3c1538c0c0d81f616dab33966ed6150e4a5895422b8b58219291c8e3a5f542fb92767ed7ba46a97e67ec927dd0b2555935bcee97de1d40bdf94c6a877d865318bee573a86936df6edabe719bf98d15e7d77cd9641234d022558dd60d29197d23f7263b4a83c22aae2f1b044448b6103c8f7fcc4bbf149e0f6f638ac6dd2fda5abf0a3e8dfc3c79b78d67c70a8a213df26a755fa6b39690d4eda814be11a44f9bfc5091f18ebdd77f7c5fd99379d01151741286da58b821a156a46945943be484eb7b50ce177b093bb2c9cd7fd5dd6ae27832e25dce15eca635bce866ff76328660cecae3cd0e046bf085255cf87909909a63bf788,
+N = d0b5ed441de0c29be9d92ef3c1538c0c0d81f616dab33966ed6150e4a5895422b8b58219291c8e3a5f542fb92767ed7ba46a97e67ec927dd0b2555935bcee97de1d40bdf94c6a877d865318bee573a86936df6edabe719bf98d15e7d77cd9641234d022558dd60d29197d23f7263b4a83c22aae2f1b044448b6103c8f7fcc4bbf149e0f6f638ac6dd2fda5abf0a3e8dfc3c79b78d67c70a8a213df26a755fa6b39690d4eda814be11a44f9bfc5091f18ebdd77f7c5fd99379d01151741286da58b821a156a46945943be484eb7b50ce177b093bb2c9cd7fd5dd6ae27832e25dce15eca635bce866ff76328660cecae3cd0e046bf085255cf87909909a63bf787,
 NT = dfbdfc2a4784522a0bcd93a9925e2d185ec9af22e3c76af9e3a55552ef2d22e01c3a9e5155420383305ae63787a6451f91d2ee741c24a695272fa1f3b7ed6830d7c9f519fe3afefd97b956029c9bb781ea3efe49bc9cfd911dd132f7b1c12d9002fe73782c148b299144b664200246b3a5336b46768afe63e8b508efb0aeb71022e27307663d1ff104865310e59edeb9220630561530a7de5e3c5a74abaa4549b80d37e851c8affc44eb1024387c63a7854346ba6cf9c9305d04350b93db8cde33c3260789feff3b3c4d55cd50216e4473db4fd83d138e6bf25a9d609f010769895dd1844fdaed0cca3a773ecb734a6687ec07422d5ec7496238cba08fd08fa9,
 H1 = 49e218ab98a9bb1e6524b17b18aa4612c85aa7f50ecb8edf9cf08b5ad0fae00103f49105571a9a6d0cc14946f893b8a2118efc91a3c9c1746beeb5b12c0216380ab38d2021326f31029390959e02c2c977da86000e5cff9b68f38cd6e1e5319013d6c191c46a85dcf499ee6c6461307e7c38ae93520b4c822477a9bd6126071917f29a8eff05330a193e4129f690b6204f82bc010da130fd93b9fa42a7dba7c574615be03ed50baa2cafff5e5eb3385c51f0056eaa3f062ae559cbdfe06b341d53f59f1dffa866ebc1b0999f13a160cbc8a3670f034484f63d46076fc7a5d9e2fa6d5bf49a97cf354b89e3a986f54eb356cefc87d564c98199dbf5da70df7d67,
 H2 = 0370358ae55d746a5b8e787086ee8f2aad9545ae5e812a81d96611c816db67a7f5e4352908a9e1c012b9ceccd489f555b984153090c816ddecab04f7a2272b6fcfd0e967d16a98f7c703df2e9886646841e92c8a8eaa488491bdef93bd1c090e2b43fa97ca41410de6d7b92ae431332b3773029f1264d81910a6996fb956ef9dc58887e00018e19c867816f04dd60af5eca816dd4d6fbf263e24de7be6767d8c30daec086d066ecc9183228e05a8706638cc9ed994d127752546bf2e17eac23bdd99c95daced91c11a04c123f26331b84647a41827583bd8f2bd855f11780eea5f5ffe9f3e5f86d5b22bb11eaf97cf540ebecfdfa23f88399edb885d128ce1d9,
@@ -32,7 +32,7 @@
 E = 73630cf2f9fc3cf61185c71367e5fff78a2047eda970639272ed7966c1866a08,
 
 TEST = 3,
-G = c0360322065da36d12a963f09d5329202c7b2c00e0b9da28cb9a86857fc6c522e9ab7ab667e7ecfd3f1e385a322e6e59dc2ed680f7ba678bdf253ba73647a00a010b249a22b06a24c4c0f5f2d1050fcf65c3d65bbc06a6ca1f7a1ef6d302b8b43171b3e0a71b2ac028098c1561bf96615bdbf1d4f2fb4fd303fd4281b20068ef93e00ae39029ee14abd0f599ee02b7bc1fda9709a7575fb168582c7183511a792c675cd1a8ce1bc0f1306d6bfc7c72c28fea16e2622d59e64bc3de5747bca8c343afd72a956b205368d3c4de0f707bdb1c0d4464489c3379b53fc74958cd539d4a855d627fde96b4f72f8915f2f7c4e89173be73fa07aa1dbfdbd8a59504a9b4,
+N = c0360322065da36d12a963f09d5329202c7b2c00e0b9da28cb9a86857fc6c522e9ab7ab667e7ecfd3f1e385a322e6e59dc2ed680f7ba678bdf253ba73647a00a010b249a22b06a24c4c0f5f2d1050fcf65c3d65bbc06a6ca1f7a1ef6d302b8b43171b3e0a71b2ac028098c1561bf96615bdbf1d4f2fb4fd303fd4281b20068ef93e00ae39029ee14abd0f599ee02b7bc1fda9709a7575fb168582c7183511a792c675cd1a8ce1bc0f1306d6bfc7c72c28fea16e2622d59e64bc3de5747bca8c343afd72a956b205368d3c4de0f707bdb1c0d4464489c3379b53fc74958cd539d4a855d627fde96b4f72f8915f2f7c4e89173be73fa07aa1dbfdbd8a59504a9b3,
 NT = a86824e86c82674f33904dbdcb24e39d2464f3f906a90702ae2af8f71be38e87cb974493dbdfc40ec9477fde12be9f9c3d8ce49b31a9a55e8e7b56909b263106025cacbb8d454375f0078689f2c7df41e6c0a92a10aee5e53718ff1ed4ce08ac3eeef87d42e41e485f457720dd0173bea2d6aec0c6aa0046965e09c755244bf365c92f884dc2c38c415e041fda53b0226147ba3d8ded0b8d1cfb36f4aad7b98cf24f46dcbc6c83e9f40aa44d50c3c0cabc27d4c52a0c6e6fcc4736303bb65c5149a7a263a4524abdb512407a5a84267ee90412aef31d81251e20ed3735ce6f3ad0051138b21f58d95dc0bfa1b73b5b5adae3548d5a160faac4b865a2b85b0c6d,
 H1 = 3687d10b2ca353a68158d24b547ff85b29fe96c22a8d64a15314ea00cfe069300bba4a84900f8823b2f92cb70ccefc28971f42dfc3c91afc73ba98a0e7ad13e513a83c8c31f4deeedfa0f2310c7692281d4524de6dd8a0014572b7225dee1bf24595ff3fce06cf9c5658169685d49736eed3bedcd56e29c846eb82727e8477aa7459939997f81590003bc9b6353393cad699c175ac4f39eaa44541f85a5f132a0a3c84c06c975ffae676d6711692dcd9d8e75e2c0e78af8d2b41a846d112ad5831fa1371301809c7054cc5500b2596ef198740ec5ba6bde76e3b7d8bb0891c9e259f3e107c57008df5b45eaef85527aa16c31b17f7953f1592005936cab0a8a3,
 H2 = 471c9984224190f625fc9ceeb53294fc7c4f569b3753cd676feef2cce8549e599888bb317e4d4c2c6d0cd30dae32740bcf19c9be6fd084be01913c29d076afcd4f6f2524d0e038295a8432fee6c8758e9f68bb0947e30493d1f428fde9a7957a14f739c2b787cb469d7864dd46e5cdaffdb26162225cab4ae7d2b77d67a1dcc7e67b638bc53580285b4d7fa369c1533e8346373a311cbcf44c9b4c7a166be4308a14f0d141c77cd5e66dc1fab1babb0bef7a7456c18372800dd3cd52a93bfe418a334981677edf801fa13ba38bb1bf39420b2036dee2fa860fdc11b6d5173d25284263da4e475fd28c2b1428c4035232675986aab16e61ad0aa43b04c6b28637,
@@ -43,7 +43,7 @@
 E = 183899f5298b7a5978e077c35b28562fba1e5df82ad7812f8e18f50a50b7c113,
 
 TEST = 4,
-G = ceaa366d65f873033b7b02cf73aa611c81a827e8ecc70ce2e95389d442ca526cbc7bf7b8737551f250b871d97f32ab1803d843f4fc7ca799ee91f375b9412bb84113ce015f293f5de6eb81cf3ba521fe52184a552e6aa9a02d8fec6d7fad3830ce764dd2b7039eab29d410881528813c5aa3bf1d94dcfa5b5c9240c041d69ea3d19a75f69962fead1bc7607d08bae8f0da7ce155f32a3727fc5008d1dffd3f9b612725ad992696b6f2bba3127c37c2dff57807f310cbe11c65692886bc052a23a8a323042f43d708d89a62a279ececa6f8574b2b732c3ec0a2ab75c0f4a5bf0fd557d64aeb03fa9d24863287ca69174433a4711db925b9933304bdef0beed788,
+N = ceaa366d65f873033b7b02cf73aa611c81a827e8ecc70ce2e95389d442ca526cbc7bf7b8737551f250b871d97f32ab1803d843f4fc7ca799ee91f375b9412bb84113ce015f293f5de6eb81cf3ba521fe52184a552e6aa9a02d8fec6d7fad3830ce764dd2b7039eab29d410881528813c5aa3bf1d94dcfa5b5c9240c041d69ea3d19a75f69962fead1bc7607d08bae8f0da7ce155f32a3727fc5008d1dffd3f9b612725ad992696b6f2bba3127c37c2dff57807f310cbe11c65692886bc052a23a8a323042f43d708d89a62a279ececa6f8574b2b732c3ec0a2ab75c0f4a5bf0fd557d64aeb03fa9d24863287ca69174433a4711db925b9933304bdef0beed787,
 NT = 9c9bc9253874a40a5a355579224cba50de2b41b28e6090aff68358b3b427b6c1d380dd159830af170deb982bc00eced7f4fd1767584d8c2d9679112404d565caec1ab17d20a2f0266fdf318a98cebd98def0aaab434e5de8e2231f899cd48db142b2893bc3c61bf679e6ab1132969cf78764f27b42fc2fef54d08ef578d8b26fd6809e65540d8433d3d7624a0932b80a71733788371789c3fbc6328020e844e8b9630346bae67e04b6ef762321dc75aa4def408a27ff0b2954a7de9c6daff0a21a3081ffa60a98af89ffea10337c6a8644afe0f5072cf1748fec2653337a85a8bee2d088510863383893c86be8d76682a5b1d4b19fd4e7a040c4c50d14bfef49,
 H1 = 35915e88b3ab520a1d569e24e95ce6e473e6b58f21bfd5cd26e679bcfad815a9df71651a3be0577ffa01a6b0681a1afccf96475945d0d9a32cc7f965fa308ba70ccf8525a8d602aef2bc9d6b69893f1da962f9f0fd7d9e49011e9d01eb68dafcf0bf412bd5df0717e7367d3d3c22f678e10e0c50eb21a96186bfaf623a0890aa35614ee72f2313acbe3f6a7f7fd72e844fdb895df978aa9981b81368b54d63aa45bdb75390297781f640e4c3a210e82d3cdbdef67abf79ecf092c7c4b0f9616768f442ea62170393f206f65ae6c22f093a9261e4270ff48603246bacce3ad612e62d5bc99a2c8a3132c13661395a69201941560972b926359458ef0c75e99f32,
 H2 = 5a61719cf69e9b8c82e4e6a4c16487ed7e4130ac5165614467327d97db64a5c66d772bb6b50a2ed1f3ec6e66e17bfc022d16e3750c5fcac714fc4482de99f1cf5a6505c239c83cb05129d17db3bee84ddc82159955e56a06281aa5d97e1d9f6ab51070cc1c346b6edd4f934befa63f8673922ba6123d28c4c20391c6ed2fef677ad5ed36ad3afa228848261ceb4a349d22dd9a6b2f2bdb50654a239e21872268f4d451af24e48aa8bb2502e884161017f1785cbdca5f2987b7b1bfe40e48f9547d490a23629867a8ca1a0ad921b3dbd3419b80ff3283a811d8816d4c69b8c5bd0ac660d604fa6db4aa07022d60361545ec3f6718fe746bd0328933c64539771f,
@@ -54,7 +54,7 @@
 E = d9801a151897c2dbead5557cd98fb8ecb11939e34cde37b23d281cffaf0c4108,
 
 TEST = 5,
-G = a5ab88866062c25ea144790dea4046aa4352a5b98a4aa02356b91ce7be80bd625ed6bacd48ca38340c96ead9f93a51d7d08509194bd159041d60b7e9259a28962c0a0d5632c36266adfcffefa10692ef01b41f74fd52efcb955cc3cc4362466986fd52ceb9fb6273950193f9a763eb65ef63282728899bd8844dee8200679f5a436961e34a185fe5909064e59b23bdfed3c080e1c89c88cf65850fe6b2aa5192dfa81f24588c6c4f0e228b80e9a18a85b5357b35fa92a313087d3458b74d661fe9f7f67d187a158b964ead0248169944651c3dbd6358e96bf33b01afb56e47f7cde0a5a7c85dd20ffbf7fce3d3eb30ab5b813853a6f1cf33f0679659a2e14dc6,
+N = a5ab88866062c25ea144790dea4046aa4352a5b98a4aa02356b91ce7be80bd625ed6bacd48ca38340c96ead9f93a51d7d08509194bd159041d60b7e9259a28962c0a0d5632c36266adfcffefa10692ef01b41f74fd52efcb955cc3cc4362466986fd52ceb9fb6273950193f9a763eb65ef63282728899bd8844dee8200679f5a436961e34a185fe5909064e59b23bdfed3c080e1c89c88cf65850fe6b2aa5192dfa81f24588c6c4f0e228b80e9a18a85b5357b35fa92a313087d3458b74d661fe9f7f67d187a158b964ead0248169944651c3dbd6358e96bf33b01afb56e47f7cde0a5a7c85dd20ffbf7fce3d3eb30ab5b813853a6f1cf33f0679659a2e14dc5,
 NT = b8d5562cebee1ba65ed1bc96f5a10d7f76f804ff76065ae71ef8e9224c1e8ecaec249e4ef4794053866b9052780ca0adbb656e56427d5e7e041b358a5f23036655a3bf3d180a5795f1aea576670ddc9ee3403dfa1c17babc5d86bd569c8932e404d727dd4ce769646413617a00c11527d40ffaff50b205ceb73de9591a3e614c65f92e1bc01d6f78bc8a7bc349eac9f4d432efa76be3a18d89f49abe6ad2e8fca17a2f100103e6622e290adcaa7b9d80b5fd61c2cffb533de4b9a8c8a0376a595c360f193319bce77256812e972f1e4bb2e38895783f870f7958033a59e3023224da56f5479d6fd8d990d361c4b28987232ae33fa84a24ebc5c041e78b5093d1,
 H1 = 51996265acb79b38da1abc9a887497220e8a2f250363308d66f7e450ce410086ebd02b91490031258b4f8f63161580ce4dcfbc81071febd15eca81288142425f97c382d9658eca542432dd6f9ad249948ce0da4cb7dc27a0c4b35ed845dbbb6a1c012ab0c3e140d99d012bf6f9e8705c0a1d21bef630b676c98e17662bb17ee51914611396908f1eb136b2da62d299e02803c63122eac108c756023ca48276eb34c54643a9590057ed2ac983f0e2f357b1b221d03477529d91cd9aea58717031496b67346d74bd4cbee7dcd169fdc131ebe2a5bf8fb7648096a350c4bf444c4f3383ab10ea0c1b6f91eb22cfe47f4843ff61214f95c3aa77222c3a5d8af03dff,
 H2 = 9d5f3d80792b1e32619b0c363d29e77c07721be35307da275752c9d12e6ac34f90f5fdf5ee6987b7495c46e161bf571c9678267f1b3a321bd3133172ace0211c0c5ddf535e69f835a7329a377c0fa161eca039fbcb5707ae227cd88659170e64cff0bbdd1b727bc2711c5c4a6c4dd990be26f8289678ac271f884ec18a0cdf2a8294e9f62e34ba2392403566a9e5ab7b1a9504d0166aabf883e5cdebce3d8b2b2b37aca25484f7c275276adccc7209c69794e735a57ad4fe34a98dee86756955002abc8af11ee245f8b6166469835415134d2f2edcaa6da55403686b442cd856e94d6aeec388c3c03de2dceaaaaca47561ccca64d8f37a9fd60b7e11a4788e2b,
@@ -65,7 +65,7 @@
 E = 9276b22f5710b80e1fbab722ad7e380cd20fe87db7b4cbd446d3048bd6c878e2,
 
 TEST = 6,
-G = d141747467098e495a68ad008d3ff95fea2cc060965285afd40971108a84b6922a3950db9ba8c61c7ff8454bdd7c18bd0490467cb8fb848920492b5443fc0daa1ac9295ff967f575ac269ce1c7300c966b82ccc6d9b181eb411c64cd8156735376bce729dceb816b681fd1e62fa080c539d01eaaeffd0584b257f9810c009cbac83fd9bd77e3fc85d1c78478722b15e73a569b26ba956908a7e5c4566d0577e345480550e16e1fcc84f0b0a642379b6e7388adbabbfb4cb92fa2e10f51ab55872c5bef94d48a3a48c316dde2220b5427c6739ac80248a498eca892f581b212807219e4df1fb5d8543acc06c25842224365c73f74f9c1f9587cc9822d11d2a3c0,
+N = d141747467098e495a68ad008d3ff95fea2cc060965285afd40971108a84b6922a3950db9ba8c61c7ff8454bdd7c18bd0490467cb8fb848920492b5443fc0daa1ac9295ff967f575ac269ce1c7300c966b82ccc6d9b181eb411c64cd8156735376bce729dceb816b681fd1e62fa080c539d01eaaeffd0584b257f9810c009cbac83fd9bd77e3fc85d1c78478722b15e73a569b26ba956908a7e5c4566d0577e345480550e16e1fcc84f0b0a642379b6e7388adbabbfb4cb92fa2e10f51ab55872c5bef94d48a3a48c316dde2220b5427c6739ac80248a498eca892f581b212807219e4df1fb5d8543acc06c25842224365c73f74f9c1f9587cc9822d11d2a3bf,
 NT = d732a7a46bf87b14bc8a80b47a2867203148a8e6835f02d0788a0624a0161fe67c447f4e542bab2ebc19afb9a4c279f06c3f3797ee6a98bc86f9ecf92118547db3c8a7241e3f184934d227b408f68958cba730b5889b159ef3f75f466228788455fbfecba32d3e7fc1e384b06d116b6f1403ddc9c0974a127dbfb009378fa38fd5042831da323fc7b491f98e4b9dd143fc3c94c339316fee2ead9f19e25047fc67f8ea8b3b11959f544fbdef7da6f663513cf4946d34990d989a8caf60112ec6c1278430715a53c0374d7a1f3834cdd1fb4663637f7a09398ea45950ceddfe667dafbb963f617513f0c65ee0588b85340e268df861369091b3d2d51d963862fd,
 H1 = ceed20dd304eee603920d97bc0948e2c6cdeb16d4500b1f373b58a5e36aa1b30ea10369a14c0d9146adcd55de1d62063487605a84f6f434856ddf770fe156c92bfa2d30686e9579a5a947d451d0a8255a62687727287716bfb3f3cc6e6491c99abb652979afd2584682e280aff8373b5ec6f407855162470a0bab04ef5ecd6494ccccc0f223b0b0651f756f1ad929ca4536ca147072965ceed8d7d557a90f866fa5a6278fd69f68175dcdcf53d3bc8f429bde0f99457febea2b8ba5e67a47fdf57537211c28c33d3c99f761185249c4d5f0e1d1990611238db3d3e40dee699a45296a275b92ae68ece47d0edde132fd466ddf8d6561cc55b161907e793264f31,
 H2 = 8f3c6d0c04233cdb62b048a89553be90e8709dc496cae3f950aeec9823350773214ab5f841d9cb6a5b2ed8c4fcc8675c1d91101f2b44a687190d45b53b374fc1002bc3c48e38d420a9ed6c4079b623ac68057a02da523c88c094ec2bdfa743e9b329efcc965afe35d8c08f4dc94ba663b8f52e0d2bdf39aa69c9f113caec787c267fafbd8c05868b882e9d0f6f4b13e2e4641e9af59ef17c216e7f8c850168d33b6d3ad65f16e9d88a82bd0c18dbe7c6d0a6066509502d625a403eaf967144aba2b54cfe58f6149e93587aba81e1e5f703bbe32c448b85ae02d25bf19f63e248de4fd116eb7bdca56eed7aeeb1c3fbc33edae5629658b9ed3710dd9e08ef77cf,
@@ -76,7 +76,7 @@
 E = db3c2aefd7109441505b3672e15ccda28d2f46140c2bb80ff471738020469711,
 
 TEST = 7,
-G = 87f3eb5cabd6eda24013c75625bdfc79dd6b6b41014a72a66f771bec885e194b3ef2fe631d71c3762cfd5d6d97cf010ed0a82cde63071fadbbe4a9ce9ad170f0d58e73689248111e8bb4e630d364dfbde04dee41ba0ae3eb08b85d391a4ed0d854d66881934fe2a82281dad0c30edf6e350f5d972caa0884f186dbd443fae403c7e5dcfaaed9721d2aa157ea814915134e58d29e48d504644a3d9faeee056dfcac145306123cf9d41c7e355463829a0ad9a783dd5b1c23c5d681ba378ee905da7c83d51bcc8f59bddd95a9ef79eaac7cd800aecfe78c2b749f58159478b87f8c50ad917c71bfe904786c2e410d3ba76c4ee7792820d688438db1111f2d944ce8,
+N = 87f3eb5cabd6eda24013c75625bdfc79dd6b6b41014a72a66f771bec885e194b3ef2fe631d71c3762cfd5d6d97cf010ed0a82cde63071fadbbe4a9ce9ad170f0d58e73689248111e8bb4e630d364dfbde04dee41ba0ae3eb08b85d391a4ed0d854d66881934fe2a82281dad0c30edf6e350f5d972caa0884f186dbd443fae403c7e5dcfaaed9721d2aa157ea814915134e58d29e48d504644a3d9faeee056dfcac145306123cf9d41c7e355463829a0ad9a783dd5b1c23c5d681ba378ee905da7c83d51bcc8f59bddd95a9ef79eaac7cd800aecfe78c2b749f58159478b87f8c50ad917c71bfe904786c2e410d3ba76c4ee7792820d688438db1111f2d944ce7,
 NT = c031847390333f4b8b1fd0bae9a57ddc4b34bb9819f5285d08d0943db0975b61a43286ca3f83e9fa8768d670189f6ecac37cc2b5ab7e1ec3341c21b5c66816c0ad65a3bb2c45825f85a53bb40b31a89c9ead55706eeb55f8a0819c8b3a5489de0c5911a3a3e9ebf42ea1f9cc152401419e33a7e15f8d3abfc4739890374472a2d714e17587350918ff7c82d9be44f5541f74a7de905b4dc9d0c8333fcd185982a5e7a9304551032115ea99e9cd0e33a9b0c3086cb296719394f95dbb0927d4857f8c4cc4d747e0fa14d1d8478a31a124607a91c7694d511e39c295282ba72953c1460958ade560cdd4f53a4a4191aa5a4711cd9dda12f3f778f09b8d72b161ed,
 H1 = 54d7b45e9217f4786588cec892fb4e9ee047537f88a52b8b6b286f959c207bfece1561d7575288477b2db9a56a98a9b5add861298263bf15084e286163c2133234ac8eceb9f75ba1fad64fecbba92ee3a4dd96d10463fa6492ad9d00bfd87835f9a03d5031d36312e3d858747105e165c55bec00746e73bd6c0538a9b01e703b6a2552bbf1252bb9d8096ad030b6877635bfedfcca6ef46e79b04e99770cb5b6d3663801a3812a949b6430c51a6c501027067ea8b4b84da90ee2df8debada67e238b8c508263b96bc1fb51f6c760344256f7b8748c108363f3ff54cd95a6b050547c42a02a9c9ec35b67480cb33f9f285f3fba4a906d4a95a6b0169b85d72c36,
 H2 = 320a7c2ea26d914668ad52c9e747815ded761bf90a0deeae26f2335a9a0d9c538e98968de4c53559cf7cc9e3d0a81d75c524d0119a4ebee9f7c740f44fdd2aebaab2110ca3bdfd79a1a375262c6b69a7d5f8d542434d7bdc6c501cc9b7d53e97e550494029e2501e7b9c1c37b22bc890ebee849e260efe5ae0f5031fa45738351a9532fb50de9951295fb3a96fd980f3180a28e5249914c030fd6a2925d37707c0a50eabff3a73c373a4ee664e65446977a3569a13e5de87fd8cab4abbd04b9398f6b9f5661d656ba04302d5b2549f774088a67e7d39f11dd2fe11f79a548126471f713d3cdc1929252f8815933ac1d1803b928299fa43657f081ee321d72c64,
@@ -87,7 +87,7 @@
 E = b7ba5cc23adfddc5e5c9cac47c49f051afac46435113103c912da9e2208cd097,
 
 TEST = 8,
-G = 880fd5a34cfc27a8ef1e8536ac1742175510f2ad74ebc1fcb35860c03734a11b54d1f26ebe294e852d5144a31edadc4fa3943e088f6cea9bd2964d3408d55acc3e0bd3f6ba8d5e3debd6e8b2fa64f70715249e110518c9549dc78639b2ed71ef086832289d14eece5dcfdc1c1062bd5f7335b4b00e78b2691d8bdbce6a98c18eca9d6cf52850a1fc0cf7dfc6f595b0c1612510be10d9b92fb277f5227f64515b7658e5c0367eee2c10d44659822f77f382835c68c392fb32407db238fd671c5400916a5448b220a784b745b038b1ae9339e3890861a553d630fe39d16c9efce97de28f1ea8246aa5e65e2d8cce60fb6742faef70b177bae025d3358d5009c55e,
+N = 880fd5a34cfc27a8ef1e8536ac1742175510f2ad74ebc1fcb35860c03734a11b54d1f26ebe294e852d5144a31edadc4fa3943e088f6cea9bd2964d3408d55acc3e0bd3f6ba8d5e3debd6e8b2fa64f70715249e110518c9549dc78639b2ed71ef086832289d14eece5dcfdc1c1062bd5f7335b4b00e78b2691d8bdbce6a98c18eca9d6cf52850a1fc0cf7dfc6f595b0c1612510be10d9b92fb277f5227f64515b7658e5c0367eee2c10d44659822f77f382835c68c392fb32407db238fd671c5400916a5448b220a784b745b038b1ae9339e3890861a553d630fe39d16c9efce97de28f1ea8246aa5e65e2d8cce60fb6742faef70b177bae025d3358d5009c55d,
 NT = aa3a57faaa2d2859140344aeeb482e83770b6ea2941c4bec7780251c6bdbd2aa247dedeb19642a8cb55f03ba8d129ea4ef10314f9aa73bedafa112afec5dcf54f90e8319cf8bb80acc148bc34cc8d731237a114d9d088ddc89d419f3180a16793dd927e77258e35260d7885aaf53e7c1338ec3e068bcb8e74e244f29caf01bd3b7da0d08a12128601c353b634bc2a85874d86d2849d69987461a68b670b7d414d7c1a6e0cb1f8aef00e647032b44c993f868b6c4940ee7f0b2c5a4ad07657d9ea889bd90aadca65e845af1a3ca449409939b5df9fbf28036b59c44bdb1d24a458d15976e7905e614fbc779094b612415925588398c3daf1d6536f08068d2baf5,
 H1 = 101ab57095185b66296d2081cf22ade9a54bde7a0164ca8ff0d43110ef0a33765b622500a46b14c851cee031a02ff79a61ffbf30fa17c58af4fcb9cb81834dd2bdc4a29ca4425717d9ed926b4eac331bd1b2ea631e1fb00ebeeedf38013dc9db2c9b1454c7f8b050d0e8fa15d9d4d7ab63a99f3fb2803cfff04fdc6de3911ca1ebabda736f5a6ecc71f412a5d15fa9d24181328516284b0cae049944bdc4c999ffaca76e886310b38aa1e021208d015e4a403088b5f74259be57b621ae63efb2fa191cd83addae19e54e2c37071409074f2e1496f62009f8da487420ff898ff06dcb320b3e3ab11514c3ad6449913dcc676909e51de9713d668cd0511d716884,
 H2 = 1e60be404bbd2e43938dcdfad195ed64f71494084f09f789be77ff0e76e9b2a0ef43da3ebe9527dd5ec86ad9f6817ac34e3f150523e190c8eeca5620f03e4f5c59beaa4b4260dd5260884e697cb4cfc701847ba6a3aca4346853828168583942425d82591f3ba62de6a1e5c90a3036432529980b38c5951723c11d6f3d9ca2db5f8bb3e132e46d87c2562b4f4a2f778a329993b40f5f7b8e88900f6616c9ccf680069d12ad0a8baab9ddebe1371e850f49f55b521a65374fc4c1d248751dae1785a610d23883b78d87899eea39859f04334b82eded1bc8505ec35983262ca82f18e1f561c1e7828df7c15a841a15ca67c28434301732a654e0e893a6a965f819,
@@ -98,7 +98,7 @@
 E = c6219bd105ef68e7d4eab760df68305be83c37e40d01a57b01a350a7569a1cae,
 
 TEST = 9,
-G = b9563b7a54af1a552b7736fd9a95ba1ce0cc9484f339a0fc86e3103d9730d266d9b814f9c3995cb414acc494150cf85463b297c28f7a239cccdd84ee198c9787e7ea6990931ecbdd6d97447d56c9e0ba4caf15166f2ed4b8f7f15c5bb20f4400a4bf97c9ec42ec7a122989052a4f07803b12f01ba5e75c853ba8244bbc24e67448ad700af0044a5759aa09d494f5953b46795aa8418c97ef939f35db62aa00df1308a2f3cee50b6682115c83131189c5d7e175143ae30ac25a4117391c741842714a7df4150ca197db7be563a4306d5a19670622142c42ff91a74ab44ebca4dd4741a108a654df9009ec3fddb5152045257ef43f0a983112a529296d925fbcda,
+N = b9563b7a54af1a552b7736fd9a95ba1ce0cc9484f339a0fc86e3103d9730d266d9b814f9c3995cb414acc494150cf85463b297c28f7a239cccdd84ee198c9787e7ea6990931ecbdd6d97447d56c9e0ba4caf15166f2ed4b8f7f15c5bb20f4400a4bf97c9ec42ec7a122989052a4f07803b12f01ba5e75c853ba8244bbc24e67448ad700af0044a5759aa09d494f5953b46795aa8418c97ef939f35db62aa00df1308a2f3cee50b6682115c83131189c5d7e175143ae30ac25a4117391c741842714a7df4150ca197db7be563a4306d5a19670622142c42ff91a74ab44ebca4dd4741a108a654df9009ec3fddb5152045257ef43f0a983112a529296d925fbcd9,
 NT = e2d11074958171a031686ab23db36f285b0e23f889cf881e66cfaccbbb4d0800fcc9972dc3469b733f0abf4222ad4981eeb748d23d82d8d2be337315b39bb1d87fb782cb59c3c21b14b05d1ba3e080f21c91be2b6a4986e961c03b405d4ab0626f603a992e450268a857e20acf91a0bc913a1d318240cbd8a4a3562fe0f84028931a63df780e9d16f756de3cb837e30412916c0ae01a5f491de64469b7a29cae5b3030314a60ee75d4aad22e0a8c7c523324e3cf402a865815e2f7bc2d51826dbc13527b9a6702f60416d0a72178e82f0e9e06762bd3fe78d4ccfc167e563ffda9bcf7b3eeac25419704d2c7a5e194eb571018529ab69ad6dece43ebd3523145,
 H1 = ae2d34b2d85e1c2572f08f5c4738bfcca656e0a7a80772e4ae2498d4859e375e745b9056d1b8109b4dc3a30bfa1d5d3dd47d4dbe41e68c0ae7edb61dc194a9d59079691bfba33cc1326628cf7c465f5560960dabf44aed9f19ada435c23c05ecf4f34fee8428288365d1500531aaa4fb3cd8b3a8eee7e6021265165c8f65d6fe0465f12514da8d935c0e5b94f99f1798b2eec02b3115f561d61499be66235972cd723708f9128fa6dcee233458a8b8e7d0ea7ccbb652b7ac4aadbfd6ce854a07719eea5bb6b63d34d41a7e9384cdf1e0307769fb34b19f70fd9742ac561b707e53eb4c85f62fe86a6d4a9bae2f2ed529b9a89ddf1ec16937d37746f25f9e2f49,
 H2 = 8fa7c5e237131b43eb63933d55d342f94825f25dff3a20851ad67eaf9926511ab7d166ae483ef0fa157d56c7b650d76a637302cc0baaa4008d39b738cf0b4045fbbc883ace1e08794afce836de515e702184729f3b8074cb8ac63f8a0ed05585fba40aca04b039c68763e64181b0cbf796da28944bad41ae3abefeebfbf8003a24cf485547be81e9497bf61526a365e697d729d968f0911167e34721c9eaedecf3d012e76b36621ea05e31ed301f413678087f586bbde4efa909701a055cdc8d333939b2b23255daba8de1aeed189aab0b97765e27ecfd6cd894b9de930af3e997a99f4bf7751395fa473899c39fddce60f425e9756e6386a54109a61041a01b,