diff --git a/Cargo.toml b/Cargo.toml
index 9a145f9..dba6d6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ categories = [ "cryptography", "authentication" ]
 [dependencies]
 rand = {version = "0.8.5"}
 zeroize = { version = "1.5" }
-serde = { version = "1.0.25", default_feature = false, features = ["derive", "serde_derive"] }
+serde = { version = "1.0.25", default-features = false, features = ["derive", "serde_derive"] }
 serde_json = "1.0.59"
 hex = "0.4.3"
 thiserror = "1.0.30"
@@ -46,7 +46,6 @@ dotenv = "0.15.0"
 [lib]
 name = "zkryptium"
 path = "src/lib.rs"
-features = ["cl03"]
 
 [features]
 default = ["bbsplus"]
@@ -57,14 +56,14 @@ bbsplus = ["dep:bls12_381_plus"]
 [[example]]
 name = "bbsplus_blind"
 path = "examples/bbsplus_blind.rs"
-features = ["bbsplus"]
+required-features = ["bbsplus"]
 
 [[example]]
 name = "bbsplus"
 path = "examples/bbsplus.rs"
-features = ["bbsplus"]
+required-features = ["bbsplus"]
 
 [[example]]
 name = "cl03"
 path = "examples/cl03.rs"
-features = ["cl03"]
\ No newline at end of file
+required-features = ["cl03"]
diff --git a/README.md b/README.md
index b9bb41e..319ba3e 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
 ## Description
 
 ZKryptium provides an implementation in accordance with:
-* **BBS+**([draft-irtf-cfrg-bbs-signatures-05](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05)) signature scheme 
-* **Blind BBS Signatures** ([draft-kalos-bbs-blind-signatures-00](https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00))
+* **BBS+**([draft-irtf-cfrg-bbs-signatures-06](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06)) signature scheme
+* **Blind BBS Signatures** ([draft-kalos-bbs-blind-signatures-01](https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01))
 * **CL2003** (https://link.springer.com/chapter/10.1007/3-540-36413-7_20) signature scheme 
 
 
diff --git a/examples/bbsplus_blind.rs b/examples/bbsplus_blind.rs
index e22ae4f..cf241c9 100644
--- a/examples/bbsplus_blind.rs
+++ b/examples/bbsplus_blind.rs
@@ -107,29 +107,39 @@ mod bbsplus_example {
 
         let disclosed_indexes = [0usize, 2usize];
         let disclosed_commitment_indexes = [1usize];
-        let (poks, all_disclosed_messages, all_disclosed_indexes) =
-            PoKSignature::<BBSplus<S::Ciphersuite>>::blind_proof_gen(
-                issuer_pk,
-                &blind_signature.to_bytes(),
-                Some(&header),
-                Some(&nonce_verifier),
-                Some(&messages),
-                Some(&committed_messages),
-                Some(&disclosed_indexes),
-                Some(&disclosed_commitment_indexes),
-                Some(&secret_prover_blind),
-                None,
-            )?;
+        let poks = PoKSignature::<BBSplus<S::Ciphersuite>>::blind_proof_gen(
+            issuer_pk,
+            &blind_signature.to_bytes(),
+            Some(&header),
+            Some(&nonce_verifier),
+            Some(&messages),
+            Some(&committed_messages),
+            Some(&disclosed_indexes),
+            Some(&disclosed_commitment_indexes),
+            Some(&secret_prover_blind),
+            None,
+        )?;
 
         //Verifier verifies SPok
         log::info!("Signature Proof of Knowledge verification...");
+        let disclosed_messages = disclosed_indexes
+            .iter()
+            .map(|&i| messages[i].clone())
+            .collect::<Vec<_>>();
+        let disclosed_committed_messages = disclosed_commitment_indexes
+            .iter()
+            .map(|&i| committed_messages[i].clone())
+            .collect::<Vec<_>>();
         let poks_verification_result = poks
             .blind_proof_verify(
                 issuer_pk,
-                Some(&all_disclosed_messages),
-                Some(&all_disclosed_indexes),
                 Some(&header),
                 Some(&nonce_verifier),
+                Some(messages.len()),
+                Some(&disclosed_messages),
+                Some(&disclosed_committed_messages),
+                Some(&disclosed_indexes),
+                Some(&disclosed_commitment_indexes),
             )
             .is_ok();
         assert!(
diff --git a/fixture_data/bls12-381-sha-256/proof/proof001.json b/fixture_data/bls12-381-sha-256/proof/proof001.json
index 9d3804a..a5816bb 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof001.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof001.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid single message signature, single-message revealed proof",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "88c0eb3bc1d97610c3a66d8a3a73f260f95a3028bccf7fff7d9851e2acd9f3f32fdf58a5b34d12df8177adf37aa318a20f72be7d37a8e8d8441d1bc0bc75543c681bf061ce7e7f6091fe78c1cb8af103",
+  "signature": "84773160b824e194073a57493dac1a20b667af70cd2352d8af241c77658da5253aa8458317cca0eae615690d55b1f27164657dcafee1d5c1973947aa70e2cfbb4c892340be5969920d0916067b4565a0",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -10,7 +10,7 @@
   "disclosedIndexes": [
     0
   ],
-  "proof": "a7c217109e29ecab846691eaad757beb8cc93356daf889856d310af5fc5587ea4f8b70b0d960c68b7aefa62cae806baa8edeca19ca3dd884fb977fc43d946dc2a0be8778ec9ff7a1dae2b49c1b5d75d775ba37652ae759b9bb70ba484c74c8b2aeea5597befbb651827b5eed5a66f1a959bb46cfd5ca1a817a14475960f69b32c54db7587b5ee3ab665fbd37b506830a0fdc9a7f71072daabd4cdb49038f5c55e84623400d5f78043a18f76b272fd65667373702763570c8a2f7c837574f6c6c7d9619b0834303c0f55b2314cec804b33833c7047865587b8e55619123183f832021dd97439f324fa3ad90ec45417070067fb8c56b2af454562358b1509632f92f2116c020fe7de1ba242effdb36e980",
+  "proof": "94916292a7a6bade28456c601d3af33fcf39278d6594b467e128a3f83686a104ef2b2fcf72df0215eeaf69262ffe8194a19fab31a82ddbe06908985abc4c9825788b8a1610942d12b7f5debbea8985296361206dbace7af0cc834c80f33e0aadaeea5597befbb651827b5eed5a66f1a959bb46cfd5ca1a817a14475960f69b32c54db7587b5ee3ab665fbd37b506830a49f21d592f5e634f47cee05a025a2f8f94e73a6c15f02301d1178a92873b6e8634bafe4983c3e15a663d64080678dbf29417519b78af042be2b3e1c4d08b8d520ffab008cbaaca5671a15b22c239b38e940cfeaa5e72104576a9ec4a6fad78c532381aeaa6fb56409cef56ee5c140d455feeb04426193c57086c9b6d397d9418",
   "result": {
     "valid": true
   },
@@ -23,12 +23,12 @@
       "r3_tilde": "639e3417007d38e5d34ba8c511e836768ddc2669fdd3faff5c14ad27ac2b2da1",
       "m_tilde_scalars": []
     },
-    "A_bar": "a7c217109e29ecab846691eaad757beb8cc93356daf889856d310af5fc5587ea4f8b70b0d960c68b7aefa62cae806baa",
-    "B_bar": "8edeca19ca3dd884fb977fc43d946dc2a0be8778ec9ff7a1dae2b49c1b5d75d775ba37652ae759b9bb70ba484c74c8b2",
+    "A_bar": "94916292a7a6bade28456c601d3af33fcf39278d6594b467e128a3f83686a104ef2b2fcf72df0215eeaf69262ffe8194",
+    "B_bar": "a19fab31a82ddbe06908985abc4c9825788b8a1610942d12b7f5debbea8985296361206dbace7af0cc834c80f33e0aad",
     "D": "aeea5597befbb651827b5eed5a66f1a959bb46cfd5ca1a817a14475960f69b32c54db7587b5ee3ab665fbd37b506830a",
-    "T1": "8ce960f5155d05a1795cc3422e6c975f6436a9b70c17ffbfd776346c93a9682bb6c74abd70d8c32781ae783ec45ea005",
+    "T1": "a862fa5d3ab4c264c22b8a02636fd4030e8b14ac20dee14e08fdb6cfc445432c08abb49ec111c1eb9d90abef50134a60",
     "T2": "ab9543a6b04303e997621d3d5cbd85924e7e69da498a2a9e9d3a8b01f39259c9c5920bd530de1d3b0afb99eb0c549d5a",
     "domain": "25d57fab92a8274c68fde5c3f16d4b275e4a156f211ae34b3ab32fbaf506ed5c",
-    "challenge": "067fb8c56b2af454562358b1509632f92f2116c020fe7de1ba242effdb36e980"
+    "challenge": "32381aeaa6fb56409cef56ee5c140d455feeb04426193c57086c9b6d397d9418"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof002.json b/fixture_data/bls12-381-sha-256/proof/proof002.json
index 580bda3..d0b868b 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof002.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof002.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, all messages revealed proof",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -28,7 +28,7 @@
     8,
     9
   ],
-  "proof": "a6faacf33f935d1910f21b1bbe380adcd2de006773896a5bd2afce31a13874298f92e602a4d35aef5880786cffc5aaf08978484f303d0c85ce657f463b71905ee7c3c0c9038671d8fb925525f623745dc825b14fc50477f3de79ce8d915d841ba73c8c97264177a76c4a03341956d2ae45ed3438ce598d5cda4f1bf9507fecef47855480b7b30b5e4052c92a4360110c322b4cb2d9796ff2d741979226249dc14d4b1fd5ca1a8f6fdfc16f726fc7683e3605d5ec28d331111a22ed81729cbb3c8c3732c7593e445f802fc3169c26857622ed31bc058fdfe68d25f0c3b9615279719c64048ea9cdb74104b27757c2d01035507d39667d77d990ec5bda22c866fcc9fe70bb5b7826a2b4e861b6b8124fbd",
+  "proof": "b1f468aec2001c4f54cb56f707c6222a43e5803a25b2253e67b2210ab2ef9eab52db2d4b379935c4823281eaf767fd37b08ce80dc65de8f9769d27099ae649ad4c9b4bd2cc23edcba52073a298087d2495e6d57aaae051ef741adf1cbce65c64a73c8c97264177a76c4a03341956d2ae45ed3438ce598d5cda4f1bf9507fecef47855480b7b30b5e4052c92a4360110c67327365763f5aa9fb85ddcbc2975449b8c03db1216ca66b310f07d0ccf12ab460cdc6003b677fed36d0a23d0818a9d4d098d44f749e91008cf50e8567ef936704c8277b7710f41ab7e6e16408ab520edc290f9801349aee7b7b4e318e6a76e028e1dea911e2e7baec6a6a174da1a22362717fbae1cd961d7bf4adce1d31c2ab",
   "result": {
     "valid": true
   },
@@ -41,12 +41,12 @@
       "r3_tilde": "639e3417007d38e5d34ba8c511e836768ddc2669fdd3faff5c14ad27ac2b2da1",
       "m_tilde_scalars": []
     },
-    "A_bar": "a6faacf33f935d1910f21b1bbe380adcd2de006773896a5bd2afce31a13874298f92e602a4d35aef5880786cffc5aaf0",
-    "B_bar": "8978484f303d0c85ce657f463b71905ee7c3c0c9038671d8fb925525f623745dc825b14fc50477f3de79ce8d915d841b",
+    "A_bar": "b1f468aec2001c4f54cb56f707c6222a43e5803a25b2253e67b2210ab2ef9eab52db2d4b379935c4823281eaf767fd37",
+    "B_bar": "b08ce80dc65de8f9769d27099ae649ad4c9b4bd2cc23edcba52073a298087d2495e6d57aaae051ef741adf1cbce65c64",
     "D": "a73c8c97264177a76c4a03341956d2ae45ed3438ce598d5cda4f1bf9507fecef47855480b7b30b5e4052c92a4360110c",
-    "T1": "815064df090feebe9d089343add9ce0c46c55c45a7a75913c3ffe980cd51dd5af5a6b45a10dcf7c56927b3a30c99adea",
+    "T1": "9881efa96b2411626d490e399eb1c06badf23c2c0760bd403f50f45a6b470c5a9dbeef53a27916f2f165085a3878f1f4",
     "T2": "b9f8cf9271d10a04ae7116ad021f4b69c435d20a5af10ddd8f5b1ec6b9b8b91605aca76a140241784b7f161e21dfc3e7",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "35507d39667d77d990ec5bda22c866fcc9fe70bb5b7826a2b4e861b6b8124fbd"
+    "challenge": "28e1dea911e2e7baec6a6a174da1a22362717fbae1cd961d7bf4adce1d31c2ab"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof003.json b/fixture_data/bls12-381-sha-256/proof/proof003.json
index 1e76e9d..9e66110 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof003.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof003.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, multiple messages revealed proof",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": true
   },
@@ -42,12 +42,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof004.json b/fixture_data/bls12-381-sha-256/proof/proof004.json
index 5f76df2..5e8514b 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof004.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof004.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (different presentation header)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "011594ba7f95b3b470ea4102dd5899de3a042e5104d3ea01d15e6780d831d2be",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "different presentation header"
@@ -43,12 +43,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof005.json b/fixture_data/bls12-381-sha-256/proof/proof005.json
index a5cce03..ec3f77d 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof005.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof005.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (wrong public key)",
   "signerPublicKey": "b064bd8d1ba99503cbb7f9d7ea00bce877206a85b1750e5583dd9399828a4d20610cb937ea928d90404c239b2835ffb104220a9c66a4c9ed3b54c0cac9ea465d0429556b438ceefb59650ddf67e7a8f103677561b7ef7fe3c3357ec6b94d41c6",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "wrong public key"
@@ -43,12 +43,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof006.json b/fixture_data/bls12-381-sha-256/proof/proof006.json
index 7662efd..7d523a1 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof006.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof006.json
@@ -1,11 +1,11 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (modified messages)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
-    "aa4087baf88a755ac03985a4dd179d865886ed61a0872ff119ba2f208ce75d3a6f09a1ba3791f23b8a39855b2bfc6f14e2d49392c200dad9b641f7aba46122451ff5777e5b136eb7cc41a5c98e53bb30aaf97509364e60e1bcea6b2c20b1d4d503249d83",
+    "7385ee1a722e00e173b4cdb1c1e0c3fb379403a31b337d3778c447d9da664ac876b0f7c5587d9e994c51f9e2b6de09c0f1d0f3b39b275a96da4926c22e55166998b8c4e90372820c007ceb27bd34ec4ebfab63fea4dcc88d95f58b25ffd35b041f3fe994",
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
     "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
     "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "modified messages"
@@ -43,12 +43,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof007.json b/fixture_data/bls12-381-sha-256/proof/proof007.json
index 666727c..943dae1 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof007.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof007.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (extra message un-revealed in proof)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -24,7 +24,7 @@
     6,
     9
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "extra message un-revealed in proof"
@@ -45,12 +45,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof008.json b/fixture_data/bls12-381-sha-256/proof/proof008.json
index 38015b7..242d3c1 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof008.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof008.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (extra message invalid message un-revealed in proof)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -24,7 +24,7 @@
     6,
     9
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "extra message invalid message un-revealed in proof"
@@ -45,12 +45,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof009.json b/fixture_data/bls12-381-sha-256/proof/proof009.json
index 01c264b..9491590 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof009.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof009.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (missing message revealed in proof)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -20,7 +20,7 @@
     2,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "missing message revealed in proof"
@@ -41,12 +41,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof010.json b/fixture_data/bls12-381-sha-256/proof/proof010.json
index 6126954..3574f13 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof010.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof010.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (re-ordered messages)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "re-ordered messages"
@@ -43,12 +43,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof011.json b/fixture_data/bls12-381-sha-256/proof/proof011.json
index abc65c8..786efb2 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof011.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof011.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (extra valid message, modified total message count)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -24,7 +24,7 @@
     6,
     9
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "extra valid message, modified total message count"
@@ -45,12 +45,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof012.json b/fixture_data/bls12-381-sha-256/proof/proof012.json
index cede04f..6d32527 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof012.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof012.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (truncated proof, one less undisclosed message)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae4",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870",
   "result": {
     "valid": false,
     "reason": "truncated proof, one less undisclosed message"
@@ -43,12 +43,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof013.json b/fixture_data/bls12-381-sha-256/proof/proof013.json
index ea1d0ba..53b0ba2 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof013.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof013.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (different header)",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "ffeeddccbbaa00998877665544332211",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481352bb6fce6084eb1867c71caeac2afc4f57f4d26504656b798b3e4009eb227c7fa41b6ae00daae0436d853e86b32b366b0a9929e1570369e9c61b7b177eb70b7ff27326c467c362120dfeacc0692d25ccdd62d733ff6e8614abd16b6b63a7b78d11632cf41bc44856aee370fee6690a637b3b1d8d8525aff01cd3555c39d04f8ee1606964c2da8b988897e3d27cb444b8394acc80876d3916c485c9f36098fed6639f12a6a6e67150a641d7485656408e9ae22b9cb7ec77e477f71c1fe78cab3ee5dd62c34dd595edb15cbce061b29192419dfadcdee179f134dd8feb9323c426c51454168ffacb65021995848e368a5c002314b508299f67d85ad0eaaaac845cb029927191152edee034194cca3ae0d45cbd2f5e5afd1f9b8a3dd903adfa17ae43a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356918cd38025d86b28650e909defe9604a7259f44386b861608be742af7775a2e71a6070e5836f5f54dc43c60096834a5b6da295bf8f081f72b7cdf7f3b4347fb3ff19edaa9e74055c8ba46dbcb7594fb2b06633bb5324192eb9be91be0d33e453b4d3127459de59a5e2193c900816f049a02cb9127dac894418105fa1641d5a206ec9c42177af9316f433417441478276ca0303da8f941bf2e0222a43251cf5c2bf6eac1961890aa740534e519c1767e1223392a3a286b0f4d91f7f25217a7862b8fcc1810cdcfddde2a01c80fcc90b632585fec12dc4ae8fea1918e9ddeb9414623a457e88f53f545841f9d5dcb1f8e160d1560770aa79d65e2eca8edeaecb73fb7e995608b820c4a64de6313a370ba05dc25ed7c1d185192084963652f2870341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a",
   "result": {
     "valid": false,
     "reason": "different header"
@@ -43,12 +43,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "3a191bf3119df57214f19e662c7e01e8cc2eb6b038bc7d707f2f3e13545909e0"
+    "challenge": "341bdaa4b1a37f8c06348f38a4f80c5a2650a21d59f09e8305dcd3fc3ac30e2a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof014.json b/fixture_data/bls12-381-sha-256/proof/proof014.json
index 92d5d0f..a23c728 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof014.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof014.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, multiple messages revealed proof, no header",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ae0b1807865598b3884e3e9b110e8faec662050dc9b4d95309d957fd30f6fc24161f6f8b5680f1f5d1b547be221547915ca665c7b3087a336d5e0c5fcfea62576afd13e563b730ef6d6d81f9944ab95b",
+  "signature": "8c87e2080859a97299c148427cd2fcf390d24bea850103a9748879039262ecf4f42206f6ef767f298b6a96b424c1e86c26f8fba62212d0e05b95261c2cc0e5fdc63a32731347e810fd12e9c58355aa0d",
   "header": "",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "958783d7d535fe1860a71ad5a7cf42df6527246300e3f3d94d67639c7e8a7dbcf3f082f63e3b1bcc1cdad71e1f6d5f0d821c4c6bb4b2dcdfe945491d4f4a23d10752431d364fcbdd199c753f0beee7ffe02abbad57384244294ef7c2031d9c50ac310574f509c712bb1a181d64ea3c1ee075c018a2bc773e2480b5c033ccb9bfea5af347a88ab83746c9342ba76db36771c74f1feec7f67b30e3805d71c8f893837b455d734d360c80e119b00dc63e2756b81a320d659a9a0f1ee57c41773f304c37c278d169faec5f6720bb9187e9333b793a57ba69f27e4b0c2ea35271276fc0011306d6c909cf4d4a7a50dbc9f6ef35d43e2043046dc3041ac0a9b893dfd2dcd147910d719e818b4189a76f791a3600acd76623573c1796262a3914921ec504d0f727c63e16b432f6256db62b9667016e516e97e2ef0bfa3bd192306564df28e019af18c50ca86a0e1d8d6b08b0641e549accd5e34ada8903d55021780865edfa70f63b85f0ddaf50787f8ced8eee658f2dd61673d2cbeca2aa2a5b649c22501b72cc7ee2d10bc9fe3aa3a7e169dc070d90b37735488cd0c27517ffd634b99c1dc016a4086d24feff6f19f3c92fa11cc198830295ccc56e5f9527216765105eee34324c5f3834154943608a8ca652",
+  "proof": "81925c2e525d9fbb0ba95b438b5a13fff5874c7c0515c193628d7d143ddc3bb487771ad73658895997a88dd5b254ed29abc019bfca62c09b8dafb37e5f09b1d380e084ec3623d071ec38d6b8602af93aa0ddbada307c9309cca86be16db53dc7ac310574f509c712bb1a181d64ea3c1ee075c018a2bc773e2480b5c033ccb9bfea5af347a88ab83746c9342ba76db3675ff70ce9006d166fd813a81b448a632216521c864594f3f92965974914992f8d1845230915b11680cf44b25886c5670904ac2d88255c8c31aea7b072e9c4eb7e4c3fdd38836ae9d2e9fa271c8d9fd42f669a9938aeeba9d8ae613bf11f489ce947616f5cbaee95511dfaa5c73d85e4ddd2f29340f821dc2fb40db3eae5f5bc08467eb195e38d7d436b63e556ea653168282a23b53d5792a107f85b1203f82aab46f6940650760e5b320261ffc0ca5f15917b51e7d2ad4bcbec94de792e229db663abff23af392a5e73ce115c27e8492ec24a0815091c69874dbd9dae2d2eed000810c748a798a78a804a39034c6e745cee455812cc982eea7105948b2cb55b82278a77237fcbec4748e2d2255af0994dd09dba8ac60515a39b24632a2c1c840c4a70506add5b2eb0be9ff66e3ea8deae666f198edfbb1391c6834e6df4f1026d",
   "result": {
     "valid": true
   },
@@ -42,12 +42,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "958783d7d535fe1860a71ad5a7cf42df6527246300e3f3d94d67639c7e8a7dbcf3f082f63e3b1bcc1cdad71e1f6d5f0d",
-    "B_bar": "821c4c6bb4b2dcdfe945491d4f4a23d10752431d364fcbdd199c753f0beee7ffe02abbad57384244294ef7c2031d9c50",
+    "A_bar": "81925c2e525d9fbb0ba95b438b5a13fff5874c7c0515c193628d7d143ddc3bb487771ad73658895997a88dd5b254ed29",
+    "B_bar": "abc019bfca62c09b8dafb37e5f09b1d380e084ec3623d071ec38d6b8602af93aa0ddbada307c9309cca86be16db53dc7",
     "D": "ac310574f509c712bb1a181d64ea3c1ee075c018a2bc773e2480b5c033ccb9bfea5af347a88ab83746c9342ba76db367",
-    "T1": "971f53e663e5f5448c869678e6f21d69db629416eac12a6cb4262ef9f87c6e6a16df62de43be10255ec75f59c8bc7f91",
+    "T1": "ada552bd7ee0d6914b89eaa0e9426b3bdbdfa7ecac26b3c118aefefc577095e894c1b4a828c184e091a563e09763f3a9",
     "T2": "818dd907bf0321cf982648f91d7201b357358d3b2f6f7678afa722d89bbe5eba4415e4a65567a03292d9c7859da20cad",
     "domain": "41c5fe0290d0da734ce9bba57bfe0dfc14f3f9cfef18a0d7438cf2075fd71cc7",
-    "challenge": "1cc198830295ccc56e5f9527216765105eee34324c5f3834154943608a8ca652"
+    "challenge": "4a70506add5b2eb0be9ff66e3ea8deae666f198edfbb1391c6834e6df4f1026d"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/proof/proof015.json b/fixture_data/bls12-381-sha-256/proof/proof015.json
index f2c2c36..f61fbe6 100644
--- a/fixture_data/bls12-381-sha-256/proof/proof015.json
+++ b/fixture_data/bls12-381-sha-256/proof/proof015.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, multiple messages revealed proof, no presentation header",
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac481356d60aa96c9b53ff5c63b3930bbcb3940f2132b7dcd800be4afbffd3325ecedaf033d354de52e12e924b32dd13c2f7cebef3614a4a519ff94d1bcceb7e22562ab4a5729a74cc3746558e25469651d7da37f714951c2ca03fc364a2272d13b2dee53412f97f42dfd6b57ae92fc7cb4859f418d6a912f5c446002cbf96ee6b8f4a849577a43ef303592c33e03608a9ca93066084bdfb3d3974ba322b7523d48fc9b35227e776c994b0e2da1587b496660836a7307a2125eae5912be3ea839bb4db16a21cc394c9a63fce91040d8321b30313677f7cbc4a9119fd0849aacef25fe9336db2dcbd85a2e3fd2ca2efff623c13e6c48b832c9e07dbe4337320dd0264a573f25bb46876e8153db47de2f0176db68cca1f55406a78c89c1a65716c00e9230098c6a9690a190b20720a7662ccd13b392fe08d045b99d5010f625cd74f7e90a",
+  "proof": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc415199462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135672556358e78b5398f1a547a2a98dfe16230f244ba742dea737e4f810b4d94e03ac068ef840aaadf12b2ed51d3fb774c2a0a620019fd1f39c52c6f89a0e6067e3039413a91129791b2af215a82ad2356b6bc305c1d7a828fe519619dd026eaaf07ea81cee52b21aab3e8320519bf37c2bb228a8b580f899d84327bdc5e84a66000e8bac17d2fa039bb2246c8eacc623ccd9eb26e184a96a9e3a6702e1dbafe194772394b05251f72bcd2d20f542b15b2406f899791f6f285c7b469e7c7b9624147f305c38c903273a949f6e85b9774aeeccfafa432e2cdd7c8f97d1687741ed30d725444428dd87d9884711d9a46baaf0c04b03a2a228b7033be0841880134b03b15f698756eca5f37503a0411a9586d3027a8b8b9118e95a9949b2719e85e4a669d9e4b7bb6d4544c8cc558c30d79f9c85a87e1a95611400b7c7dac5673d800",
   "result": {
     "valid": true
   },
@@ -42,12 +42,12 @@
         "602b723c8bbaec1b057d70f18269ae5e6de6197a5884967b03b933fa80006121"
       ]
     },
-    "A_bar": "a8da259a5ae7a9a8e5e4e809b8e7718b4d7ab913ed5781ebbff4814c762033eda4539973ed9bf557f882192518318cc4",
-    "B_bar": "916fdffc857514082915a31df5bbb79992a59fd68dc3b48d19d2b0ad26be92b4cf78a30f472c0fd1e558b9d03940b077",
+    "A_bar": "a2ed608e8e12ed21abc2bf154e462d744a367c7f1f969bdbf784a2a134c7db2d340394223a5397a3011b1c340ebc4151",
+    "B_bar": "99462ba6f31106d8a6da8b513b37a47afe93c9b3474d0d7a354b2edc1b88818b063332df774c141f7a07c48fe50d452f",
     "D": "897739228c88afc797916dca01e8f03bd9c5375c7a7c59996e514bb952a436afd24457658acbaba5ddac2e693ac48135",
-    "T1": "896e010e182f0718400b1e694ebc740215c2dd703f5988b7312be5a7f824f86b221dd89d7a66f61b9fb238a73169e3bb",
+    "T1": "84719c2b5bb275ee74913dbf95fb9054f690c8e4035f1259e184e9024544bc4bbea9c244e7897f9db7c82b7b14b27d28",
     "T2": "8f5f191c956aefd5c960e57d2dfbab6761eb0ebc5efdba1aca1403dcc19e05296b16c9feb7636cb4ef2a360c5a148483",
     "domain": "6272832582a0ac96e6fe53e879422f24c51680b25fbf17bad22a35ea93ce5b47",
-    "challenge": "098c6a9690a190b20720a7662ccd13b392fe08d045b99d5010f625cd74f7e90a"
+    "challenge": "669d9e4b7bb6d4544c8cc558c30d79f9c85a87e1a95611400b7c7dac5673d800"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-sha-256/signature/signature001.json b/fixture_data/bls12-381-sha-256/signature/signature001.json
index adfa91f..5c2254d 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature001.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature001.json
@@ -8,7 +8,7 @@
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02"
   ],
-  "signature": "88c0eb3bc1d97610c3a66d8a3a73f260f95a3028bccf7fff7d9851e2acd9f3f32fdf58a5b34d12df8177adf37aa318a20f72be7d37a8e8d8441d1bc0bc75543c681bf061ce7e7f6091fe78c1cb8af103",
+  "signature": "84773160b824e194073a57493dac1a20b667af70cd2352d8af241c77658da5253aa8458317cca0eae615690d55b1f27164657dcafee1d5c1973947aa70e2cfbb4c892340be5969920d0916067b4565a0",
   "result": {
     "valid": true
   },
diff --git a/fixture_data/bls12-381-sha-256/signature/signature002.json b/fixture_data/bls12-381-sha-256/signature/signature002.json
index ab39e39..ca9ce3b 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature002.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature002.json
@@ -8,7 +8,7 @@
   "messages": [
     ""
   ],
-  "signature": "88c0eb3bc1d97610c3a66d8a3a73f260f95a3028bccf7fff7d9851e2acd9f3f32fdf58a5b34d12df8177adf37aa318a20f72be7d37a8e8d8441d1bc0bc75543c681bf061ce7e7f6091fe78c1cb8af103",
+  "signature": "84773160b824e194073a57493dac1a20b667af70cd2352d8af241c77658da5253aa8458317cca0eae615690d55b1f27164657dcafee1d5c1973947aa70e2cfbb4c892340be5969920d0916067b4565a0",
   "result": {
     "valid": false,
     "reason": "modified message"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature003.json b/fixture_data/bls12-381-sha-256/signature/signature003.json
index 8d4f6ab..4642e8c 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature003.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature003.json
@@ -9,7 +9,7 @@
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80"
   ],
-  "signature": "88c0eb3bc1d97610c3a66d8a3a73f260f95a3028bccf7fff7d9851e2acd9f3f32fdf58a5b34d12df8177adf37aa318a20f72be7d37a8e8d8441d1bc0bc75543c681bf061ce7e7f6091fe78c1cb8af103",
+  "signature": "84773160b824e194073a57493dac1a20b667af70cd2352d8af241c77658da5253aa8458317cca0eae615690d55b1f27164657dcafee1d5c1973947aa70e2cfbb4c892340be5969920d0916067b4565a0",
   "result": {
     "valid": false,
     "reason": "extra unsigned message"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature004.json b/fixture_data/bls12-381-sha-256/signature/signature004.json
index badde09..d603b00 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature004.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature004.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "result": {
     "valid": true
   },
diff --git a/fixture_data/bls12-381-sha-256/signature/signature005.json b/fixture_data/bls12-381-sha-256/signature/signature005.json
index 23b1ab4..17adc78 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature005.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature005.json
@@ -9,7 +9,7 @@
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80"
   ],
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "result": {
     "valid": false,
     "reason": "missing messages"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature006.json b/fixture_data/bls12-381-sha-256/signature/signature006.json
index eccc222..236b35a 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature006.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature006.json
@@ -17,7 +17,7 @@
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02"
   ],
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "result": {
     "valid": false,
     "reason": "re-ordered messages"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature007.json b/fixture_data/bls12-381-sha-256/signature/signature007.json
index 877301d..abeee40 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature007.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature007.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "result": {
     "valid": false,
     "reason": "wrong public key"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature008.json b/fixture_data/bls12-381-sha-256/signature/signature008.json
index 0c768d1..a8e7c08 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature008.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature008.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "result": {
     "valid": false,
     "reason": "different header"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature009.json b/fixture_data/bls12-381-sha-256/signature/signature009.json
index cef7543..e9778b2 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature009.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature009.json
@@ -6,18 +6,18 @@
   },
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
-    "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
-    "496694774c5604ab1b2544eababcf0f53278ff50",
     "ac55fb33a75909ed",
-    "515ae153e22aae04ad16f759e07237b4",
-    "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
-    "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
     "",
     "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
     "d183ddc6e2665aa4e2f088af",
-    "96012096"
+    "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
+    "96012096",
+    "515ae153e22aae04ad16f759e07237b4",
+    "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
+    "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
+    "496694774c5604ab1b2544eababcf0f53278ff50"
   ],
-  "signature": "895cd9c0ccb9aca4de913218655346d718711472f2bf1f3e68916de106a0d93cf2f47200819b45920bbda541db2d91480665df253fedab2843055bdc02535d83baddbbb2803ec3808e074f71f199751e",
+  "signature": "8339b285a4acd89dec7777c09543a43e3cc60684b0a6f8ab335da4825c96e1463e28f8c5f4fd0641d19cec5920d3a8ff4bedb6c9691454597bbd298288abed3632078557b2ace7d44caed846e1a0a1e8",
   "result": {
     "valid": false,
     "reason": "re-ordered(randomly shuffled) messages"
diff --git a/fixture_data/bls12-381-sha-256/signature/signature010.json b/fixture_data/bls12-381-sha-256/signature/signature010.json
index 8b60355..49b5124 100644
--- a/fixture_data/bls12-381-sha-256/signature/signature010.json
+++ b/fixture_data/bls12-381-sha-256/signature/signature010.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "ae0b1807865598b3884e3e9b110e8faec662050dc9b4d95309d957fd30f6fc24161f6f8b5680f1f5d1b547be221547915ca665c7b3087a336d5e0c5fcfea62576afd13e563b730ef6d6d81f9944ab95b",
+  "signature": "8c87e2080859a97299c148427cd2fcf390d24bea850103a9748879039262ecf4f42206f6ef767f298b6a96b424c1e86c26f8fba62212d0e05b95261c2cc0e5fdc63a32731347e810fd12e9c58355aa0d",
   "result": {
     "valid": true
   },
diff --git a/fixture_data/bls12-381-shake-256/proof/proof001.json b/fixture_data/bls12-381-shake-256/proof/proof001.json
index 3d2017c..6636632 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof001.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof001.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid single message signature, single-message revealed proof",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "98eb37fceb31115bf647f2983aef578ad895e55f7451b1add02fa738224cb89a31b148eace4d20d001be31d162c58d12574f30e68665b6403956a83b23a16f1daceacce8c5fde25d3defd52d6d5ff2e1",
+  "signature": "b9a622a4b404e6ca4c85c15739d2124a1deb16df750be202e2430e169bc27fb71c44d98e6d40792033e1c452145ada95030832c5dc778334f2f1b528eced21b0b97a12025a283d78b7136bb9825d04ef",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -10,7 +10,7 @@
   "disclosedIndexes": [
     0
   ],
-  "proof": "89b485c2c7a0cd258a5d265a6e80aae416c52e8d9beaf0e38313d6e5fe31e7f7dcf62023d130fbc1da747440e61459b1929194f5527094f56a7e812afb7d92ff2c081654c6d5a70e369474267f1c7f769d47160cd92d79f66bb86e994c999226b023d58ee44d660434e6ba60ed0da1a5d2cde031b483684cd7c5b13295a82f57e209b584e8fe894bcc964117bf3521b468cc9c6ba22419b3e567c7f72b6af815ddeca161d6d5270c3e8f269cdabb7d60230b3c66325dcf6caf39bcca06d889f849d301e7f30031fdeadc443a7575de547259ffe5d21a45e5a0da9b113512f7b124f031b0b8329a8625715c9245033ae13dfadd6bdb0b4364952647db3d7b91faa4c24cbb65344c03473c5065bb414ff7",
+  "proof": "89e4ab0c160880e0c2f12a754b9c051ed7f5fccfee3d5cbbb62e1239709196c737fff4303054660f8fcd08267a5de668a2e395ebe8866bdcb0dff9786d7014fa5e3c8cf7b41f8d7510e27d307f18032f6b788e200b9d6509f40ce1d2f962ceedb023d58ee44d660434e6ba60ed0da1a5d2cde031b483684cd7c5b13295a82f57e209b584e8fe894bcc964117bf3521b43d8e2eb59ce31f34d68b39f05bb2c625e4de5e61e95ff38bfd62ab07105d016414b45b01625c69965ad3c8a933e7b25d93daeb777302b966079827a99178240e6c3f13b7db2fb1f14790940e239d775ab32f539bdf9f9b582b250b05882996832652f7f5d3b6e04744c73ada1702d6791940ccbd75e719537f7ace6ee817298d",
   "result": {
     "valid": true
   },
@@ -23,12 +23,12 @@
       "r3_tilde": "016b1460eee7707c524a86a4aedeb826ce9597b42906dccaa96c6b49a8ea7da2",
       "m_tilde_scalars": []
     },
-    "A_bar": "89b485c2c7a0cd258a5d265a6e80aae416c52e8d9beaf0e38313d6e5fe31e7f7dcf62023d130fbc1da747440e61459b1",
-    "B_bar": "929194f5527094f56a7e812afb7d92ff2c081654c6d5a70e369474267f1c7f769d47160cd92d79f66bb86e994c999226",
+    "A_bar": "89e4ab0c160880e0c2f12a754b9c051ed7f5fccfee3d5cbbb62e1239709196c737fff4303054660f8fcd08267a5de668",
+    "B_bar": "a2e395ebe8866bdcb0dff9786d7014fa5e3c8cf7b41f8d7510e27d307f18032f6b788e200b9d6509f40ce1d2f962ceed",
     "D": "b023d58ee44d660434e6ba60ed0da1a5d2cde031b483684cd7c5b13295a82f57e209b584e8fe894bcc964117bf3521b4",
-    "T1": "aa74110474fcb00285be4fef3189da207720a7fbc84e3afae2c75b12d936f365c86c9ac5fa39119ef5e094d151bfef0f",
+    "T1": "91a10e73cf4090812e8ea25f31aaa61be53fcb42ce86e9f0e5df6f6dac4c3eee62ac846b0b83a5cfcbe78315175a4961",
     "T2": "988f3d473186634e41478dc4527cf240e64de23a763037454d39a876862ebc617738ba6c458142e3746b01eab58ca8d7",
     "domain": "2f18dd269c11c512256a9d1d57e61a7d2de6ebcf41cac3053f37afedc4e650a9",
-    "challenge": "3dfadd6bdb0b4364952647db3d7b91faa4c24cbb65344c03473c5065bb414ff7"
+    "challenge": "2652f7f5d3b6e04744c73ada1702d6791940ccbd75e719537f7ace6ee817298d"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof002.json b/fixture_data/bls12-381-shake-256/proof/proof002.json
index 11f5b4f..30270cd 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof002.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof002.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, all messages revealed proof",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -28,7 +28,7 @@
     8,
     9
   ],
-  "proof": "80ff9367fda28896618e8ede02481d660fe80bfce51a46bebe7e1d6a4c751d60e09e87cd8d1e2a078d0838de56b6a7ca94651eec82e5f689b4dfc7e3c879ff7e33906271b17af20eab678d64903515971e39484e712fd3c8a45f279c1e058955b3dd7ed57aaadc348361e2501a17317352e555a333e014e8e7d71eef808ae4f8fbdf45cd19fde45038bb310d5135f5205611672c8d50d505af8a6e038729230458a6ceb663fa048f4ce3a7a92998de4200882156ba6b6e60d855c0645d2fdd628518d2e6fc5221b7456ccbc1c5210a1704e4d662dddd1f99a767344a7944ab7f9b6f9d9069de4a132e4feebb6d70a87b0856635e1b8b8ca49e2992f8c80221398e08935824f959a821b4120cdfb5e6be",
+  "proof": "91b0f598268c57b67bc9e55327c3c2b9b1654be89a0cf963ab392fa9e1637c565241d71fd6d7bbd7dfe243de85a9bac8b7461575c1e13b5055fed0b51fd0ec1433096607755b2f2f9ba6dc614dfa456916ca0d7fc6482b39c679cfb747a50ea1b3dd7ed57aaadc348361e2501a17317352e555a333e014e8e7d71eef808ae4f8fbdf45cd19fde45038bb310d5135f5205fc550b077e381fb3a3543dca31a0d8bba97bc0b660a5aa239eb74921e184aa3035fa01eaba32f52029319ec3df4fa4a4f716edb31a6ce19a19dbb971380099345070bd0fdeecf7c4774a33e0a116e069d5e215992fb637984802066dee6919146ae50b70ea52332dfe57f6e05c66e99f1764d8b890d121d65bfcc2984886ee0",
   "result": {
     "valid": true
   },
@@ -41,12 +41,12 @@
       "r3_tilde": "016b1460eee7707c524a86a4aedeb826ce9597b42906dccaa96c6b49a8ea7da2",
       "m_tilde_scalars": []
     },
-    "A_bar": "80ff9367fda28896618e8ede02481d660fe80bfce51a46bebe7e1d6a4c751d60e09e87cd8d1e2a078d0838de56b6a7ca",
-    "B_bar": "94651eec82e5f689b4dfc7e3c879ff7e33906271b17af20eab678d64903515971e39484e712fd3c8a45f279c1e058955",
+    "A_bar": "91b0f598268c57b67bc9e55327c3c2b9b1654be89a0cf963ab392fa9e1637c565241d71fd6d7bbd7dfe243de85a9bac8",
+    "B_bar": "b7461575c1e13b5055fed0b51fd0ec1433096607755b2f2f9ba6dc614dfa456916ca0d7fc6482b39c679cfb747a50ea1",
     "D": "b3dd7ed57aaadc348361e2501a17317352e555a333e014e8e7d71eef808ae4f8fbdf45cd19fde45038bb310d5135f520",
-    "T1": "8aae12173b9fc9032a603c9e61b0c3dfa9b8d0c4428d7acba4317aa90354ed3fff1afb720cd0e15a912eb2d7ece8037f",
+    "T1": "8890adfc78da24768d59dbfdb3f380e2793e9018b20c23e9ba05baa60f1b21456bc047a5d27049dab5dc6a94696ce711",
     "T2": "a49f953636d3651a3ae6fe45a99a2e4fec079eef3be8b8a6a4ba70885d7e028642f7224e9f451529915c88a7edc59fbe",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "0856635e1b8b8ca49e2992f8c80221398e08935824f959a821b4120cdfb5e6be"
+    "challenge": "46ae50b70ea52332dfe57f6e05c66e99f1764d8b890d121d65bfcc2984886ee0"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof003.json b/fixture_data/bls12-381-shake-256/proof/proof003.json
index 976e0ce..99384c3 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof003.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof003.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, multiple messages revealed proof",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": true
   },
@@ -42,12 +42,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof004.json b/fixture_data/bls12-381-shake-256/proof/proof004.json
index a743f70..d664696 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof004.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof004.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (different presentation header)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "011594ba7f95b3b470ea4102dd5899de3a042e5104d3ea01d15e6780d831d2be",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "different presentation header"
@@ -43,12 +43,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof005.json b/fixture_data/bls12-381-shake-256/proof/proof005.json
index 6ab537f..43ddedb 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof005.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof005.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (wrong public key)",
   "signerPublicKey": "b24c723803f84e210f7a95f6265c5cbfa4ecc51488bf7acf24b921807801c0798b725b9a2dcfa29953efcdfef03328720196c78b2e613727fd6e085302a0cc2d8d7e1d820cf1d36b20e79eee78c13a1a5da51a298f1aef86f07bc33388f089d8",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "wrong public key"
@@ -43,12 +43,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof006.json b/fixture_data/bls12-381-shake-256/proof/proof006.json
index dfc25fb..68c03b5 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof006.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof006.json
@@ -1,11 +1,11 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (modified messages)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
-    "0594ed88674a5a49a70925b531019141e2ce0faad28c082c2c911863066c0c0346e7c753e248e44f31267d035d5b898ad1527472d15452da2079d36c66c8f41eb833a34c17b7df4eaa34784cca67cbbeacc74e40edfbdb107320e36ab172ff9394009276",
+    "b3e4043a1e148028b85dfbf39d1e44d7bfc8277fd310aeda5deb4a6eb7b3d1293c86788288e86b1819caa0b11a4f2c6330abda72b1bcb082d660dc78b5271f6a047bb96c250f2ca877cc72464d363c3bd0bfc4d4b4de7233419234e94f16ec24359e13b6",
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
     "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
     "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "modified messages"
@@ -43,12 +43,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof007.json b/fixture_data/bls12-381-shake-256/proof/proof007.json
index 4454787..60ed2e0 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof007.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof007.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (extra message un-revealed in proof)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -24,7 +24,7 @@
     6,
     9
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "extra message un-revealed in proof"
@@ -45,12 +45,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof008.json b/fixture_data/bls12-381-shake-256/proof/proof008.json
index f8158cc..af4916a 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof008.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof008.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (extra message invalid message un-revealed in proof)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -24,7 +24,7 @@
     6,
     9
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "extra message invalid message un-revealed in proof"
@@ -45,12 +45,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof009.json b/fixture_data/bls12-381-shake-256/proof/proof009.json
index 2289114..3e33a95 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof009.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof009.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (missing message revealed in proof)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -20,7 +20,7 @@
     2,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "missing message revealed in proof"
@@ -41,12 +41,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof010.json b/fixture_data/bls12-381-shake-256/proof/proof010.json
index 188e455..96499ab 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof010.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof010.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (re-ordered messages)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "re-ordered messages"
@@ -43,12 +43,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof011.json b/fixture_data/bls12-381-shake-256/proof/proof011.json
index e4de07e..dc3623e 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof011.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof011.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (extra valid message, modified total message count)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -24,7 +24,7 @@
     6,
     9
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "extra valid message, modified total message count"
@@ -45,12 +45,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof012.json b/fixture_data/bls12-381-shake-256/proof/proof012.json
index b65abb6..996f597 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof012.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof012.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (truncated proof, one less undisclosed message)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b24",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d1",
   "result": {
     "valid": false,
     "reason": "truncated proof, one less undisclosed message"
@@ -43,12 +43,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof013.json b/fixture_data/bls12-381-shake-256/proof/proof013.json
index 0dd500d..4e310e6 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof013.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof013.json
@@ -1,7 +1,7 @@
 {
   "caseName": "invalid multi-message signature, all messages revealed proof (different header)",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "ffeeddccbbaa00998877665544332211",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af36ac442df87545e0e8303260a97a0d251de15fc1447b82fff6b47ffb0ff94022869b315dc48c9302523b2715ddec9f56975a0892f5f3aeed3203c29c7a03cfc79187eef45f72b7c5bf0d4fc852adcc7528c05b0ba9554f2eb9b39c168a4dd6bdc3ac603ce14856184f6d713139f9d3930efcc9842e724517dbccff6912088b399447ff786e2f9db8b1061cc89a1636ba9282344729bcd19228ccde2318286c5a115baaf317b48341ac7906c6cc957f94b060351563907dca7f598a4cbdaeab26c4a4fcb6aa7ff6fd999c5f9bc0c9a9b0e4f4a3301de901a6c68b174ed24ccf5cd0cac6726766c91aded6947c4b446a9dfc8ec0aa11ec9ddda57dcc22c554a83a25471be93ae69ad9234b1fc3d133550d7ff570a4bc6555cd0bf23ee1b2a994b2434ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af356dd39bf8bcbfd41bf95d913f4c9b2979e1ed2ca10ac7e881bb6a271722549681e398d29e9ba4eac8848b168eddd5e4acec7df4103e2ed165e6e32edc80f0a3b28c36fb39ca19b4b8acee570deadba2da9ec20d1f236b571e0d4c2ea3b826fe924175ed4dfffbf18a9cfa98546c241efb9164c444d970e8c89849bc8601e96cf228fdefe38ab3b7e289cac859e68d9cbb0e648faf692b27df5ff6539c30da17e5444a65143de02ca64cee7b0823be65865cdc310be038ec6b594b99280072ae067bad1117b0ff3201a5506a8533b925c7ffae9cdb64558857db0ac5f5e0f18e750ae77ec9cf35263474fef3f78138c7a1ef5cfbc878975458239824fad3ce05326ba3969b1f5451bd82bd1f8075f3d32ece2d61d89a064ab4804c3c892d651d11bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558",
   "result": {
     "valid": false,
     "reason": "different header"
@@ -43,12 +43,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "34ea222bc221ba1615adc53b47ba99fc5a66495585d4c86f1f0aecb18df802b8"
+    "challenge": "1bc325464a71cd7aacc2d956a811aaff13ea4c35cef7842b656e8ba4758e7558"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof014.json b/fixture_data/bls12-381-shake-256/proof/proof014.json
index ffa702a..8a636f9 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof014.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof014.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, multiple messages revealed proof, no header",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "abfa513cdb323e47214b7c182fb623197a0681b753f897545a73d82ee133a8ecf69db9aa09fe425df4e7687d99d779db5c66199c0dc9d2a442d331c43f56e060edc69a69ed2f13de3813b98ce6b05737",
+  "signature": "88beeb970f803160d3058eacde505207c576a8c9e4e5dc7c5249cbcf2a046c15f8df047031eef3436e04b779d92a9cdb1fe4c6cc035ba1634f1740f9dd49816d3ca745ecbe39f655ea61fb700137fded",
   "header": "",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "ada2a57ae3d869255d1533f74317b131ad4f0f24cae413ac40028d70f0cf0372b503ff6e705220532727002b8958ebf987e2e8378984afe3214511b9feeee830ffe3121ed005d2c382c04e6db37b646bc2f7002f3699648570fe9b67a0a5aac995644ee738810772d90c1033f1dfe45c0b1b453d131170aafa8a99f812f3b90a5d1d9e6bd05a4dee6a50dd277ffc646f6b676faadceff172a0002325e7f22f47ed9b5125f30dd5fffe9ed1dc99dc283100cb702fa63aaef1bd1f530a5368ca4c7e78a01c7fcc3563b25c6c10c0e063092cbe2590fdfcc7b6a2859e482796f1f6783a41dfdf133ce28d13071b77cbe7fe06bf6e138bd3323e7edc4a6ec9942bfa0b6d1287836e2b1c2db84833d8325d145e6d2a3e94ddd5b6f58c1d1b2a15a854f7cf46711239ebe522bf5e428131e31e2f5f322eba2399fa7a8efec4be722dcaf6ec6adaf84af72c3d7690072d07928045327f3a6587102b066fb9cf96b27aca7f5698a2ec66d04efa05ed57fd6ac27636322c013a168100b733269e9bd6f23d7562affebafc3d9b3c5f54a0c57216b733f8ecb24dc292c17e18b6b8e0f3b8303dfaedee84fba02d491994b95f965deb3c1295545bb9802d98449d98d1af18e9c60536146cfa7aa267bd888b25552dd2",
+  "proof": "8ac336eea1d278656372d9914483c3d3b3069dfa4a7862293ac021dfeeebca93cadd7eb2b818f7b89719cdeffa5aa85989a7d691be11b1929a2bf089bfe9f2adc2c06788edc30585546efb74877f34ad91f0d6923b4ed7a53c49051dda8d056a95644ee738810772d90c1033f1dfe45c0b1b453d131170aafa8a99f812f3b90a5d1d9e6bd05a4dee6a50dd277ffc646f2429372f3ad9d5946ffeb53f24d41ffcc83c32cbb68afc9b6e0b64eebd24c69c6a7bd3bca8a6394ed8ae315abd555a6996f34d9da7680447947b3f35f54c38b562e990ee4d17a21569af4fc02f2991e6db78cc32d3ef9f6069fc5c2d47c8d8ff116dfb8a59641641961b854427f67649df14ab6e63f2d0d2a0cba2b2e1e835d20cd45e41f274532e9d50f31a690e5fef1c1456b65c668b80d8ec17b09bd5fb3b2c4edd6d6f5f790a5d6da22eb9a1aa2196d1a607f3c753813ba2bc6ece15d35263218fc7667c5f0fabfffe74745a8000e0415c8dafd5654ce6850ac2c6485d02433fdaebd9993f8b86a2eebb3beb10b4cc7735330384a3f4dfd4d5b21998ad0227b37e736cf9c144a0386f28cccf27a01e50aab45dda8275eb877728e77d2055309dba8c6604e7cff0d2c46ce6026b8e232c192955f909da6e47c2130c7e3f4f",
   "result": {
     "valid": true
   },
@@ -42,12 +42,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "ada2a57ae3d869255d1533f74317b131ad4f0f24cae413ac40028d70f0cf0372b503ff6e705220532727002b8958ebf9",
-    "B_bar": "87e2e8378984afe3214511b9feeee830ffe3121ed005d2c382c04e6db37b646bc2f7002f3699648570fe9b67a0a5aac9",
+    "A_bar": "8ac336eea1d278656372d9914483c3d3b3069dfa4a7862293ac021dfeeebca93cadd7eb2b818f7b89719cdeffa5aa859",
+    "B_bar": "89a7d691be11b1929a2bf089bfe9f2adc2c06788edc30585546efb74877f34ad91f0d6923b4ed7a53c49051dda8d056a",
     "D": "95644ee738810772d90c1033f1dfe45c0b1b453d131170aafa8a99f812f3b90a5d1d9e6bd05a4dee6a50dd277ffc646f",
-    "T1": "913b100fcf5f9ac2d83635a31d806d01d4bd2d10adf2e90f377852eece1d9c0834db5f062d2d4d4578c54338cd923eb1",
+    "T1": "a5405cc2c5965dda18714ab35f4d4a7ae4024f388fa7a5ba71202d4455b50b316ec37b360659e3012234562fa8989980",
     "T2": "9827a40454cdc90a70e9c927f097019dbdd84768babb10ebcb460c2d918e1ce1c0512bf2cc49ed7ec476dfcde7a6a10c",
     "domain": "333d8686761cff65a3a2ef20bfa217d37bdf19105e87c210e9ce64ea1210a157",
-    "challenge": "3c1295545bb9802d98449d98d1af18e9c60536146cfa7aa267bd888b25552dd2"
+    "challenge": "309dba8c6604e7cff0d2c46ce6026b8e232c192955f909da6e47c2130c7e3f4f"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/proof/proof015.json b/fixture_data/bls12-381-shake-256/proof/proof015.json
index aabbd75..73e5a66 100644
--- a/fixture_data/bls12-381-shake-256/proof/proof015.json
+++ b/fixture_data/bls12-381-shake-256/proof/proof015.json
@@ -1,7 +1,7 @@
 {
   "caseName": "valid multi-message signature, multiple messages revealed proof, no presentation header",
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "",
   "messages": [
@@ -22,7 +22,7 @@
     4,
     6
   ],
-  "proof": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af37286b5d6012208605b7c3fe5457936db502aa7eec43ae4a9d1bdf5f675153d521b1e587c6ddd195e80358667aae42e64754595a0d35c1d6e72f147f67f591c823e75340360615b9c0173445afe53002d4face239979f697eff7183826449d4dc285a15e0c6afec9289b0b39e0741d0c4925c090f722569b8c64e2829904a02ec1ab6340cfe999a59196bbb8da2be2a89ddd84378dba0a22533e76fd6ac14f2b52a3972b041950539c19debaf7454e6ef3b9cec23086dc26b8a104e319aa4394e4e376c133d6c00133daf2f414e1df8ebca2de0a23e6ba37663f8074b9c8f440e37459bc08a8a4a587b78b2102c81b2f48f0fa73c331f7b6f64f6d8d50f3f8cb1424626f9cf3171cdea7f8cedb7bbb5a269856b37e8ba16ba8604fb1681be22dc6b64827a8326691524b7c05ac462ec8d8eee64bc6e09df622bb974fba93a75f8",
+  "proof": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af33fda9e14ba4cc0fcad8015bce3fecc4704799bef9924ab19688fc04f760c4da35017072a3e295788eff1b0dc2311bb199c186f86ea0540379d5a2ac8b7bd02d22487f2acc0e299115e16097b970badea802752a6fcb56cfbbcc2569916a8d3fe6d2d0fb1ae801cfc5ce056699adf23e3cd16b1fdf197deac099ab093da049a5b4451d038c71b7cc69e8390967594f6777a855c7f5d301f0f0573211ac85e2e165ea196f78c33f54092645a51341b777f0f5342301991f3da276c04b0224f7308090ae0b290d428a0570a71605a27977e7daf01d42dfbdcec252686c3060a73d81f6e151e23e3df2473b322da389f15a55cb2cd8a2bf29ef0d83d4876117735465fae956d8df56ec9eb0e4748ad3ef5587797368c51a0ccd67eb6da38602a1c2d4fd411214efc6932334ba0bcbf562626e7c0e1ae0db912c28d99f194fa3cd3a2",
   "result": {
     "valid": true
   },
@@ -42,12 +42,12 @@
         "07d7c41b02158a9c5eac212ed6d7c2cddeb8e38baea6e93e1a00b2e83e2a0995"
       ]
     },
-    "A_bar": "853f4927bd7e4998af27df65566c0a071a33a5207d1af33ef7c3be04004ac5da860f34d35c415498af32729720ca4d92",
-    "B_bar": "977bbbbd60fdc70ddbb2588878675b90815273c9eaf0caa1123fe5d0c4833fefc459d18e1dc83d669268ec702c0e16a6",
+    "A_bar": "b1f8bf99a11c39f04e2a032183c1ead12956ad322dd06799c50f20fb8cf6b0ac279210ef5a2920a7be3ec2aa0911ace7",
+    "B_bar": "b96811a98f3c1cceba4a2147ae763b3ba036f47bc21c39179f2b395e0ab1ac49017ea5b27848547bedd27be481c1dfc0",
     "D": "b73372346feb94ab16189d4c525652b8d3361bab43463700720ecfb0ee75e595ea1b13330615011050a0dfcffdb21af3",
-    "T1": "8bec86c26337655162b39f97e38ee5c0bbd2b6e8900d1d68fc4c27679dbe88dc76f313526bc800dd3209bef6b8907e95",
+    "T1": "8b497dd4dcdcf7eb58c9b43e57e06bcea3468a223ae2fc015d7a86506a952d68055e73f5a5847e58f133ea154256d0da",
     "T2": "8655584d3da1313f881f48c239384a5623d2d292f08dae7ac1d8129c19a02a89b82fa45de3f6c2c439510fce5919656f",
     "domain": "6f7ee8de30835599bb540d2cb4dd02fd0c6cf8246f14c9ee9a8463f7fd400f7b",
-    "challenge": "6b64827a8326691524b7c05ac462ec8d8eee64bc6e09df622bb974fba93a75f8"
+    "challenge": "4fd411214efc6932334ba0bcbf562626e7c0e1ae0db912c28d99f194fa3cd3a2"
   }
 }
\ No newline at end of file
diff --git a/fixture_data/bls12-381-shake-256/signature/signature001.json b/fixture_data/bls12-381-shake-256/signature/signature001.json
index 1098c09..77ace19 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature001.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature001.json
@@ -8,7 +8,7 @@
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02"
   ],
-  "signature": "98eb37fceb31115bf647f2983aef578ad895e55f7451b1add02fa738224cb89a31b148eace4d20d001be31d162c58d12574f30e68665b6403956a83b23a16f1daceacce8c5fde25d3defd52d6d5ff2e1",
+  "signature": "b9a622a4b404e6ca4c85c15739d2124a1deb16df750be202e2430e169bc27fb71c44d98e6d40792033e1c452145ada95030832c5dc778334f2f1b528eced21b0b97a12025a283d78b7136bb9825d04ef",
   "result": {
     "valid": true
   },
diff --git a/fixture_data/bls12-381-shake-256/signature/signature002.json b/fixture_data/bls12-381-shake-256/signature/signature002.json
index fbc11e8..948574f 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature002.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature002.json
@@ -8,7 +8,7 @@
   "messages": [
     ""
   ],
-  "signature": "98eb37fceb31115bf647f2983aef578ad895e55f7451b1add02fa738224cb89a31b148eace4d20d001be31d162c58d12574f30e68665b6403956a83b23a16f1daceacce8c5fde25d3defd52d6d5ff2e1",
+  "signature": "b9a622a4b404e6ca4c85c15739d2124a1deb16df750be202e2430e169bc27fb71c44d98e6d40792033e1c452145ada95030832c5dc778334f2f1b528eced21b0b97a12025a283d78b7136bb9825d04ef",
   "result": {
     "valid": false,
     "reason": "modified message"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature003.json b/fixture_data/bls12-381-shake-256/signature/signature003.json
index 428f7da..1bb7d60 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature003.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature003.json
@@ -9,7 +9,7 @@
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80"
   ],
-  "signature": "98eb37fceb31115bf647f2983aef578ad895e55f7451b1add02fa738224cb89a31b148eace4d20d001be31d162c58d12574f30e68665b6403956a83b23a16f1daceacce8c5fde25d3defd52d6d5ff2e1",
+  "signature": "b9a622a4b404e6ca4c85c15739d2124a1deb16df750be202e2430e169bc27fb71c44d98e6d40792033e1c452145ada95030832c5dc778334f2f1b528eced21b0b97a12025a283d78b7136bb9825d04ef",
   "result": {
     "valid": false,
     "reason": "extra unsigned message"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature004.json b/fixture_data/bls12-381-shake-256/signature/signature004.json
index 605e4bc..e3b3be5 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature004.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature004.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "result": {
     "valid": true
   },
diff --git a/fixture_data/bls12-381-shake-256/signature/signature005.json b/fixture_data/bls12-381-shake-256/signature/signature005.json
index b448638..f29df89 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature005.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature005.json
@@ -9,7 +9,7 @@
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80"
   ],
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "result": {
     "valid": false,
     "reason": "missing messages"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature006.json b/fixture_data/bls12-381-shake-256/signature/signature006.json
index fa13adf..02e02db 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature006.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature006.json
@@ -17,7 +17,7 @@
     "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02"
   ],
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "result": {
     "valid": false,
     "reason": "re-ordered messages"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature007.json b/fixture_data/bls12-381-shake-256/signature/signature007.json
index 5e347d8..dbb55c3 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature007.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature007.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "result": {
     "valid": false,
     "reason": "wrong public key"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature008.json b/fixture_data/bls12-381-shake-256/signature/signature008.json
index 979382f..b409db4 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature008.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature008.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "result": {
     "valid": false,
     "reason": "different header"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature009.json b/fixture_data/bls12-381-shake-256/signature/signature009.json
index d277939..fc43ec5 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature009.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature009.json
@@ -6,18 +6,18 @@
   },
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
-    "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
-    "515ae153e22aae04ad16f759e07237b4",
-    "496694774c5604ab1b2544eababcf0f53278ff50",
-    "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
+    "",
     "96012096",
+    "496694774c5604ab1b2544eababcf0f53278ff50",
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "d183ddc6e2665aa4e2f088af",
     "ac55fb33a75909ed",
-    ""
+    "d183ddc6e2665aa4e2f088af",
+    "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
+    "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
+    "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
+    "515ae153e22aae04ad16f759e07237b4"
   ],
-  "signature": "97a296c83ed3626fe254d26021c5e9a087b580f1e8bc91bb51efb04420bfdaca215fe376a0bc12440bcc52224fb33c696cca9239b9f28dcddb7bd850aae9cd1a9c3e9f3639953fe789dbba53b8f0dd6f",
+  "signature": "956a3427b1b8e3642e60e6a7990b67626811adeec7a0a6cb4f770cdd7c20cf08faabb913ac94d18e1e92832e924cb6e202912b624261fc6c59b0fea801547f67fb7d3253e1e2acbcf90ef59a6911931e",
   "result": {
     "valid": false,
     "reason": "re-ordered(randomly shuffled) messages"
diff --git a/fixture_data/bls12-381-shake-256/signature/signature010.json b/fixture_data/bls12-381-shake-256/signature/signature010.json
index 2515f64..c099757 100644
--- a/fixture_data/bls12-381-shake-256/signature/signature010.json
+++ b/fixture_data/bls12-381-shake-256/signature/signature010.json
@@ -17,7 +17,7 @@
     "96012096",
     ""
   ],
-  "signature": "abfa513cdb323e47214b7c182fb623197a0681b753f897545a73d82ee133a8ecf69db9aa09fe425df4e7687d99d779db5c66199c0dc9d2a442d331c43f56e060edc69a69ed2f13de3813b98ce6b05737",
+  "signature": "88beeb970f803160d3058eacde505207c576a8c9e4e5dc7c5249cbcf2a046c15f8df047031eef3436e04b779d92a9cdb1fe4c6cc035ba1634f1740f9dd49816d3ca745ecbe39f655ea61fb700137fded",
   "result": {
     "valid": true
   },
diff --git a/fixture_data_blind/bls12-381-sha-256/commit/commit001.json b/fixture_data_blind/bls12-381-sha-256/commit/commit001.json
index eaa239b..914d3a9 100644
--- a/fixture_data_blind/bls12-381-sha-256/commit/commit001.json
+++ b/fixture_data_blind/bls12-381-sha-256/commit/commit001.json
@@ -9,7 +9,7 @@
   },
   "committedMessages": [],
   "proverBlind": "1b6f406b17aaf92dc7deb911c7cae49756a6623b5c385b5ae6214d7e3d9597f7",
-  "commitmentWithProof": "8bd94b05cd4e006145bc974cf5cdcc80e544a8c4624b0a7f6a5509430c79be788be86536b725ea93dd0a035b4ef822631dc4e8c1a02cc212cc9f914ecfab3470901d5d1573e4d03653af76ebf3bd891a226635ac82ee6cc94bc20135471365d2bb278e21eae8e71661ecd3f6301c7ba3",
+  "commitmentWithProof": "849d3cc626720202cbc1610fc01ab41ce32099af602def0c579f37dd18b485ef60719275a036bdd8120e7e938c8e1a3d4d0322587441ccc5caf186001b45dd09ee159713c3e3ea0f411f94a5d6665546562d09c093b687a129e464a57e18cdbf5306bcabf3e7cc95f5ba98cdd9bf3768",
   "result": {
     "valid": true
   }
diff --git a/fixture_data_blind/bls12-381-sha-256/commit/commit002.json b/fixture_data_blind/bls12-381-sha-256/commit/commit002.json
index 0f3a1d7..da2ab4c 100644
--- a/fixture_data_blind/bls12-381-sha-256/commit/commit002.json
+++ b/fixture_data_blind/bls12-381-sha-256/commit/commit002.json
@@ -15,7 +15,7 @@
     ""
   ],
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "result": {
     "valid": true
   }
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof001.json b/fixture_data_blind/bls12-381-sha-256/proof/proof001.json
index 7e7ec45..9b41b10 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof001.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof001.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
@@ -41,24 +41,7 @@
     "3": "e1ca9729410dc6ba",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "2": "a75d8b634891af92282cc81a675972d1929d3149863c1fc0",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "4": "e1ca9729410dc6ba",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "7": "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "9": "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "11": "515ae153e22aae04ad16f759e07237b4",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "13": "ac55fb33a75909ed",
-    "14": "96012096",
-    "15": ""
-  },
-  "proof": "8b29fc429ae913cccb71f730fa61fd220a8ce673c6eb704106783b7e00a5fd5eb43fd06e9e76b068ab5ca6da93c0201b883bd8caf5ab4af7b3487f50c68c40a310ff3187be9eef536456ac11ca69c6bc43a96307633ee796ddb32346bb47018391f41e1c03cda63ebd5b112950aaa38b808986492873ad40cecf3b8ca9846837da824bfafd62bb8aea56938b653c7bb76b48c87dd7c7a1627d17281a4ba5a403df760ba8dc8599d383960f63a107618e5c77e27c61832dde296888c21e1acb9c6712f37dc916b91dcec2ead637eb7c926c506ddbddf2753c47b1718bc5fa49a3c1f094502b6b119e71fa0632cf64819f6ea38de039179cf6b168deb28f8792266b22d4e2403e7c8dccb23bc95a160e0f1d100fffd917533ac135507a55889223ec03952e420637681ff74d30b2e2246a",
+  "proof": "95b35609efaac8ae162df13e503761f5f3ba78b056aa00954a4705133dbf4012777c99874fa769a60d5925dd4cb8e119ae8cf6d7d53a47dd9e999d09f3ffab16b175b2be6ab7cb49dc3f10e0dc22e2222a9501fb205a73205016f45437d73bd7914f246c258c1e6f3f03245ff335f65147adecd0380ecdc7ab2ffbd24609f9376b8654b3d1b918b36a06bc03dbc09ed42a1632f03627023ccd62d613a90fc0d9b51373679f33780044072ea6abc80bda4adf187ccddecc84cb95b559273bb45afae1d9f9c4fe98463ff743c39bb7855b00e3d6c7c6d7b15089ff3e3a146507bb82a3a7c16b37af0b1148f2052832611a5d11796dbb529ad9616e7e97881e5cee8d01593e4d5c61d5d584d09090b317221a7781f0e15568b87aa39005e62896ba934f5660ab25addd1cb0e26ec08289ad",
   "result": {
     "valid": true
   },
@@ -73,12 +56,12 @@
         "6683a44c7e1b057c7ce5e99dca9d71a091441b6c23ad9bfd45ba23862f610cf7"
       ]
     },
-    "A_bar": "8b29fc429ae913cccb71f730fa61fd220a8ce673c6eb704106783b7e00a5fd5eb43fd06e9e76b068ab5ca6da93c0201b",
-    "B_bar": "883bd8caf5ab4af7b3487f50c68c40a310ff3187be9eef536456ac11ca69c6bc43a96307633ee796ddb32346bb470183",
-    "D": "91f41e1c03cda63ebd5b112950aaa38b808986492873ad40cecf3b8ca9846837da824bfafd62bb8aea56938b653c7bb7",
-    "T1": "89bd19c0b8bd63be291e6d71ee1a035e4582782c46c4f69c07fcb351592ecc680af505570a7c5f31e955fa031b30b196",
-    "T2": "8a4aecacff0b7e8f7d24289e154d0abff199f709814bc014c7782d922b05c0284c9b14827a26f9f1db2cbaa91e9a5c90",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "1d100fffd917533ac135507a55889223ec03952e420637681ff74d30b2e2246a"
+    "A_bar": "95b35609efaac8ae162df13e503761f5f3ba78b056aa00954a4705133dbf4012777c99874fa769a60d5925dd4cb8e119",
+    "B_bar": "ae8cf6d7d53a47dd9e999d09f3ffab16b175b2be6ab7cb49dc3f10e0dc22e2222a9501fb205a73205016f45437d73bd7",
+    "D": "914f246c258c1e6f3f03245ff335f65147adecd0380ecdc7ab2ffbd24609f9376b8654b3d1b918b36a06bc03dbc09ed4",
+    "T1": "8059770ad8131b0fe99597a61cc03b2054f01c7d991d0ceec3ec7f495cb1e1599f3817d0bd6762eaa3e665e778d6c0d1",
+    "T2": "b02ae25106a0a0f4c6f2236347a19001b8496bef33534db5606ba5fd9508034606e2b9d60e4139d4ac195121b063ac1b",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "1a7781f0e15568b87aa39005e62896ba934f5660ab25addd1cb0e26ec08289ad"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof002.json b/fixture_data_blind/bls12-381-sha-256/proof/proof002.json
index 0761f7f..827fb08 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof002.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof002.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
@@ -39,22 +39,7 @@
     "2": "835889a40744813a892eff9deb1edaeb",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "7": "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "9": "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "11": "515ae153e22aae04ad16f759e07237b4",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "13": "ac55fb33a75909ed",
-    "14": "96012096",
-    "15": ""
-  },
-  "proof": "91b42b089d23d096669b0cc5cfb238490eb0bd668d32d8092ac38ca526cc8daf7800ca804eb81c0ff48cf95c83669442b811a11fcd97e51603f677f11970ae060afe7e54edc8f436f9851b3a55d93694333122318f31405bc7a74bf15397994b89d091cf605c67c78231611d5fb4af9b9f34177d13fc5d6b197387d5b4098fb5da0b10f26a7235816f71d494e95ba0bf47cfc48802eb69a0ea54f165add455eca6058887e3a9b427bebb4e1c38cfd3b04e6d5d2989f81fc471b2babceab70646723f1d3fca309676d944d616d93b0dfc16453fcbf1a60200091cdf4b1ab6ce05b2d7d53c1b87f1940dd76fdd478e29ba1d6fea92b03fddab48f3a159961ec0f1e3ba48e3e91298457787514854ca7ae71554185a64ac4c9f5f95f7f160dab89a906174053dc01b6a4f4060dd289495376dff8d460e138e62343ec7af941b453025ce4ef1b5fb6855ae8f86d8027df71069f0ace60d26249dbeccd3db7bff56272695cf1d4481b95780b5bd865b0a229c",
+  "proof": "ae5d381f33044a0ea51b57c51b2519f6f1a0b47b2e5402fd5db57f2150f0e4435a20e708d39fa469187e821356316852a58a1899c19750b876585fc7840206c684d15bc4072d251997946e6b9641f48ee53dcb6372136fbd5aa85fa310a16a7eb7b2e5ebaba4fa2b3d2127799e9642a0963f976c84bd4df2f1882d64394f5e97199cdf20062ec9c3ba5c2d3b7977464817af4b34742aef6a233a54c1abc990fe547b9f087cd0bf5404b17cf5c2a0c9af62b5be415ed3bdf0b95c3ed868d79f03a4f1660e2da013fca2c237961a0a52b22044b9ed4c67edb74804d279c5533ccc599ca42d49780d9c60e013e55a77db8045c09c8b035909802a1b0d57ba47102929a04fa646ffd41b609bbcd6d2b8527d1559ba308e8872c06dc14e82c037ebcadb9889fbbc755c136a9c7d10e3048cd73c120bc0ebc3f4abbe448c7c4f515752f06e4626eacb1b48dc3c033594e3501606e23ac97b00f1bd30611ae8f5a23889d235d77a6f21405bd2e1c550421ddf45",
   "result": {
     "valid": true
   },
@@ -71,12 +56,12 @@
         "0c1ff555f2b0f53e8859aff2947b22b1ef9d2be2c65621d8f6aa3252340fcaf2"
       ]
     },
-    "A_bar": "91b42b089d23d096669b0cc5cfb238490eb0bd668d32d8092ac38ca526cc8daf7800ca804eb81c0ff48cf95c83669442",
-    "B_bar": "b811a11fcd97e51603f677f11970ae060afe7e54edc8f436f9851b3a55d93694333122318f31405bc7a74bf15397994b",
-    "D": "89d091cf605c67c78231611d5fb4af9b9f34177d13fc5d6b197387d5b4098fb5da0b10f26a7235816f71d494e95ba0bf",
-    "T1": "802a8579d430dfb6256f3ab6bac9aa6ca87a2d24586c88b6b5f2713f114f22a41ca940464b892d67599281d20b733a4f",
-    "T2": "a2edae923e082379a452a0ce552008e94ec31ac9b2e77b70a08d31bcc617bc96e787f8e0b0cefa7e0d070e5a58b63e8c",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "69f0ace60d26249dbeccd3db7bff56272695cf1d4481b95780b5bd865b0a229c"
+    "A_bar": "ae5d381f33044a0ea51b57c51b2519f6f1a0b47b2e5402fd5db57f2150f0e4435a20e708d39fa469187e821356316852",
+    "B_bar": "a58a1899c19750b876585fc7840206c684d15bc4072d251997946e6b9641f48ee53dcb6372136fbd5aa85fa310a16a7e",
+    "D": "b7b2e5ebaba4fa2b3d2127799e9642a0963f976c84bd4df2f1882d64394f5e97199cdf20062ec9c3ba5c2d3b79774648",
+    "T1": "a10c2ea9e3eb0a2cebd5fa26fcd16c81de6b0de026532f120180242bbb0e0347dfa13fc2e552178c2d7adeb12857848c",
+    "T2": "a460971a2795085af0c5e130da6ba9dcdf4829d7803ae66205bbd6411fc49fa9b7a2e4376ce08c6bab0df5d6e331f036",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "06e23ac97b00f1bd30611ae8f5a23889d235d77a6f21405bd2e1c550421ddf45"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof003.json b/fixture_data_blind/bls12-381-sha-256/proof/proof003.json
index 530f356..3a7d9df 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof003.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof003.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
@@ -36,19 +36,7 @@
     "3": "e1ca9729410dc6ba",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "2": "a75d8b634891af92282cc81a675972d1929d3149863c1fc0",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "4": "e1ca9729410dc6ba",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "14": "96012096"
-  },
-  "proof": "97154dab37939b7b94dc0b3e699c248fc2511e9e246c8ba1ef82777a293588c4a80d24539c547b059b9e2a8e5b94dac78ed7c60601ce7843cc18a7119927cc109dc152152d3131d10bd04b140127ec7d5c6a631665e58850b847ea221ac9e1a3b549e5bc46d81c842c65b32c533e0222aafbbee4e7009cea9f03c5840332295c4e58620cfe666706363c190e1398d4190c6556cfc9ddf20c0f62ecd18c2d24678655f33312a2677f01a75894fc8977c01fa19d20f9771f4a3ca6f6e6c0ba00b085bc9264c1f343e0509f1f44bf8a2ff624c45dd583626002101db0b053f9e3a162b1abd6b1dae6683ceaa3c0e4ea696256260ea1eca9712c353fc3266d156a8f53b1911ee2fb54d0ac9e47cb4d6d20e93d42e3c80d6954565ba2e84a48141858ce9c2f9499b4065c5206ac8ea70ed1bc21b5e9cf868a8bf94f4f617d316562b2ebefbcfd3825975013c834babea0fbc662407c6d35185e29d86f9518bb1cd530c97a9f0c49ad26b20add7ddd8eb2166b3bff20c58d47fa72d04d12bde322ca29aaeb07936a82655529d26f360a5b18015ddb3ea266abf629e3e4c7e86425c90f481078b1b111410078fff5909b30b5cf641301a24e923b5958950fd24c2d32cce7860a5c7e6c733c503da28eebff28c7",
+  "proof": "b912110a83e3645dfa2de4a569808b8e2088281f45a00429aa0c4a8dcbae13a421f566d41f8b48d0bfdc6970d911a16886b87ccc69107bd0ec54690d415dd3f2e07899a737951930375d55c76e14b394536c3b8555393841de0c5227bebbbf00935ce099219dd4f67defcb6e3ba5f428ba4ebcc1995eab806f3b68d484da677f881d15c9e76f331b693a89de7846894125daf42ee6ca3dd6f3aa4d453d601d63e8f09b0d4b786f98206a513d3bd184004d8d9ee801d78eb56332ea6289c91d70cf928c8c2fa760d38179616a7fb4a35d524b30f368e7ee5061dc191deb261dee18163812605a5e666ebad0609191a00166711b74fe54eb45afc41649d4f06a336f30aa2a0f5d5dc80eb66bd4915c00fa417187306abf8d5ee20603f5c9dd6d31cb120b4a95ac1e3eb32558e5e6aece931b94d532d7d7d5c5ca9f2b8239d127fba284ff9fb0e091c1d7dba7f928dd497f6f42a2f9a9f12cdbb50b62fa79aad28266ccb04378fa6c0f0a580846d6ce1e264ef96b46bb2c34110301e545933e51e4eba9d5092e3b158d8a412e52c3b260532173174c4ca43191bdb8a8d97225c074c0f0799a724deeab447f101ccaed1df50b08901d5522b3ec561e4c4dbda9f257b8dfa584efb6d6ed437bd6c8bd80aa59",
   "result": {
     "valid": true
   },
@@ -68,12 +56,12 @@
         "279717a2b1e1d34cccfddfe9c8e3729f6e92e28197a09459c6dcd56e3920a0d7"
       ]
     },
-    "A_bar": "97154dab37939b7b94dc0b3e699c248fc2511e9e246c8ba1ef82777a293588c4a80d24539c547b059b9e2a8e5b94dac7",
-    "B_bar": "8ed7c60601ce7843cc18a7119927cc109dc152152d3131d10bd04b140127ec7d5c6a631665e58850b847ea221ac9e1a3",
-    "D": "b549e5bc46d81c842c65b32c533e0222aafbbee4e7009cea9f03c5840332295c4e58620cfe666706363c190e1398d419",
-    "T1": "825523bddbdaa2a3bd3b7ec869c6287807e1a585d611400805be9f96f1d3f02fe650a5406e27da815f8ca938f0d75e8f",
-    "T2": "8e9f246ed76f512b974ee52512e32b2b347da58ad0c0a881d4d40d62d3323443fe911387fdc22e0fc8af6e01115ce97c",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "641301a24e923b5958950fd24c2d32cce7860a5c7e6c733c503da28eebff28c7"
+    "A_bar": "b912110a83e3645dfa2de4a569808b8e2088281f45a00429aa0c4a8dcbae13a421f566d41f8b48d0bfdc6970d911a168",
+    "B_bar": "86b87ccc69107bd0ec54690d415dd3f2e07899a737951930375d55c76e14b394536c3b8555393841de0c5227bebbbf00",
+    "D": "935ce099219dd4f67defcb6e3ba5f428ba4ebcc1995eab806f3b68d484da677f881d15c9e76f331b693a89de78468941",
+    "T1": "b07dbac9dc86fd07e135a432241ada37eac859d949190ef793e2cdb8b29069ca39dc40aff3334761ceb4fe4e24b5731e",
+    "T2": "a57ff147c6d214cc11b7ffcb867705d9f708225bf4be56e057b42c75bcbe682701fc29038c9925819779d2b2fec6adf2",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "0b08901d5522b3ec561e4c4dbda9f257b8dfa584efb6d6ed437bd6c8bd80aa59"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof004.json b/fixture_data_blind/bls12-381-sha-256/proof/proof004.json
index 26b648a..038c7e6 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof004.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof004.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
@@ -34,17 +34,7 @@
     "2": "835889a40744813a892eff9deb1edaeb",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "14": "96012096"
-  },
-  "proof": "86511a727d3930032106cbabd68480c8893cac0698ce156ff7060eb3a9a0d0578e9c80b3a248948ece27c871b281ca9da29e15b5e254a4ce4df998a3b83ec8daee50a35867fc4a545b550718b24385c086c8ce95fb569b9d5b08afc1a63d6a3eb89b61dbac567a7ccfd9fb1462e806170dd885b719b64690025989b696cc50ca7aa625f373f7f3ddb99a01cdc3f1e2442663dc0600cb09ab26066b933f3a6a82f214309be31cc02362bb548e5eef4a04669197a372cb6937a00450c115675d3e026a33af2ec80705a7517995a22661d21c9e4c0b464e798eca920330104a4c760074342f38b0372a70473904086465606803d9dc77606cf00c3832b534de13653f33a4723045bee32990a553c5e1d0ce70190e8e458a33ec62fe9b3424e46bf77fe26a2969b74f5a242c4697a286f15057226bd9ab05335e6b24584bd477179e7623e3b6047c26c1b8e57dace080e114110d126537d9dc2eeb4ec611083a79bce67c29696700f66f86ad4bcb6875d2f664098709700baf0beead805f9f374a178edea6172a315f4d38aa02271afdd0f55f580b870d6a813b4e5b7bc0530dace5dc600bdfd1134986e5aaff4108a608865a196f610cbc40385773bdb5dead610078adcd4bc4fe2c83f28c355429982d2570269168d71f46d499e124dbadf5f61456cb969b2814b00f61bc87e5cb166e7c40163f0c0124d1bffc9941c3e805d37b1a7cffd15f39ca98e145a9c62158ac11",
+  "proof": "8c351e989532f6b0e9c4992d7696c73c49a2e70bbb166fb71f2ff8face46383725c9f4667cc22da193830fdd0dba8676b0fa5b9366b8005cbf6835c425a87e3cce620572d609519943855ed39a67943a71bd4f37726c78451fe2f1a9772a31a389bb30d3c88ad5603db31249880fa3288af95f6767907d1f80590f0049637e56444c46ddd967866df8db33abae2fcbac1594a8282dbf0bc1ac912cde52643977554c57fbbbd154081093de13f10097e4707b62b4d69617df3635def324b9fb5e7609a21c73f1076df97f50a7affe23bc1afdafde9b826b94db01d5ea99a70a576a5295af627bd44e62141305bef9c076546469d1cda2bde227cea9bf01fcde7cfb1b69701cb332aba22214bf0f5cbd2a32a9e8f694a2168157407d10cfd99b9f78e928c3f0d9f2946ada6bcdf1d1a60717dbdee1cb372a80bfedb3d517b6814d1e41e65bf34b1f947623db7752fd86c33e419498717f964e2570672b781266b59acb7b67bf6b104f0735ab9f10b23604166b47d6d398d3433a7760bdc9c14e4c96f0008d61f8f522d0107b7eec8633260de697afa05733d0e71beca9fd9843139a9920c78e3efde8f837125f1ef3a2342502e26d8f53622496b7a96ca5126c9f8db04ef7dd1d631cc91358cabd54027624aa2141fb9043ce3a5f9225f0ab3437ddf4c014e2abbf665b9cef75ef1e90ca47d6c72943e03023c946387c005e3822febfcafffa3c9c69a4f23b449c957825",
   "result": {
     "valid": true
   },
@@ -66,12 +56,12 @@
         "4c583e5e4fc913aa71989afc50cfd8c2024d64df96ed12c7ef82d50ed4d8bb1b"
       ]
     },
-    "A_bar": "86511a727d3930032106cbabd68480c8893cac0698ce156ff7060eb3a9a0d0578e9c80b3a248948ece27c871b281ca9d",
-    "B_bar": "a29e15b5e254a4ce4df998a3b83ec8daee50a35867fc4a545b550718b24385c086c8ce95fb569b9d5b08afc1a63d6a3e",
-    "D": "b89b61dbac567a7ccfd9fb1462e806170dd885b719b64690025989b696cc50ca7aa625f373f7f3ddb99a01cdc3f1e244",
-    "T1": "af17d9d3db5a0dc69ac9bb0af43c1634202e2b6bd82cb92f8547ed9084453da96d3b660d3ec69c0ea7684cb339711aa6",
-    "T2": "95b4d41cf08975b312fe3dc1c74fe474b7ae1c71d62d061a3f52ec366d1879d550d251ac1b229978203ca627e41602d6",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "40163f0c0124d1bffc9941c3e805d37b1a7cffd15f39ca98e145a9c62158ac11"
+    "A_bar": "8c351e989532f6b0e9c4992d7696c73c49a2e70bbb166fb71f2ff8face46383725c9f4667cc22da193830fdd0dba8676",
+    "B_bar": "b0fa5b9366b8005cbf6835c425a87e3cce620572d609519943855ed39a67943a71bd4f37726c78451fe2f1a9772a31a3",
+    "D": "89bb30d3c88ad5603db31249880fa3288af95f6767907d1f80590f0049637e56444c46ddd967866df8db33abae2fcbac",
+    "T1": "9075ca64308e91b8f1b16eddb698304111442267f9b15948ad9b82c79594f6e1b9eb2a0fb0cd2618adaca274e0ca3e2d",
+    "T2": "8d5a33789b00e275f30b6c5cf3d9820b2b259a1269856b1c4af78856938d54120a97d6634c909e616ecb7f173cfdbd11",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "47d6c72943e03023c946387c005e3822febfcafffa3c9c69a4f23b449c957825"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof005.json b/fixture_data_blind/bls12-381-sha-256/proof/proof005.json
index 157e3c7..c0392e3 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof005.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof005.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
@@ -30,14 +30,7 @@
     "8": "96012096"
   },
   "revealedCommittedMessages": {},
-  "disclosedData": {
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "14": "96012096"
-  },
-  "proof": "a3e58b26112de65d6e6bbeaa662ccad8a2222fabc49fb792fef994681e5424e795e8556d565efd94048507701b7182f782f8697e748f3fa9a75bb87b44bebaa16c730d97453f91db189851ad5695c02741b245ce212cf5b86fe83c6cf6f6d0d1937c9ec0e1f8fea1bd6b259ad52c28bdf3b6f8990804037d096030786dd4609c1c729e0b29286ec2cd53470bc202128814b9ac512da494b0bead3c7d345e3f8aa557db59404bf2e7d9409c9c9a412c4b5fc92c9ba3dd9b2198905879f13ba2090bfac0a78faf7ce19174bfb16266c9383f5e12dd1456b533d7878c7bb2813174df9bbe7b3ece410e4a8890d9fe7775f410e48d35b0e0e656c6ada9176ec8a41bdac4b4d6031410078b2a5a8e8f90cdc430e551c1a94b5353d071cf945ae03d204f347905e167340bfe6f42a566b7cc793cd692ba74a2442aa95c967976d734714e17a98c50f067da5c0c2cfef91100ef6c97e9ebabfad141878c73af82d6a3b36d25baf0e72b7391baef0f220d73c6442c09915de3ed89717d19e5375684f03efb1c8eb65db1049446b420c2c682855703f84f5781cd0bcf944d6c13e883ea03365311256b918e1279067b42cccd99f902a69db49e53c1df89b13cd9ab98c90dfbb1f6ac7a3645505fa04d593dca5f1703ef8b71b78aa134ce1a8e819ba6dd5caac56909870d7eb948b903c7e0d977444df59a158af54eaa3779c575436186fa6804cbe16397ef3759e35f254eda037e237c6a506319becda29e32cad64a3a941209e92ea9d7e55dd5cf6c7d25747990675eb271b8aa0d3a38111a9ee488f849188e2b7cce5355d79ae2b4e8b1d055583b62cd581bb9b6a4c31b194408959d06d1995f2094f27943d29e819a52bb91ed",
+  "proof": "b3d9360a36d11dcbb895fa10e733036e7f9f71a86f0adf35f2bfb4feafe8a39fe07732d05d794fa5e9f20a84b1529c5ca2ce37c3e30aaa1d40ddf00924e52e4c205183624538e3229a91661e6a69804c635f169a3f13f2fd7ea20f54bd6160948e19db59bba448ac3d7a6603af3b3849b5e2ac73f33cab2cce5261c4539b4f6e5a1038f17dae24bb20cb084d0229e377532380d9d041d30275ac35ca8f0c85ed2030d7a7a087740fb17a3b726d09bbd56567d56a51ad0a647bc9cacd891c18f07e511186992b900e0191e9867b5b15045cbcfe57243ff74a7ba4ee8941240248e6f79990f81cfc98ac88b90180de294049b55c70bf72af1283aa8d64be6ec351bb3f43121f61ac1783253a9905d6b53530513c09315bdd04aad5643699f68bd177e0c8525f4c725db1677b0046f84bbc29fc2d8170a012c531b4fd957f3f2fdd98820658b0e631eb4bb537895b0c6d6669c8e8c880df40bfea0a8cfe8434a90e8efd9e8e474e31a91862580630de574001fd07e404bc9b8a807cfa03f8bb03920d4535abed66b26bd16b6882a91c3147098d53c09f8f7dede107a6bdab8f67c5369fc56eb5f2bf90a3cb8ce555ac5c4b641f39867778f6d5e27178618091d2a2319d5a91db12da0b897782775860f7b03eecd5a7770681d348acf245d0d4c272fdb67358042bfade36b1c76640f05fda382b795690f6b279b00add5e7be48c5e606e23d1829d1f72391249023671e37d0cff4e7317d5a1b60542f04d06db8d273cafea3320a04c3c9f8690ab57ea80b7274c8ba8cd00012cf79abb154f66d63d3172c37870603e428843c5249c6c3f0e17f2679ebfa99e4d2f7a873a9f59b0e51417d91242331e1fee078cb55c65d4cc",
   "result": {
     "valid": true
   },
@@ -62,12 +55,12 @@
         "496c5273ff17a2219473e75c203a4ee1210d43a3f31bbf18dbd262862e073bea"
       ]
     },
-    "A_bar": "a3e58b26112de65d6e6bbeaa662ccad8a2222fabc49fb792fef994681e5424e795e8556d565efd94048507701b7182f7",
-    "B_bar": "82f8697e748f3fa9a75bb87b44bebaa16c730d97453f91db189851ad5695c02741b245ce212cf5b86fe83c6cf6f6d0d1",
-    "D": "937c9ec0e1f8fea1bd6b259ad52c28bdf3b6f8990804037d096030786dd4609c1c729e0b29286ec2cd53470bc2021288",
-    "T1": "a74e62b1b62be055210ca1873779df176bf1dedc71f7afd872832c9175778829ca93bfb8cde254faca98a6eeb801b0f4",
-    "T2": "af369820104576933b3f8741a5c2253b629200f2528522ffe5f602d18f1999d7d67bbb1e75367d65e050815a8153b2bc",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "3b62cd581bb9b6a4c31b194408959d06d1995f2094f27943d29e819a52bb91ed"
+    "A_bar": "b3d9360a36d11dcbb895fa10e733036e7f9f71a86f0adf35f2bfb4feafe8a39fe07732d05d794fa5e9f20a84b1529c5c",
+    "B_bar": "a2ce37c3e30aaa1d40ddf00924e52e4c205183624538e3229a91661e6a69804c635f169a3f13f2fd7ea20f54bd616094",
+    "D": "8e19db59bba448ac3d7a6603af3b3849b5e2ac73f33cab2cce5261c4539b4f6e5a1038f17dae24bb20cb084d0229e377",
+    "T1": "8d10a24de14f9fca79d959122f8002df7ec6c3d35f6fee46fbd0cb8f583afb1fc5b6c9297b66ce1a27e80323cce19371",
+    "T2": "8bef0e49dbfe055d5269ace37eb5922638d93d6bbeb731b990ad7c175a40da1304b7f3696a40f650953853e5e7492ab4",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "17f2679ebfa99e4d2f7a873a9f59b0e51417d91242331e1fee078cb55c65d4cc"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof006.json b/fixture_data_blind/bls12-381-sha-256/proof/proof006.json
index a63cd67..ec6f96b 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof006.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof006.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
@@ -28,12 +28,7 @@
     "2": "835889a40744813a892eff9deb1edaeb",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "5": ""
-  },
-  "proof": "b3c858ca8b1193a759acfcbc985345103384565e42b5523443031879f2bc757a1714c442882801146e7e1222b8c72fa59195d7791d8f1c1f5b8e0aca00929f64abbce082b0667c1e98aff024a66351da986aa15a598170510397d783eb90192fb3c7144b00468715699f049b547b8e49d66e2ddd29a19ebc84cc7e1c75f5449310e4a711decd25a4d85cbe3bbc18fa613fe26826949a6f966ad2a1f6665a8921af9f48bd73adc8cd7902d6c85822f2553ee684f9aec8d4f41d2d3cae7ef0ddfb0887132a8a178bcfa2ea5da363a37507194f79c59607954dd766af7523ffa56e247ba9c7dbfdc99b01a42513404fa16f38940feb9a940bb54f08206bbb246e809bf0a942d6d52ddd5395bf5c2ee4a134295858716ba66da7af44b63c3d9bca66f01c427490146638cdbd5013f5be295c276045daefca9da13c3ef5459523fac4bbb7e6eee29e894d4a6142617a7dac1c690e2ca6a24c10a0da44251c2229b469905f81312f3edbe00421e3b69ed1763a05e6102a2c85fdd20680070f360e8cfa50e8db780b80a721f86594e3b0df74ac31b6aec65f245592a581a78a0cbeb8fffa5ca3dd2f0f136f27267d5e4db625ba5a1b1b4a4dde9fb74f80e1a1a7140a21f6850092bcd525586f41eb110309754d3b6a2c11577e3327dc9553de5ec80203d34c9541fb603e442af297cfebef0a6c12500ae60103717bdc2dbced805552d7569bae9d6d45a984c08437b6d9135ab55c97b31abe6f3815021308a4b2393f45b0446a6e2317aa0f1b3de4ffc7703d5f5178d55210bdc14faa57a8900b31684719db9d68724a5b7453e88329ac36e01906799a42e2f4e2720996ace5a946051ac5c8a053b68178e38dcb285fc7dacf5207714880e95c0c0136da4a1a33f229830f805cee393b3e58d88a4abd6e5b8c6c5cf8d534c85b01892816cc55b0511a581756c6b575773be5381be1a3f17fb493",
+  "proof": "ad668f95a4be5360e4f2f8ec1ad4b00f063b789f3b5329ccd2d99c977aad877e3c36eb36a1eee6de485017293453513c8aa711894f40c925c0fd346f2d3504cf143dafeefb1b80537868c0bd6805f890d61d2a35b498f397602ec2fd2716f2778edb30bee705086a460dc2a2e9fb566cc5b3196ddc90ecf1e948ecc37befeff39e978b0a4dc5f08e44351c6fd877dbf91a1afa6574a212cfa01d16659e0b1229aa8d8f03d6b2dbb64b8d8153a6eb48bd53b9afcccd3e0acdeb20827f2b7a25b08fe8e1667cad177c4aef6c465c4defa71d4cb70e106a7fc9b1f2fafe44eb3c268714e4b43bfa7f944b2786830c4e6b743a4bd51a695da6228dc6f9d942fd823536e54f80e42604e4ee7a270c43e26be343560e9f8021eb34ed8adfb54f9f7e4d1b4803696653e0292894d2047b75a86339e6238472556c4d896adcf4f2170a41afa41abec1aa98d912458db314d112714792ed6c037ac8486a734580d1b89e60b371357fbf00bad30b911d330b7b544653a91c34a2bd8310849af199a591066e6ae586e14b58ca7b5d0e6cdb6c020006693fbe9acc66513544eb56fdb3d1fd83a0b8277cdd9d2bf1ef810e19ff569c4224b6f9de5c73062aa974506f8e6a54f3e5a1cbb889b0ae22e72207fae79e83103af70d3d88599f9c6197cad13804a4fd2986e7e113e75cf4774df86270bb249c245c6a2bf5f5a9971f076321e9c472a8382d206dbadbf7f86362a6908005ad3920d132dfc49c4a95ff2ca2b6c69d433338bb5046ade2d17cd18f95c4f1e448341eebf78bc73aec7f5f5a547eb9953663afb4aab2b82f9dd4ed2fc45bbb1f14bf35173f0117c7751ce7c374d556fb528995ad82385144a524514233cc841746e21ebfed48bcda634985b63facc07b4534679015c8d622fb8cf3795ab5e709b74421c2f3626751b1f833dcd77252a3b0bd09cd22d0c594eb61aecef46aa27f2476",
   "result": {
     "valid": true
   },
@@ -60,12 +55,12 @@
         "31dad9cf8ab3482296a766c4c6e2a97b2ad9e83cf8c83755940736235bea6e0e"
       ]
     },
-    "A_bar": "b3c858ca8b1193a759acfcbc985345103384565e42b5523443031879f2bc757a1714c442882801146e7e1222b8c72fa5",
-    "B_bar": "9195d7791d8f1c1f5b8e0aca00929f64abbce082b0667c1e98aff024a66351da986aa15a598170510397d783eb90192f",
-    "D": "b3c7144b00468715699f049b547b8e49d66e2ddd29a19ebc84cc7e1c75f5449310e4a711decd25a4d85cbe3bbc18fa61",
-    "T1": "a7cc44212d02317c8e185a6d55eb311daa108ba6150fbab4198a2026cc27b8970530b9e3b1964f1ed6bae468a73b8640",
-    "T2": "b9c9fcd27848b714a9d520daae856c93d1e560ae865040fe3a16e1055a83b7149685518faf4acd0a5f41892707962377",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "5cf8d534c85b01892816cc55b0511a581756c6b575773be5381be1a3f17fb493"
+    "A_bar": "ad668f95a4be5360e4f2f8ec1ad4b00f063b789f3b5329ccd2d99c977aad877e3c36eb36a1eee6de485017293453513c",
+    "B_bar": "8aa711894f40c925c0fd346f2d3504cf143dafeefb1b80537868c0bd6805f890d61d2a35b498f397602ec2fd2716f277",
+    "D": "8edb30bee705086a460dc2a2e9fb566cc5b3196ddc90ecf1e948ecc37befeff39e978b0a4dc5f08e44351c6fd877dbf9",
+    "T1": "97ac4963e423f412385fa1df0bba2052266d3ccf17af3b44e3c417985588569f5233920aab5a62522e972845b0f59246",
+    "T2": "a928b145aba19ea736d34e1267c37a05142ec49fea44752d7c113330d17f8f91e56875766107a954a38903187fea2271",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "21c2f3626751b1f833dcd77252a3b0bd09cd22d0c594eb61aecef46aa27f2476"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof007.json b/fixture_data_blind/bls12-381-sha-256/proof/proof007.json
index 118d01a..8c1c924 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof007.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof007.json
@@ -16,16 +16,15 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "revealedMessages": {},
   "revealedCommittedMessages": {},
-  "disclosedData": {},
-  "proof": "83ca9b4dc4a514497c22f78274a1d53414e5e5bc325f6c606386e033140416dc306e6f97d4167f57afceb5ad9eb69f51a9573227b8f384a7835808d9285a1c3a2baabef4c96f73be3077d8d11b045287e30642de975eda73b60f8ec4f56a1211b0e88764a49abae79d2e09286c7656fa49c7ec2881da9baf1bda300bf512d7e112d7ec04d478c5781ae7aa1d47f6abdb58d4f5c93d408491e274c9db8226e677a75f0d3c48c3ce143293b2f3ec21c56b715c3d199a6a334ab3a01a54caa670079ec782004d61f10dd73f6d364122b9a33340bf2d3f20fb1488b240184b62cfd6b016ca48fc4c0defdbd696ed26b010cc21f70c9b7d5a80889c5be0a23338f3f2facbe7867bdafd257dedd76eef3854095c687f57944aa01b035330ea8686965d12df901100b7f11c0ef689983171efd12e05a135fea22212ecb1fcd12f6b5cffbea5480f989cf24453d4eab9f088d6225597be7331449718cddf19ef02f641ffb10263f93e79031bcabae5780c886fef2fcfe2d6c0313f909719c0aaebf8d81004af6fff71bff0af2caa0f020ac9520a13e2b58a2d8064e3ad2697ddc4d0444b55169bdf877ba313467d7992358060413e69ac102f38eb66bdd8d21e7e9af7b3472ae62e7c3c27688870b16582363eaf168da96258c25d3037117843e5a8df52da151b462dd3d7fb09a31200cbf061cd6d9a87fa576e315361e56359ce04b704ee14f21c6634ef5ded4a07fa815bc15051bc8588b4b18b618f01474c2b8698571b43aa03d8b3bedb44ca6d3982c40ecc2be6e4607a5f219dcf1be6befaa626c0135ab9e0d6aabaf0b0c912c8fec8b56615d3daec48a5faad59c1c00daf1665a21abc86a9e15f12a5c156f196d822ba261c9ffdcdcc8d9fa1db7ab025f2edb3a08e8c79aa15e0bdf8a8550dc6b87a56ce287798bfc6357adf247a072ebba9dec8a8aecc2f0799b81b75178520da96f37d35027b988e5117414f0572db8e6339b3404998ec64fc04128a59e19d22a9bc9700feea1878c6f7941c67ad4adc40d738e1517e4404464799ed170726f72b4a4e0ce4208491db5c83c601b19a9a4171aa0f5b8a5eb5c06c973a7ff43db76d10a7",
+  "proof": "8d1cc08eaace25a47e97b0f0a1eaf6a748aad4b15d2a769056b520fef96e0619ef6be35b1b5ed5097ef127ae2fb950aeac675419153a7154204e29015963c22a9e8639b731989e336e9e0777dc534face34b26d5db97d6bb0ac29d9d1a97b419841174ce8b0c2f0e4d5cc1dda2f5ae6ffdcc9c40d0cd7b7e8492134aa7460b79f804235bcfbec9b8213aee93243de6c1066ff92bbe9ed5a5cb904757c40101a0a17a6f2cca72697993833bf488e346ee460744b8988734f5f9232d79c5a8821f05be4ce9099e19b857dadd287b55f8a202d76d918a000cf256f2d0a145ec71ee17c514816148230126a8ca71d8de486700f538e6c33b7c3ec16b85a43eac61acd7e98cb9e6c2ced8cd4552c1653c650705d102f436a0292046bf6c08b4ef96cce2ec56f659592edf9d8a082c682ad9da31cfe12ba6c9f21eb23c7d4e569fabec33b677875db2c17dd1ad45b6973d6bfc09e551a7f2204b20249314f1dc2e1bc099c25a0396f980acb3613449be4f8e0a5a197b565bb169e15f91ab93d7d04b3316a16456d74f6ac9b05a6c65213577335cbe98fcde5747df9ee17986d82014cc1db15a428292dfe6a350d1f7131b2d4d5092d784ced5b0a0b3d5bdfecf03c9eecf9e5aad0d02a92ee9bd4b4cf69c328563fe25f309347b69376ef47ad46ec6ece43bceed9664ca919888bdaf1162d7f3523c5616b335377474572c95441b523d34ee0aff14869ae71a51caab12887bef22c20c259a7ca0f79f60bb0a8e76ca284ded334781838678e412e5ff79d0fdf3629e9259596e871aaf589d57cfde517ad672c126d43c89508763f9573b5b98ce113d511eec39e99cbef97c87921148616eebf10e25c1fbd5f4cac6be569d44a746fb1a85ca99596174bcf61df0a3cd78a34c601df931fdf29c2fac3d02a0152c5c6338a328ef725c6db9eb7ba3e1304168d280e6f861766772e37a10a2ef878d67759f017a9a7a7aacff153b18c9f31895d56c764d5b1e7ff71cae7ca5dc5d0142a751e24ada65b68f3b9dd6820a198f3ea04731ef24399b9121a9aa856d90b45dec193d1518e13ff54a77765c7c3438c72a155e2fe178222fae1981fe5818bc",
   "result": {
     "valid": true
   },
@@ -55,12 +54,12 @@
         "3a9be520243abe976b50d5ad343692ac99e28d3d11e4e9a5cd458316d097ce36"
       ]
     },
-    "A_bar": "83ca9b4dc4a514497c22f78274a1d53414e5e5bc325f6c606386e033140416dc306e6f97d4167f57afceb5ad9eb69f51",
-    "B_bar": "a9573227b8f384a7835808d9285a1c3a2baabef4c96f73be3077d8d11b045287e30642de975eda73b60f8ec4f56a1211",
-    "D": "b0e88764a49abae79d2e09286c7656fa49c7ec2881da9baf1bda300bf512d7e112d7ec04d478c5781ae7aa1d47f6abdb",
-    "T1": "842def1bd17fc544219d01f8e0a483519302fce802da67d13cd2f82bf970976692d3895a53311d996190cfe97620763a",
-    "T2": "a0e4a3c8b4d296d32edcd8f788d003e20697f70e3f992dd1b4efedc69717eecd2e05cc95558641e5fb5814a77de35090",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02",
-    "challenge": "0ce4208491db5c83c601b19a9a4171aa0f5b8a5eb5c06c973a7ff43db76d10a7"
+    "A_bar": "8d1cc08eaace25a47e97b0f0a1eaf6a748aad4b15d2a769056b520fef96e0619ef6be35b1b5ed5097ef127ae2fb950ae",
+    "B_bar": "ac675419153a7154204e29015963c22a9e8639b731989e336e9e0777dc534face34b26d5db97d6bb0ac29d9d1a97b419",
+    "D": "841174ce8b0c2f0e4d5cc1dda2f5ae6ffdcc9c40d0cd7b7e8492134aa7460b79f804235bcfbec9b8213aee93243de6c1",
+    "T1": "a688f2f75a0e1ba8519fca3272f8b4ae890744ca582f0e89a34767521fa7519c04cfb63f5938d2da59fd03f032b659f0",
+    "T2": "92a201a92637b9de1ea6053bb8686ad9851c2b0e5941e644e5de11618543ebaea16c5968db02922f8aa9a3aa79b02555",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936",
+    "challenge": "5dec193d1518e13ff54a77765c7c3438c72a155e2fe178222fae1981fe5818bc"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/proof/proof008.json b/fixture_data_blind/bls12-381-sha-256/proof/proof008.json
index b72e998..e486f01 100644
--- a/fixture_data_blind/bls12-381-sha-256/proof/proof008.json
+++ b/fixture_data_blind/bls12-381-sha-256/proof/proof008.json
@@ -12,7 +12,7 @@
     }
   },
   "signerPublicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c",
-  "signature": "8c21175e0465339fd9b32aece83c43402b8b467baf3085028ecb5669e76e093c0db878bfd4e6121b2b86260fd38f11ca37fc2f16f145ba600b240eb96a40960f7aac7416f2390225e7166863db321b16",
+  "signature": "ac477879f31a2fdb1256aaaef7880a080878ec7aa763e576d8a29ae25d1f531aa092aed33eca25c8858c5c4eba33076011f17025852ca737d12cd36df49a21cae48bd1a6ad0fdd213a2b847e9cecad1a",
   "commitmentWithProof": null,
   "proverBlind": null,
   "signerBlind": null,
@@ -26,14 +26,7 @@
     "8": "96012096"
   },
   "revealedCommittedMessages": null,
-  "disclosedData": {
-    "0": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "2": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "4": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "6": "d183ddc6e2665aa4e2f088af",
-    "8": "96012096"
-  },
-  "proof": "b52167f9cee8792582213798dc6909be7ac4a9084750b68d31abcc0c1231cc870e2b4c06e4799f2913d95fd2b84434a3b1392df3fe62719647cbf081f0677df748bf49a072551cfbee0a8d8772fb7b32208213ae3ba24c2ac8d2cc55aba99b7cb5d7b5546131fa21e6fe6b6715b81532d18ecc63908ac25dc2fd3b4dd054600ac6b2f82d05bef0e898d9b90f89df2aea62b346bbdeffe56401e3869fecf66086f1a94b7d12d96737fbcc131aaafe0fdd602536c489001cc775398558e678e9f67c36233ced8c104d99f66a70cb4fd1f3524242535cef2ac8b4c357822aca9c95284a7d825ece0a961b813b917312c0271b4d3ffa3244f0be87c8ec8ddfa575c1dc23d25347f51d20b24b950a956ead3e3ee755d9171ff136d3e464cacb53464acef7085aeee0c7556d576e4e81734d460a0905a0ef594d82f08d3d1d791e3278ddb784653f3a5c3fb789470fdc3f768c56007aab7709a1b82fd3c14c60778c15f662d30920dab48034fd703e70793a8204f34235f5fb7fe38959b58e11a539beb9e1e6e16aad50d7a59d3c7ae33e30594995eebf1985ce952985b23287b454c89fc72b7a63829dc95fd2aa5bc68a146a",
+  "proof": "b54ac6e1bde3f3cb16d939774db0678f6ca4076231ca919cee3284b75e9c58773d0e13952d9d12863349551a198596768b998049451200915af5a577b1d88401487920851c4ca66b15c1b23430d99edddff019282de51cf2aa475de61ae2a4ad936d649f19d0e85a19118e5e13e2beabf2d705e1db59f8945adddafc77310b0a02042093a5477d9efd4a98cb2fad4dc541dcf9f7f6d76be6702e148175465a96ce0544b6f01aa53a99c686313a12155a3ffa17787b0fea91ce58c74d7184f4ca4c0826ecc63e97b29f6f17672a14cfe139fc8043df0fe2931c4045cefa53d0b80233838fd3f6059cb6b0138b56c1d7db18cc3b3cb687bd8f88f907530b9f1a640ef0db8df8eb7b39835874560f4222995d47850de322c7ad845d6eef499848d16fd5903860de2e955792f9914df2d4da32e2598e45ae4b0d606f77599b4b12378b8fd2baf899e90258013a7fec685c550e163a988dc15ce35a3d2d4ffcc3e897baa42ff39e4dd3108ba4bb82d19b3e4120fbfaed85949f2a21b4ba61dac6403f71ae52ff26df78bf17bbcea8670363a3279717a2b1e1d34cccfddfe9c8e3729f6e92e28197a09459c6dcd56e3920a0d74418e8d35e4956443a5e4e33d3341a5aa93a817e53e6f05c84e6c432a0e3ef29",
   "result": {
     "valid": true
   },
@@ -49,15 +42,16 @@
         "2cbc33e381cf6ae09dbb6f1d08e3ea93a5aa03c4a6574fd2fa2e879dc4deeca9",
         "1ec36e6be1c702255d9aa4d590014b2b5de2f07d290c9551b66977cde157094b",
         "5491612228a993693c79c11ae169dad9be4116a704ae9ed333ef96e3986373a0",
-        "6f4d920974d33c1e08c86b7f4b6bb7c58a5c0289d8d706a92d4855125ccedb70"
+        "6f4d920974d33c1e08c86b7f4b6bb7c58a5c0289d8d706a92d4855125ccedb70",
+        "279717a2b1e1d34cccfddfe9c8e3729f6e92e28197a09459c6dcd56e3920a0d7"
       ]
     },
-    "A_bar": "b52167f9cee8792582213798dc6909be7ac4a9084750b68d31abcc0c1231cc870e2b4c06e4799f2913d95fd2b84434a3",
-    "B_bar": "b1392df3fe62719647cbf081f0677df748bf49a072551cfbee0a8d8772fb7b32208213ae3ba24c2ac8d2cc55aba99b7c",
-    "D": "b5d7b5546131fa21e6fe6b6715b81532d18ecc63908ac25dc2fd3b4dd054600ac6b2f82d05bef0e898d9b90f89df2aea",
-    "T1": "a554c36a5ee97c631ca428a68cec15146107beabafddeb466b7b6de310db0a80c2ac11c7beb457029b4127b73281944c",
-    "T2": "a61f7dd16540060c811ac7d7586939e86cd1867c367d186e37b67f5b61be6cd6fb3eac56bcf06f254399cf2a82d499a6",
-    "domain": "160cf879138e86f8f6025c41ec94434432a315c33dc6b90c38f1b21ce101418c",
-    "challenge": "4995eebf1985ce952985b23287b454c89fc72b7a63829dc95fd2aa5bc68a146a"
+    "A_bar": "b54ac6e1bde3f3cb16d939774db0678f6ca4076231ca919cee3284b75e9c58773d0e13952d9d12863349551a19859676",
+    "B_bar": "8b998049451200915af5a577b1d88401487920851c4ca66b15c1b23430d99edddff019282de51cf2aa475de61ae2a4ad",
+    "D": "936d649f19d0e85a19118e5e13e2beabf2d705e1db59f8945adddafc77310b0a02042093a5477d9efd4a98cb2fad4dc5",
+    "T1": "9069c438a3b8df1402e4b4675b7ac17f07d8c991baf55a7dd9b8a9fef520929c51540f98ad5182ea0299343e2859e95b",
+    "T2": "b9e2a34b9780298689783b5e29b79a22031f3300f9eed29edc3610bdd71e4fec5cd3c27dd474bbc51547d2f6547d520d",
+    "domain": "1430cf0a3d8a0519a9ecf47534b6026a7671935d9854ed5e68b42fdb543d5f7a",
+    "challenge": "4418e8d35e4956443a5e4e33d3341a5aa93a817e53e6f05c84e6c432a0e3ef29"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/signature/signature001.json b/fixture_data_blind/bls12-381-sha-256/signature/signature001.json
index ac82960..adf1973 100644
--- a/fixture_data_blind/bls12-381-sha-256/signature/signature001.json
+++ b/fixture_data_blind/bls12-381-sha-256/signature/signature001.json
@@ -15,18 +15,18 @@
     "secretKey": "60e55110f76883a13d030b2f6bd11883422d5abde717569fc0731f51237169fc",
     "publicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c"
   },
-  "commitmentWithProof": "8bd94b05cd4e006145bc974cf5cdcc80e544a8c4624b0a7f6a5509430c79be788be86536b725ea93dd0a035b4ef822631dc4e8c1a02cc212cc9f914ecfab3470901d5d1573e4d03653af76ebf3bd891a226635ac82ee6cc94bc20135471365d2bb278e21eae8e71661ecd3f6301c7ba3",
+  "commitmentWithProof": "849d3cc626720202cbc1610fc01ab41ce32099af602def0c579f37dd18b485ef60719275a036bdd8120e7e938c8e1a3d4d0322587441ccc5caf186001b45dd09ee159713c3e3ea0f411f94a5d6665546562d09c093b687a129e464a57e18cdbf5306bcabf3e7cc95f5ba98cdd9bf3768",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [],
   "committedMessages": [],
   "proverBlind": "1b6f406b17aaf92dc7deb911c7cae49756a6623b5c385b5ae6214d7e3d9597f7",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
-  "signature": "a001fb708fb48dc1c02c84114edfe4cce81a80c067159050c29b903680621c830e93213872305957c25122de78194a913165b2ffdd806e3152c4e2d712c396bd2619028cce1857d07ca96a9f5157f4c8",
+  "signature": "86d36893c07d903af95d51e8b825e55d865179bbf4d864be65c8120f487957e8947ec51eb3d75b4116da0733fb448bb23b8a3df8c7574b114256a5ea10e4ef3c04c1ca551f15d9add84afe8d1f778299",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "aa963d9eae5bf642b7b080c9b6cf33f19564e501638d85a0a1f862a86ee0b26e992fe52bbfc103c82038a41146994ede",
-    "domain": "1666eb9faaa4d028797e16a9e89478b067615039c763c931c3df5012ef153b33"
+    "B": "8657e64b5d0002d46cb77f4c3f094ce2255e11d954bbf84b8ade0661b995fe5ff36db1aa2a6bac22fcbe902f5e0dfbe6",
+    "domain": "0b3a152bc770ff9e21f09ac58f59c99379ca0eeb61990ba666d994014085b332"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/signature/signature002.json b/fixture_data_blind/bls12-381-sha-256/signature/signature002.json
index b73a570..f8da092 100644
--- a/fixture_data_blind/bls12-381-sha-256/signature/signature002.json
+++ b/fixture_data_blind/bls12-381-sha-256/signature/signature002.json
@@ -15,7 +15,7 @@
     "secretKey": "60e55110f76883a13d030b2f6bd11883422d5abde717569fc0731f51237169fc",
     "publicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c"
   },
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [],
   "committedMessages": [
@@ -27,12 +27,12 @@
   ],
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
-  "signature": "a9e3a078815b3f7c9d2a9310a5a5b6da193214cb6be6ef77dbbc8fac958ce26bec96ded9334aa0d56dc37992906b6a7d6ead4a7dafea18d3514ea4206f9a93b225debe99b8628ccad921d9253e39561c",
+  "signature": "a85e436a6956de97d72409a4a125bdb0ec61838b2d022963e1599d43f5a66e1dc223396f0a4de94b110068f48e9e596a5836f2b435d94238e257348346f6902363d9fd0212b4cfb10c71b1a60a6051ac",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "85f7a6c2593bb4c1ecf6bd84aa3fe29e4d2c7d59f236523efbad684a25b941ccf9abb83a8531e9badb7bf1bdb433808b",
-    "domain": "1a0842369c4a79ed4709bce26963466699fafea687246b1074c91d9002c4bd1a"
+    "B": "8cef19ef65942ba26e3937da185d026a80296b776e7f2a5bc510ac19e5080aa7f6488ca9636aaa9a3057d0982fc3f6d8",
+    "domain": "13c94073eb7dbd279f60d5907c19d83e4a9ae19f99d6b3ca020785730a3f37eb"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/signature/signature003.json b/fixture_data_blind/bls12-381-sha-256/signature/signature003.json
index 681b7f0..4d6a6f4 100644
--- a/fixture_data_blind/bls12-381-sha-256/signature/signature003.json
+++ b/fixture_data_blind/bls12-381-sha-256/signature/signature003.json
@@ -15,7 +15,7 @@
     "secretKey": "60e55110f76883a13d030b2f6bd11883422d5abde717569fc0731f51237169fc",
     "publicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c"
   },
-  "commitmentWithProof": "8bd94b05cd4e006145bc974cf5cdcc80e544a8c4624b0a7f6a5509430c79be788be86536b725ea93dd0a035b4ef822631dc4e8c1a02cc212cc9f914ecfab3470901d5d1573e4d03653af76ebf3bd891a226635ac82ee6cc94bc20135471365d2bb278e21eae8e71661ecd3f6301c7ba3",
+  "commitmentWithProof": "849d3cc626720202cbc1610fc01ab41ce32099af602def0c579f37dd18b485ef60719275a036bdd8120e7e938c8e1a3d4d0322587441ccc5caf186001b45dd09ee159713c3e3ea0f411f94a5d6665546562d09c093b687a129e464a57e18cdbf5306bcabf3e7cc95f5ba98cdd9bf3768",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
@@ -32,12 +32,12 @@
   "committedMessages": [],
   "proverBlind": "1b6f406b17aaf92dc7deb911c7cae49756a6623b5c385b5ae6214d7e3d9597f7",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
-  "signature": "b3e48d4f916c372e330b3727d14f1543cd5de4285e6c3b90692bc842e0cc1f4eed563726df615fbd77427975222d196664d8733cf38ac4c57efe85a055290cde0cd08680309218db9e04f3299985e814",
+  "signature": "9354cc873de959c7739553fcf7742796c49a314152ccd94af1b7f74244d26276197cbe6b5be575d678b05c39cf4ffedf12dc2196dbcffd2c187d0c905325ce89171ab66f3672a966e4fd56a48f6af115",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "b16f00f40d3a60700f7da8589b876ad722279de6e6c66dd2681a6855a3d71f2976802972a4e7bcfa88e1f2e44387d9eb",
-    "domain": "69ab8c6eb9481bee9c3cf60dfb9d3f539023e8c6e78c6568d0913ea046752a2b"
+    "B": "99c95be56780fa694d182ca279de80297eb93fae1c8f398c7bc155b0a3be3abc7c61813cfead8a35a89dc4d7118b266f",
+    "domain": "1430cf0a3d8a0519a9ecf47534b6026a7671935d9854ed5e68b42fdb543d5f7a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/signature/signature004.json b/fixture_data_blind/bls12-381-sha-256/signature/signature004.json
index 922cc7d..2e35af8 100644
--- a/fixture_data_blind/bls12-381-sha-256/signature/signature004.json
+++ b/fixture_data_blind/bls12-381-sha-256/signature/signature004.json
@@ -15,7 +15,7 @@
     "secretKey": "60e55110f76883a13d030b2f6bd11883422d5abde717569fc0731f51237169fc",
     "publicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c"
   },
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
@@ -38,12 +38,12 @@
   ],
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": "10e75ca49d242390896d9dd943b97ff23b8cb780bf27df185f51b33abaaa94e2",
-  "signature": "ad7169408a137b7365c6f156d5011b72e57e027a7326dc4fb95128099af692fe7b1f7208b98ccbf717dcde22a611d2543ebd9679292532d6cd955975365fe5a260336f1329509e3e1fbce1bd2d9b5ef6",
+  "signature": "aa1a66a6feafef7fa91f158c11d305bde01ead2352e3678c07472b7086d4315d4b260340b6946cf59dc1f8c0529242811f45b727c933ce0221a9e8e8f3bb9263e74b432e4ad4d203705f9aa87ad7fac9",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "ab6c841535ba75d568e913d716cf2920624044c5cd99cfbebb564d5c0654a9bbc3c458cc3c51349ece6ec40223f7e2a5",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02"
+    "B": "937ae4c3c82f8666f235b4bbd5e25b56f3608220bf7e813766d755561c00c9e98ea3cecc579b795683b6bb5bfc571cc6",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/signature/signature005.json b/fixture_data_blind/bls12-381-sha-256/signature/signature005.json
index 4a25573..7f642f7 100644
--- a/fixture_data_blind/bls12-381-sha-256/signature/signature005.json
+++ b/fixture_data_blind/bls12-381-sha-256/signature/signature005.json
@@ -15,7 +15,7 @@
     "secretKey": "60e55110f76883a13d030b2f6bd11883422d5abde717569fc0731f51237169fc",
     "publicKey": "a820f230f6ae38503b86c70dc50b61c58a77e45c39ab25c0652bbaa8fa136f2851bd4781c9dcde39fc9d1d52c9e60268061e7d7632171d91aa8d460acee0e96f1e7c4cfb12d3ff9ab5d5dc91c277db75c845d649ef3c4f63aebc364cd55ded0c"
   },
-  "commitmentWithProof": "8707ce71651e7fadbdd39cd88e83255629aacd969186eaefe95ea27935ab54af325220bb410af7f4389f85adc630548a02ff284a86147a4fc93da14be0c8f2c8df53b0057f71adee985b3b72bc759c2642187bd6cdc9f9e78f4d44b7fea7cb41563058647bc49614cdbb30b8f88264112e4b9aed8849609ab34eed40a83fa095d7ed156e9f89e7bb64bec73cd02ccd8814aa43b6f46cf2b5684125fbc25c0285aa525dc3aba6f21a597f7b5a424a014c5162983082c2d63ff500fc06b5200423fb647bf67815bb9baf76d5a8ccb665ba120fff68b6fd180f4b4c43fb437d68cff8eeac230a47d331b4a72f124957042e4664bae34f486b5c33d1120eaa676e6e302ed1f79739b75e074baa702beb7939",
+  "commitmentWithProof": "a2a3e178bcc77f98a3c07f8532134021ab5847326b5b3bfc3089ca73f1bc51cfe2c99163f4919525dd6bedc8a14ee39e30374643902017ca2e6fb8b5647c736e82d1d3c5b05de5c3021fa6f40d9f36dd22fa06e522411aa20377088ca9a15885d7a5044175f0168e927149ee71e2d257079e0100d6d96a7ddf5392dbc64267af8df7b4711cb5eeccb5e8901d0580b9e837f38337cb7260cffcf4f962154fafe5c98beaed7e4d2fc0f8e7eb1ba4eb04086f170aa4924894e2ab63054049c9ef5dfff4f90b48ef0dcf1f50699907301073270e4782d4d7628cfbe1444cea930928bb45004e41e0ad86a874ea03473845ce42f78ceb6f855ba8326a4d47732c5aed3968b396a07f079b22b5bf2139e51a03",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
@@ -38,12 +38,12 @@
   ],
   "proverBlind": "4fba5396baa36b2fde81d46a9b9ee89c425dbc5e1ffd65c20249afb4abd37589",
   "signerBlind": null,
-  "signature": "91902b68ac869d0b250355be499fe555e292759de6cad9c28eec51d3f4bb5f435238636538d347be44a4b33e0edbfd4d1bc5b0082b29eea3b3aed2b718706a8d08ada2fe623279472fa5e4c571c44ebf",
+  "signature": "9391c79efcc8840774374b2463b28912ce2aad9dca39136746810c8563fa2dcae7dc88a454cfc2db5305831fe9c70b0f0cce199707ce1ae88a1d2828486c14d039c191c26bf3560a0f4e71e364d4781a",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "8444fca0a990ab19c0c7c7cd93ed31406e5dde17c16f1333c2e42284ddfb88e062fed9fd2aa6ae6cc81e6b9a6251fcb6",
-    "domain": "386bb1c7c4d1e3b95686cd66ad21ba8302f9f87290cc800a79c910f0e96dbd02"
+    "B": "8e1c3ee4b13e5936f9cb5f87342107ed9ab4417c04d6e5d712143a54bdb476aaf4240e8a4f11a67d81feb1398f889889",
+    "domain": "1207ed090723fa7e41c07e970ebb647d1d043079cc2a38c650c32234f1823936"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-sha-256/signature/signature006.json b/fixture_data_blind/bls12-381-sha-256/signature/signature006.json
index 2ab6dca..7e03c00 100644
--- a/fixture_data_blind/bls12-381-sha-256/signature/signature006.json
+++ b/fixture_data_blind/bls12-381-sha-256/signature/signature006.json
@@ -28,12 +28,12 @@
   "committedMessages": null,
   "proverBlind": null,
   "signerBlind": null,
-  "signature": "8c21175e0465339fd9b32aece83c43402b8b467baf3085028ecb5669e76e093c0db878bfd4e6121b2b86260fd38f11ca37fc2f16f145ba600b240eb96a40960f7aac7416f2390225e7166863db321b16",
+  "signature": "ac477879f31a2fdb1256aaaef7880a080878ec7aa763e576d8a29ae25d1f531aa092aed33eca25c8858c5c4eba33076011f17025852ca737d12cd36df49a21cae48bd1a6ad0fdd213a2b847e9cecad1a",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "853ff87eda30796f5997ec3fb9fffcefa78b0b457ce9f2487b8afaa0ffa5098053dc91a65e0b169d97f7b1123e80ab14",
-    "domain": "160cf879138e86f8f6025c41ec94434432a315c33dc6b90c38f1b21ce101418c"
+    "B": "874d657ff2b90023d18c8eb1d2fbc0beb8b9c1ae98a285db1076466edd7c0a3179bc572d4f7b0e15b39cbe298d2023cd",
+    "domain": "1430cf0a3d8a0519a9ecf47534b6026a7671935d9854ed5e68b42fdb543d5f7a"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/commit/commit001.json b/fixture_data_blind/bls12-381-shake-256/commit/commit001.json
index a04f579..d008158 100644
--- a/fixture_data_blind/bls12-381-shake-256/commit/commit001.json
+++ b/fixture_data_blind/bls12-381-shake-256/commit/commit001.json
@@ -9,7 +9,7 @@
   },
   "committedMessages": [],
   "proverBlind": "30bd5c9bd2b61c44dd169c92cf28bb607830c56073f10e7a800c857cb05ec249",
-  "commitmentWithProof": "95a6f21801b2010a9016c590cd6f0d59682e908a46cdc9856eea2c5000545626fc755c13ce93a71e371b0ae05491326302a8e40b4fc1197d75c46d2114c711d9186e4af0498dab260ae56f81dbc59f7b2a9f4883479ce40e765a32b6481766ed5aeeddecd2decd277460a5e129a22934",
+  "commitmentWithProof": "b6389b0fdf04b9c35165acb11685e02193c53c3c1bb8ef3a9404dcee1727a365a3ac6ba7fc32654101cc72cc0ee7d32b23d2018bd6dc2f932c71d4401e763d4ed9999ee6c98837aa7dbe823050697dd744b05920ad0b6393e94f9b86e92d419406945f1e79d4be58dbaf9dc95237c951",
   "result": {
     "valid": true
   }
diff --git a/fixture_data_blind/bls12-381-shake-256/commit/commit002.json b/fixture_data_blind/bls12-381-shake-256/commit/commit002.json
index 2876c7b..6641b5e 100644
--- a/fixture_data_blind/bls12-381-shake-256/commit/commit002.json
+++ b/fixture_data_blind/bls12-381-shake-256/commit/commit002.json
@@ -15,7 +15,7 @@
     ""
   ],
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "result": {
     "valid": true
   }
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof001.json b/fixture_data_blind/bls12-381-shake-256/proof/proof001.json
index 1e693b6..3b80d60 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof001.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof001.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
@@ -41,24 +41,7 @@
     "3": "e1ca9729410dc6ba",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "2": "a75d8b634891af92282cc81a675972d1929d3149863c1fc0",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "4": "e1ca9729410dc6ba",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "7": "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "9": "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "11": "515ae153e22aae04ad16f759e07237b4",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "13": "ac55fb33a75909ed",
-    "14": "96012096",
-    "15": ""
-  },
-  "proof": "b9e17ab6b187f62b1d57aa0601e837362237c17bf4f0262b9bf0c7245945cef306f949faa8921dc550baa522aee9d128b6c3195da62659efd1c3e9095a51239b5931996f0b4bd1577cafcc3c2806bba419ec9580f8e12101441f2476876459f595bfee618011969b7bc139480e0b6d8cd4f53b6dbb22718e3948caf3a692694b6fc198329c5ceb021a9aa615b9dfd9dc6ec3714ff2caa95133f83f210de4b32432b371e956fb1ef963db4f15acb6994e23fe0e27b8a92cbb4ec8c31458911a05e84cdeed70a000ebcf4b4f5e3a51173c146307866abbe87292c4b5f5b33ad3a44366b6b907519ab4f4353a44b6d8a6410b192d6d261c510dfa5d65f65fc568d101a1f063a786e47658db1d4b067897135e5b05ed483541eb523c39bd69c91ff0783954bf76c2530c6dd814857e47e81c",
+  "proof": "92b9f9f19e07616a7933ca8ef4719916a7cfd27bca4081b3593313237b0d17e505ee2245c7ebea6dbf11c5ff00796af0a43965054cb458805d352b8ea04459eb9ee9c194bbc94eb89c6b76fd95b5892df98978f31aed49a4a89d1a56f71e17bea5e3790a19fa6cdaca1154b5f2c7113ea3145225ed6fc49f04593ae3d5accca80949e5f24415ff2a99044bd8d453891e115e93cf7312481f87bea699ce95b96136dd9715de9d96a5204baee35610db3d5db4dcbaf18451777f30d4dbfcebe6da1f04b4922f0ebcc71fa9ea2568d4e3081b9fe25f0e9d1dcc496d45a6736ba3330f8a1f3f33b9c8256ccdaae6ecb73332091643100fed2d0eda4c55948c8ddf38682430d5276235d294d5c40faa920bd66bc956d4f9226588d302787eaf442ea79364ca4cd646927c1b752567e8c62b75",
   "result": {
     "valid": true
   },
@@ -73,12 +56,12 @@
         "42510c348487be3c19994565911729eafcd4804dacf25a7cb7b7a634ddefc3b5"
       ]
     },
-    "A_bar": "b9e17ab6b187f62b1d57aa0601e837362237c17bf4f0262b9bf0c7245945cef306f949faa8921dc550baa522aee9d128",
-    "B_bar": "b6c3195da62659efd1c3e9095a51239b5931996f0b4bd1577cafcc3c2806bba419ec9580f8e12101441f2476876459f5",
-    "D": "95bfee618011969b7bc139480e0b6d8cd4f53b6dbb22718e3948caf3a692694b6fc198329c5ceb021a9aa615b9dfd9dc",
-    "T1": "83b4acb093f60f6b91850bb4aa8c77d596a823770821106ecb41022d64dc5d199f9cb2e178919b41babc06490900c384",
-    "T2": "b410ae7cabfbf8c754299a7b597978f38012122b56e04ce28da24ec0ffbf8262391ae894b410d69bbc77a4aceb4c6a25",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "5e5b05ed483541eb523c39bd69c91ff0783954bf76c2530c6dd814857e47e81c"
+    "A_bar": "92b9f9f19e07616a7933ca8ef4719916a7cfd27bca4081b3593313237b0d17e505ee2245c7ebea6dbf11c5ff00796af0",
+    "B_bar": "a43965054cb458805d352b8ea04459eb9ee9c194bbc94eb89c6b76fd95b5892df98978f31aed49a4a89d1a56f71e17be",
+    "D": "a5e3790a19fa6cdaca1154b5f2c7113ea3145225ed6fc49f04593ae3d5accca80949e5f24415ff2a99044bd8d453891e",
+    "T1": "ad2515c9e6265896d9d1891819dcde6a55ded5ff96b48d4b2f9fa8eebf4ee867082445c953032567dcb43049be22ae1b",
+    "T2": "a02131e660ceb864718f803010e6435567e7d09299857fa718a361f643febda90a0fe7b7566fc83031e7e880f3009a81",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "6bc956d4f9226588d302787eaf442ea79364ca4cd646927c1b752567e8c62b75"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof002.json b/fixture_data_blind/bls12-381-shake-256/proof/proof002.json
index a9b6ef4..808ce83 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof002.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof002.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
@@ -39,22 +39,7 @@
     "2": "835889a40744813a892eff9deb1edaeb",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "7": "c344136d9ab02da4dd5908bbba913ae6f58c2cc844b802a6f811f5fb075f9b80",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "9": "77fe97eb97a1ebe2e81e4e3597a3ee740a66e9ef2412472c",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "11": "515ae153e22aae04ad16f759e07237b4",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "13": "ac55fb33a75909ed",
-    "14": "96012096",
-    "15": ""
-  },
-  "proof": "a14083a6bcab28b937970650144a8b28819f723929aacf17a0f56b6f5e5d3bbce24fad0e3f8c76b5bad349d41705083189ae2702bc4a5b2bca322d3988d6ff35055ac1b37589897e4424c4eee64c199a8b58263466f5b1859c24f5ee0e6d21bfaece4081d36caa8b80574072388dc2d17c72558fc725de00259c873596b76654e1291479d8f79fe4594e6b86310bebe738db8cab6c33e7104ddbbce9a343eba4b5788247ba0844bce2f589839ee771eb3d2e0cc0d56b43f2850dc240161aac8c3cb4e557ec444714505c8ff8c2a231a72a6a0fb335fcba737d1f3de54a226533f3a008661279e80837e18bd81767ebd447f472600499ced38ce26502f25e842b5cce3dc4cca9ab29bab1e7ee17675e6c2b9e94552dee5cb48f73db02934946da153ee8805cb89e73941d186ed255d9033b2c68ac32a9956b38b9cb0688967bd6ae7a993aaac3047d0c6e611d2583ed5d0abe445cb55e8143822e1f243f646a56d01b77c1e3aae12567d4a90b634e8063",
+  "proof": "95962116bfb3b9b2de1018579e9fa17b90c1b961ab665b4a4f006540a068cf432a4b681bf2ed60ad2722a8bb95721aa0b440cb1fa03c5260e3e1baae441f73aa0dfe304e156af3425cc8ca0b59ecae2be09d8cf4851b2ad6e11390703a86dfc08fc29e731352a3142ff72cf153a713f7639324591cf6108db67ce047a5aa19405b56eee355ae091dd648e4b03f25d43164d59bbbca99b525289657aebcbe8ec1de2c7d4f277518d0aa3caae96135cd3f388124edd9d03ec9cd333113f57d19c5886cbf36170930b54d569539276dfbeb5f5e34e0e93edbb440841214c38170c9ee7e60a943b290f7db8d2e09f64dbb7c3ed7a698774a3ea3585f698afefcc2b648295180943654cbf6a43da1fe190bbb661f79ee3fe448d681fa6257bc9770c26c87feb52a3c3abed0fe0272715f993e54632136c16ef6b8e87d69a54939a7508dd26ef82418fb6636ddf84482008b8e3109e279a97ebd2b1e25959cb0cdd63004706e16e66a53fe71c6851052da0c02",
   "result": {
     "valid": true
   },
@@ -71,12 +56,12 @@
         "635ef91197c84f74b14ef14ed7b74ea6a2c4770a1f665cd545854330e3550221"
       ]
     },
-    "A_bar": "a14083a6bcab28b937970650144a8b28819f723929aacf17a0f56b6f5e5d3bbce24fad0e3f8c76b5bad349d417050831",
-    "B_bar": "89ae2702bc4a5b2bca322d3988d6ff35055ac1b37589897e4424c4eee64c199a8b58263466f5b1859c24f5ee0e6d21bf",
-    "D": "aece4081d36caa8b80574072388dc2d17c72558fc725de00259c873596b76654e1291479d8f79fe4594e6b86310bebe7",
-    "T1": "b5c0697764d1f1dd7a080e37b4ab743ae90c754426f456f2317cac34ce2d83048f54cc7212017e9c7b62c2c0323d380f",
-    "T2": "a929548dde575de8fed7bfc439f2d02788bd0b378048bc3c0c14ec3507f9245f51e7c781187ee13899952cd1d187edb9",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "0abe445cb55e8143822e1f243f646a56d01b77c1e3aae12567d4a90b634e8063"
+    "A_bar": "95962116bfb3b9b2de1018579e9fa17b90c1b961ab665b4a4f006540a068cf432a4b681bf2ed60ad2722a8bb95721aa0",
+    "B_bar": "b440cb1fa03c5260e3e1baae441f73aa0dfe304e156af3425cc8ca0b59ecae2be09d8cf4851b2ad6e11390703a86dfc0",
+    "D": "8fc29e731352a3142ff72cf153a713f7639324591cf6108db67ce047a5aa19405b56eee355ae091dd648e4b03f25d431",
+    "T1": "a66f3c0cd9ac5f94f5f075ac4368a651d9e0b8c3bc7b01d5a79ab9b2c51f86ff7fd82c247ed8204ac5a5a0a2b399b6af",
+    "T2": "92988db2213041d210fa33739ae654afc0f2f366398e488a7817e4761740a00633e7c59d0faee1640db5479a4178fbb0",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "3109e279a97ebd2b1e25959cb0cdd63004706e16e66a53fe71c6851052da0c02"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof003.json b/fixture_data_blind/bls12-381-shake-256/proof/proof003.json
index 29fc339..b61bd17 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof003.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof003.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
@@ -36,19 +36,7 @@
     "3": "e1ca9729410dc6ba",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "2": "a75d8b634891af92282cc81a675972d1929d3149863c1fc0",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "4": "e1ca9729410dc6ba",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "14": "96012096"
-  },
-  "proof": "a6056ca76a8d342646fe509aff0a0a9a473d1dd9a740325dcbcb8c2391e27c41fae3560e68014c258847cdfb825ffbc08b4dd4f6dac26e245243e77e0450a9f57b5c2a26201e628f477307e4b1ba46239b5b37789e805f4494f0a79eb58a4175b1ced5d5f5b401169891c734feb00829f62d575131114d5deac4c293134fad7f9485497935db52da96694e61b4498634723fb71bbdfb3bcb922474dadc780ccf8370f601f2313e2e133e480a397d715c262ac48aa3a5ea18c8fbe37269061ddeb5fea27583a19e8547468bf275785e5261d84cf2442fedf89ed8ab4323f6e10e337521794e056ff7e9ca417da7b18f5319e99832031eb46f74215e520190995041738445b92e42cd44eea874a9101a47477745473d4d01e259183a8b7211083d9dfa557c6ab12266982176fd94c0859d53eca062406ce741ac9ef29d79a4da7bad78208e70eefc7c1c5f01a862095c21450fdaa0b68bf5748c589612721fd7b183b0514fa72afa0a814ac4838b50a4bb6486078f7c1f289951d3e09f5970496a5d2d0cd3c92d2751f3b661bc0a7a9682441c2b29a667443cee0cca618c0df1f763c2e7b5eb622c2ce72db1cabcbb055d45c33cee4b2b0e084938f8a44341dec62aa4e673c5c0b21dc30cc97a925a6dea",
+  "proof": "885fc9be8194a72628b0a75828b6f2297e0ac0db13473d8c8346f3862926365e38a5ab28265854a2a165fac412d201ca937eb6e249768e52c4ec15c711b8a4c2153b09caa7d64c5e010fc05f3f6ef3865920e877365f82d0400738b65f9bb421a8e4e5f7bbade675d55eb91d32adf0eac29d9dd1168acf39e89824e7b83e98381b47030c5e2ba4b9edb7b5ea262b01310ae1bf7884d2aee023504adcd48ed1c4312fc401618ab24679ca46c448fe478227d0bc48cccafe0d61b91b01bd9e9821842af129f3c2a5c877fa9c759f81b5e8606cdec75a7af1e99c0750394e8fb39465d07fb8b6049d8e8070fb1523fd6a1d052c2daaf7bb42d1187ef6efb12df7c0b9200a7230c377767289b7aac236b2f703b0f2d0914266cc0b1bad8f21330ecaee604f49d494befe28b46d6dcf2de82f73a3d4e82d628097aa773063d4e868f25fe6544abe890b30b8ae08ef22cf8529498d3e7fb7c881f275c56cf57cd19039a4189fcbd718bfb6b1e7de1274008d331fdd48de78b047b98966dddb5492c9ef093f1b7064d6453615ad0776f131794b52c689527d84d67836a61e993b8416299020a8d57bd5266043554541d0d30bd3464520473549979cbbbe5172009ec1078cb039167b018853a3a507b8babb617d",
   "result": {
     "valid": true
   },
@@ -68,12 +56,12 @@
         "65f2bf6e3dcde2dece63dd45ffcdecc8019f04664cb245f45ecdbc945e8a4772"
       ]
     },
-    "A_bar": "a6056ca76a8d342646fe509aff0a0a9a473d1dd9a740325dcbcb8c2391e27c41fae3560e68014c258847cdfb825ffbc0",
-    "B_bar": "8b4dd4f6dac26e245243e77e0450a9f57b5c2a26201e628f477307e4b1ba46239b5b37789e805f4494f0a79eb58a4175",
-    "D": "b1ced5d5f5b401169891c734feb00829f62d575131114d5deac4c293134fad7f9485497935db52da96694e61b4498634",
-    "T1": "8b1b7f8070626bc7bcfbc210e00d513b10e412668b83360eade3201bebf2d5421365816f841d08d142e61a28f8051817",
-    "T2": "89d4e2d5f19d2f2cd01a503d68eb57ea69ce4c640a1d58322aa8b6ab5d68b203ee58108d9bc818e754c22b0317ef36db",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "45c33cee4b2b0e084938f8a44341dec62aa4e673c5c0b21dc30cc97a925a6dea"
+    "A_bar": "885fc9be8194a72628b0a75828b6f2297e0ac0db13473d8c8346f3862926365e38a5ab28265854a2a165fac412d201ca",
+    "B_bar": "937eb6e249768e52c4ec15c711b8a4c2153b09caa7d64c5e010fc05f3f6ef3865920e877365f82d0400738b65f9bb421",
+    "D": "a8e4e5f7bbade675d55eb91d32adf0eac29d9dd1168acf39e89824e7b83e98381b47030c5e2ba4b9edb7b5ea262b0131",
+    "T1": "81172a458bf764c942cfc9d2f4c6d77ecce1b98c7167a0483c4c65d37bc29d61fdf27fb9a941b8a351e4674203c38f1d",
+    "T2": "91b8aff9920c55af087dfd6c28f0e8c33edc8a5e5ba50ad501132d95e39b0fe90ba82536a7518287c3b0cde01acc9c5c",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "464520473549979cbbbe5172009ec1078cb039167b018853a3a507b8babb617d"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof004.json b/fixture_data_blind/bls12-381-shake-256/proof/proof004.json
index d2ad183..8469d62 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof004.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof004.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
@@ -34,17 +34,7 @@
     "2": "835889a40744813a892eff9deb1edaeb",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "5": "",
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "14": "96012096"
-  },
-  "proof": "a96a052121e1f2782cfb286fa1652c18cf92bcf9d27da34c6e68e97ca750b4e9acc1706e7e990c3c0cdef9b7127f7f4399112948cd46ff9cb8644bd7eef9a42fc3738685044dcc36a2e512eb6931df951616a73da6647ca972bd9d975eaeb478915d70529fbddd042e0c355bef5854d05f0a6741acf8a92711baf1b62218149df20f1eb98ba7f7f797697c8c33356db12c5765eb955a5aa9c99171483921abad20f0f12e327122e50fba43436094e7216ecb0208be6b8b9db6e87421e80950db0fd2f844d165279e1f3f474a23bc81d613508bcfab50307ac704073dfe2aca37bc6e56368b39147e4f58f3f837cac4b45512551eed47d3351751a6891fb9f615c68218c4cc2e205032f29373efa4f12324283e8c4ab31787d478df1e6754bb8eb60520a3b7b505669f964fa38db5262811a7bbffec086b03520c4bec622a59fd36adfb2f55188f221361eb50d5f01f8f71e2129d60fc1ac23cc1cd44a607fd252d0e45610271c400a39932ffcf8be8f34975398e584f36e1152d8e3f9422f3201b32a18cd13fe3871bdc5a81c557a0d2586592f0578714223aabd0bcfd975f55cfa4fdfb7418966654b91abff11ab96615e883ec30b4b632c3a350cd69a8c6326cce61547267d6410757bfb323c0a0833ce279e939a7f381c91738b3743b60b3800c1aba91e7e8d395539574f8e8301d459fbe79e7c51693a959a1de996941a9fb8f3810452adc9221582092353902ca",
+  "proof": "8e1434019ae87246297e159aa75f43eb5f394576cbaad9dab7392a57841d903628c192583963dfa3c6628aa234e8aa3ba3c45b324a40223cb35af21cd4f643a97efb3262359f0a0ab3606209030eadf2d59f404f67bf17cf9eccc2483e540f68b8fbd18a6f55110fbc12966916ac698ca7a6c8c7ece5818945bfc5e3bf32387d64e532ad32f432133dcc676c2926246f2ed725e744242940a383c33e1731f366fcef24f6376615bcfc5c1bc4f29fe91553a8299ebaf843e32bc97c5114d3d297e61bd9ebfdec31310650a904981c097319785f07c63da13ff11c718c98b91cc0af9f0a1fefa5c93cecc9884b15f467521b7495b8a039923bc41f39a779da0b06564d7db558b0576ef29ec29a5ed785321f2f77c3620143044683449392de8349b4a4dd430ba33a250a419eac1c06a80f014a1f509a4abe09f4ad94d3e0497d0377fa855d222bbebf928f8b643f5b81dd49c664c48342d0fb5004ed381ed88d0d98790305fc420c2e67afc2be3b1272c217d8150dd9c78cbed8476d9a83ec0fc84c3d1ec69f6ccdeb4cca78d2207086943f76defd1943a5373fadada7e52e45cd394d3a3e9c62eb504a30709e8de25e340baee1cf06bdadccd4f6f1b1f1ab72dd9a7cdaf85507891bb446e2e483d2f0d53cbd7aa1417b01f721e149b8bdc8e0c54692ef3e136d0b363e25a44559e2c8fb28b941e2f8fdf90ae1fed6a1209cbba29fbaf607c9aa65e705c9245c7b3a2fc9",
   "result": {
     "valid": true
   },
@@ -66,12 +56,12 @@
         "6165660f8dde9349f501d169e463ddef10b94a248f2de5701966e65ba16b656a"
       ]
     },
-    "A_bar": "a96a052121e1f2782cfb286fa1652c18cf92bcf9d27da34c6e68e97ca750b4e9acc1706e7e990c3c0cdef9b7127f7f43",
-    "B_bar": "99112948cd46ff9cb8644bd7eef9a42fc3738685044dcc36a2e512eb6931df951616a73da6647ca972bd9d975eaeb478",
-    "D": "915d70529fbddd042e0c355bef5854d05f0a6741acf8a92711baf1b62218149df20f1eb98ba7f7f797697c8c33356db1",
-    "T1": "a74374d7455d32209645a5e151c87315ec98cc5f6aa0427dc8a25f9efb5f3bdcfa97bd59a6b503741ec7ed5b555ccc61",
-    "T2": "b79ddab7ec3fb0e0f6f0e8b63a741f433e90b29c1c77ec95547ca8859ab4399e8104f89a5697ed230685bb24dd024593",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "459fbe79e7c51693a959a1de996941a9fb8f3810452adc9221582092353902ca"
+    "A_bar": "8e1434019ae87246297e159aa75f43eb5f394576cbaad9dab7392a57841d903628c192583963dfa3c6628aa234e8aa3b",
+    "B_bar": "a3c45b324a40223cb35af21cd4f643a97efb3262359f0a0ab3606209030eadf2d59f404f67bf17cf9eccc2483e540f68",
+    "D": "b8fbd18a6f55110fbc12966916ac698ca7a6c8c7ece5818945bfc5e3bf32387d64e532ad32f432133dcc676c2926246f",
+    "T1": "b7b4f49648243c0645124c9d7370c11d2f4c03eeee6f874a07d6f395cbe2ec11f48c0bc5f06092bd35ad4b74fd2e4c49",
+    "T2": "b42257bf46107920e1c987957a589cdd1bd5f848bffb23c17177eeb18a4cc7b3e1dfdd3d6ac590fcbea913696f9a93ae",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "28b941e2f8fdf90ae1fed6a1209cbba29fbaf607c9aa65e705c9245c7b3a2fc9"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof005.json b/fixture_data_blind/bls12-381-shake-256/proof/proof005.json
index 468baa0..8634671 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof005.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof005.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
@@ -30,14 +30,7 @@
     "8": "96012096"
   },
   "revealedCommittedMessages": {},
-  "disclosedData": {
-    "6": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "8": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "10": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "12": "d183ddc6e2665aa4e2f088af",
-    "14": "96012096"
-  },
-  "proof": "a46cea8d9d0f919fdc86ca3dd1ac8b2a3e2378e284ba821202cd8de28d07cf961025b3e40ea6c04a8b40ce24254638c283966b37e6d484324d664fd4b7a0902e6183f0785933d6a169a9a2317d36f5e46eaceb1ea1aa8217a8814e17109880758e42a7ec9ce182a1cdfcc25f77e5731ef62538316488e74783bbd4b2fb9670da9d65b56385bb5386795529447e0263f331fc893fd155f22d61152e20d3b61ff16b31db1e9061022f6571a677cb0bccb56d0bb7df15cbc1bfdcb096035766d120fdeff44b253cf5eca13727e1e022b0a37120ab12381a0870d890d682dea4a4dba263cb80f19cb993febcf53865709548728d35b5e7ee27e55ee188d6e8d17a3c846f9e1c56ed42e9af450d73e7ef3826411062fd0fd2496acd5961ed94136691d8782f534201c741bc4d56317825222013638dce35ab399da8f2f5bc0a40e43a79348483d7d1b92b95277687ea25a53f17c3fca6cb30ac6d0e711c89c36f2a6034d6a2a12124e6743c88da53fa46483c37672c7161cf6273bd0fd2c1226f5b96a8e5572b4b7974edd4182a96708a01a05eeae79b84cf79bed7b01c22a32a2ad38fe92cb8eca55cec5d75f9ee876a2c0f2982f0a47bbfabd68627892687bb87a5f7bbcb2819d4439f93439e2aa1191a5643ed031197c66bcc1beb5d9dc1fb24f5f452c3f97900bd42194f198c62b8caa54173dd5a76260ae41c4aca2cca8430874e575cbba47d718300f0ef7bc4676553508938f9e4cab05889a7948f364a91c351f3796f5bfa8bc36cd46d040823c33164fb33187ebcf86f20af8ba7d75cf558c302e977d86d4485492f14c06198ee784a9510fe499cf516bd1c96e0ad60a5ad07fd5bdcdcb97a1bcec2ab951a56eff6",
+  "proof": "b49d202961fcd847f07546539dff3482d874bf49230d9195842d8e7d56810909542f670c77224652a06426ec23fe8aa7af22a741f60c494b57e511b0e39bed7690187f0dc60aacbb601876c995c7137b26a3e00929ed9f04db85dd026449bd5c8511aa643200708fa241b82fc9c3ad43f4cb7ffb8108374bd80a104276aa3b25fd99b4a39648bd6ed9d31a1dd99b0868516a282ebbb7c9e43bf4e8d02bc2661e42cd9ccf8201eb363095fb8c99289a2a4a4250499a0a58e9040724be294e64cba78ac1a770a5a6825e83c6b2d190a7b54c069f0c67a72a9bd8252e2c76da8a0c736f94aba59ec8bab63f5eca2adb55403369a441e5e7da8898ebbf5d9136ef84d706a44a14fb3e022862435b3ad9f7f4316d10d68a7769dbdc66a3108bfedbaa1cc4d97af2ce2118f4ee87c2e269ac40135a07cf3286ea1169b657121b44104036aba5e434d086cd4684a914262ad8e137ce0aac45fe18d907252e145b68482a7e9639801fb73c20b262e58ab63cb49a30bd9529c968d145facc8bdd1f8e0e29a9502832fbd28812d9d9ea58e6bca8125ec7b54f4cbf7a3a49b4eae96627b8a800a840d3581f7d61782d467ab4fe9bed43377a53c19b02c883abab17c089af3cfffedd0c3fda7523e829fb6256842efd4dbad7bd23e6fa424358878047a76e5c10dd9eebd72c58bc1a0b28bcbebbc77a45f145871c9e45939e5fdfe8cfcda8cd7e7db06ada9062efa0615bcd8324a8a35498be70cebd3dc49e0a5021aa62dc75a7575cf72aeddff26bd0ead27dabc18e31c0bfb468e8b9dff0b6c3222ad18d01c654526539f5c3d32ffe6efccc951875430dc2408bf61a1c780d89325e53943233336d878147a94e965928e430a35ebf",
   "result": {
     "valid": true
   },
@@ -62,12 +55,12 @@
         "4da6a68e742b02785c398f1693b856908138fa2376c03546ab2b4168853c255b"
       ]
     },
-    "A_bar": "a46cea8d9d0f919fdc86ca3dd1ac8b2a3e2378e284ba821202cd8de28d07cf961025b3e40ea6c04a8b40ce24254638c2",
-    "B_bar": "83966b37e6d484324d664fd4b7a0902e6183f0785933d6a169a9a2317d36f5e46eaceb1ea1aa8217a8814e1710988075",
-    "D": "8e42a7ec9ce182a1cdfcc25f77e5731ef62538316488e74783bbd4b2fb9670da9d65b56385bb5386795529447e0263f3",
-    "T1": "97653c8db8622f9e682acaa8b47f33aeb77325883d64c628e1e434375286c0df961514bb77651d32cc5572591f9a67c4",
-    "T2": "97d3a42ec1606394a72c334560af477bed3b1de11b59a94a7488c6fa87cf61c439d59f2de1a38b806daf7993c145fa7d",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "4a9510fe499cf516bd1c96e0ad60a5ad07fd5bdcdcb97a1bcec2ab951a56eff6"
+    "A_bar": "b49d202961fcd847f07546539dff3482d874bf49230d9195842d8e7d56810909542f670c77224652a06426ec23fe8aa7",
+    "B_bar": "af22a741f60c494b57e511b0e39bed7690187f0dc60aacbb601876c995c7137b26a3e00929ed9f04db85dd026449bd5c",
+    "D": "8511aa643200708fa241b82fc9c3ad43f4cb7ffb8108374bd80a104276aa3b25fd99b4a39648bd6ed9d31a1dd99b0868",
+    "T1": "b3c0f8ff30dc4b74e3ef80a49deae5581c1b30d3eeb3265a29934c77a3bf81b088e9497ef56deb0e94160daf667a51c1",
+    "T2": "b8d05b87e865db7669adb79813faa7302d88ab54806cf917d592e64d34913de76ff1191b87971536815cf734f919ca00",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "430dc2408bf61a1c780d89325e53943233336d878147a94e965928e430a35ebf"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof006.json b/fixture_data_blind/bls12-381-shake-256/proof/proof006.json
index 7170824..4323aa4 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof006.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof006.json
@@ -16,8 +16,8 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
@@ -28,12 +28,7 @@
     "2": "835889a40744813a892eff9deb1edaeb",
     "4": ""
   },
-  "disclosedData": {
-    "1": "5982967821da3c5983496214df36aa5e58de6fa25314af4cf4c00400779f08c3",
-    "3": "835889a40744813a892eff9deb1edaeb",
-    "5": ""
-  },
-  "proof": "b5b84e7a44fe9c864d7aefa086af221b5635c08c91e07d51c735dec90b13a7b8377083f3fd726d22eafe2dcb89cc02b192a874481a1aa7858118cdbd7c7cba094f761cbe28f4b81c8cda6dc04cf4c4cfff481b29fc2443cb1c7ce94958de6a5097a3e15b348fb6bb89db4ce5a54281163f71e2dd5cf7b09e1d1b0474c54ac24f108293cabf24d6d3c85ffaae51cb28d322018c6f816001ad881c892246567d9e80bfbc94e2bb706654029572d10ab58f408f459c2b3d626f211b9af6cf6dff3b1bdf9c3e9258a8d79b447e30836c6f3a10c4ff96e5229acfc0c01be5ec60cffcd9b183eb27e167f7ef55c116af163f64203d8a812616a47533d0142c1fc156f253c198bd2fb31c024c24cf963b4ef8a72685c0e60fcae9a384482cf76b2bdb32cfff3e0397ee4574fda20335e7cc21b56ca46db97020bdae7f9e1e3f95b1ec0a1604eccf9d1140f07229bd1ad40db6d9504e94bc801457ddbc77a0f1c2f13896e54ab4e8542b9cbecdfc75733e8e413d6b3532148349e478219bf096ed7dad49ea049d0ffe8209646fb44401a64bf8d003462f2c93cf3a18e56063884e502c450c81c0b838b4d4642928aa741948d19b727188c92eac3642599da6c50becce73fe3d8560750e988ebd8565fd4067074739f226c9e85da6f57eb672f7bf83a2961d15b93a61a1dcf1eae7fc98968964880dc0978753deac2e745089fa56ba89790594f011e344d0e7b9803395d3a98f916c87ab9346a6dfb424a0e7280db4f7ddaecd99d87a2aa59e68afcca68cac2fa516166185a9c59ff1d664ef99c4454da865859284b33165bc7037f830ac61e5db0263a4387c441e92b0b3c9dd38014873d56d665bbba00c11c623634cbb17338822213b5463ec9b15ec5e2f3660d5aeac334e54760bb158ae41d9ce2e5b3d9d6c368b52247b56ced2bbda18ed9649715e1f28d013d277c9f8d55e647544e03a5d",
+  "proof": "91316c2d47546e7eec8b974c58764d0002e9def61a4631f12e74a643a058f6aa95eb27b1b7b319635af43da84e9a104080542f0d9f5fbeacdc0e669d5a2e0678ace2d258032ce6ae4e9c7ad35b4739ab3aaba3a2592fdd3af1fd70fc4b31ba8f92f36dff7f48afd0afb0e1ea9123b0a1d1387f16bfba16d4e48f28a78dbe6a5c841c6ef939c268f7490f21878d81b39f4c2388ddb5e1e205cb4eda73cc830f415c6098325ba77739fdbc5a28d557302d591485fb5b5337ebe77cd33f1aa83daae47d21ec993d8d75a8956c894a6e61293c95bd0d785a0af5debb71aad8580830eb258f6c8a68810505b4bfe8c941d36c42cd81f3a40e2784ca64cd10a08e85cb9d7f6ad9dc2cd2704dd6cd31ab95f1c5123efb704c5061c1fdf955890414b43eafb2158ab7324a3d550349969fad60a52c68b3cd9e8936de4e602b92cbe80963ed614c8f2ee498c460e5ae4bb521c37e58a88017fce41b8ccd5f18963f3a6c4aea75ce64e55b578d5b41f96f24220269139cde310b9cace17efd7237cc9df18009b424c6af03e955b04277ad89fc9a0365b0fc1391941dd5b87fc95fe1fbf935d989fedd5f0cd9f684841e6b06ad8dbc64d31315fec28a0de9abcd916e6229470434e471e08b401414067413a9e45fb206248b295c6496cb025221e8f1967f4e77fc2b3b26ea02e5f1fcb0e05856c6a251b3e7ee47206c622ed321523c04d0f65eaccb1f68323469efd34d8c4f6c052a30000dc810793b0e74476002d34d8d509fe2d4d57315da6b7cbcede917446d1e3614cfb22a47a808865fa73487253c9eebe8a8fbe72969bc36ad4f895068bf2818031475232fe085bb49e501a6bb202b1ab5a5dfdb8a1adbd31992aadbb0720d4ffebc5623871fa60c35e6ce7b403a7fd564adb8ca4e913bb05ce2418232a7970a6b38833021e0813d96cc6415a88b04aa0e5bb3640ca0dc3815e75449517ef2",
   "result": {
     "valid": true
   },
@@ -60,12 +55,12 @@
         "60f3ae300246e53d20ec89d0bce7f4ea8bb2f669f9b972f5e475401ab9a44ad1"
       ]
     },
-    "A_bar": "b5b84e7a44fe9c864d7aefa086af221b5635c08c91e07d51c735dec90b13a7b8377083f3fd726d22eafe2dcb89cc02b1",
-    "B_bar": "92a874481a1aa7858118cdbd7c7cba094f761cbe28f4b81c8cda6dc04cf4c4cfff481b29fc2443cb1c7ce94958de6a50",
-    "D": "97a3e15b348fb6bb89db4ce5a54281163f71e2dd5cf7b09e1d1b0474c54ac24f108293cabf24d6d3c85ffaae51cb28d3",
-    "T1": "b2a0a9b2349b2f5c8cf2cc9a49b21fb6e904a42499f576b81e76abe82d21ef6591525a43bc83a4186d493e84259d926e",
-    "T2": "9501f821a461b6374c58c316875c4bb535e566c3b57bf776a77603510e466e05380daccb13c3f085c03f5f4740211e06",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "368b52247b56ced2bbda18ed9649715e1f28d013d277c9f8d55e647544e03a5d"
+    "A_bar": "91316c2d47546e7eec8b974c58764d0002e9def61a4631f12e74a643a058f6aa95eb27b1b7b319635af43da84e9a1040",
+    "B_bar": "80542f0d9f5fbeacdc0e669d5a2e0678ace2d258032ce6ae4e9c7ad35b4739ab3aaba3a2592fdd3af1fd70fc4b31ba8f",
+    "D": "92f36dff7f48afd0afb0e1ea9123b0a1d1387f16bfba16d4e48f28a78dbe6a5c841c6ef939c268f7490f21878d81b39f",
+    "T1": "a31aaba48e0a2d09945a41472276d30842cc86e216880085c4c81b55d6c7a354a3076e41b8c97d03b130222effc07bd9",
+    "T2": "8fed3661429624cc42d72019ecede724622d0d76e6bfa498d3329492b98c6fc488e9f32eae6c54162f3facddb964ce0f",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "0a6b38833021e0813d96cc6415a88b04aa0e5bb3640ca0dc3815e75449517ef2"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof007.json b/fixture_data_blind/bls12-381-shake-256/proof/proof007.json
index 48fe9d2..3244558 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof007.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof007.json
@@ -16,16 +16,15 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
   "header": "11223344556677889900aabbccddeeff",
   "presentationHeader": "bed231d880675ed101ead304512e043ade9958dd0241ea70b4b3957fba941501",
   "revealedMessages": {},
   "revealedCommittedMessages": {},
-  "disclosedData": {},
-  "proof": "8de2b23c71d0cd0a2b1088ac05eca3956789465b81288f6a3d0597c9ca60b9d029f9e0871d8caa23e781752dcaa05a7f8c4b2766be6b4013b8498242faa4837f7a1a34f3642d8bb8424a5061421086846a247eeca1c00c623637f1af27f7cba98b282bdf73f94a2e53cd43d1376756a20a97fb727425bf897ba06d71c9ce347a5b581bd280ed5b9b7940a4bd995722c6685489e5eda2ef3961bc2cf6644f4258de9eba437b25a6341255d781c0dbcf3a24fac5113dcc696b1ea6b3c2a426d1d590312e41656919c66f5d7cfd98ce51106ddff816070342682ac54f3cdeacadf240c0f206fa34cc7f7ffa6247b62bf50e10a7ac678058fd00edb68cd7140d07f336cf10ef0cea7ba6518dc909873edb376e4fe0e9f45945c965096c33a7e5d83584554053fa3182aa24ae6206eb6f29052a3e49d3c26c89a61ef596a133fd9656ec0de0e6f01cdba4cc97ca75ccb1453714de703017cc020493b5b136effd04fd67050b06cb02efe6440a86d041ab59b46480c960ec0fade14a07dcebc84a1364aa50bc8060417cb5217485284b25e19b3026fdf907c9d58a986a3495f22773acbb1d02d0ce686acd47191c220dff271424077a3dc963abf2cec87a2fd380283df0167083493f1e9403c3d063fda6f6e12ddae5d61a7869a2ad0b334cc1d6de7725f027218b8b4cea653dbf11ad253cce670067192d32dba2a09f17149806b8fadc523a20d3004f3065bccc2291fd5c01147168ea88816c7d808358048937b160cdf6c83e837acf1955bb4c313c58eb393ce52e26c5a2c06f3daf40140906f47fc8bb964b45273b359ee0428c3eaa85c46c2a2a3c48c1955ed949a2774c7b4b95ddff6fc70ed20bed5cf86a9bdc4ff7712f5cef5d276dc0198ce4f46e2cc5aec156916e09d1f9f7994f34e8a3b018dc6b685d2925fee720c82d890bcf02626230e04fd15e54e019992173f1bc22c8832952dffa7f1fbfa1efd370e6b69d822ac4dc12737392079d9dea2a3d7dc954a0c926223423620be62f2bac962160ce01cec47321f3f92d1edd0a09356b6420ba8f2ade300ccd65d135eb140e629d65ec2116260c76eec6bf46af46c07768e50ea9",
+  "proof": "8b3f43fbbf9649ee4992f8f9659261229ea655edcf678c498387eb35b5a1bfc9a6e75c35a0e278bd287dee634ea7ec999283bee904996317f39fe21acd540d54d5b059a03fe710c3a7c7458903f1ce7f571f24f8d0b4c33e8a360156da17cd2a88ff88dda253a3514af6af70b8ca6d70b1b90ffe7a5f1ae1f84e0b5b773e03d7bc3e6c802a908338cf2f4f9a4259472526f4e747167f3cdbf2f715e466a9b7d08f3c7233f217b619725b6c3223c7b84c377876d362203f249d66cde6896b6cc60a42f853dc5ff3da5a07fb84d58d6cf97171ef532345c47e174cf361f02d77b9d8ab6a071841fe9b43eea903f2deea9a2d0a8a31d838682699132b1bddf9f3dd47fca6888f74551c7cc0a11c65330a5c05eeeb95894d65abada470d07712632baeeb40394aa01df3ec04032742d3bfee0cfee07ed3842cbaf27b31a45f95e8435fa4a571ee0b417d264c62170397c4e04844a32d9b5688e5b94e1f62deb87394663e5c832d8d167ed7d45fbcf4eefc813f542cd9e9e4802d9e80ca56a60fe06d86cf22d364d72e1bb0472d56bc80796e6f978707e9b6d67bcfafceb5f57cc6a41b30b9f3c64871af1f97e0ad28edaf905b9f72035daacd33e1535aacf2c44224f49cd6eb3b8d147a771491df19452f8139fe077219bc39ee073e05bf80d6250fcae0da2cc87df3e9998ad9d128ac6f5c078deef38e1d0b08ad4cb9aa14bcbea8520f2bcd0944a645b9334d73a1e0267a62b76a822e09754a749c4f4bb10bfcf0749dfec40056e60396a19c742bcb9bbe620ba677d47d28ef7c45105a93d4c61af612349ac323a6da07dfc302e3e42cc13d623d9d4ec6327efd0e94fa74bd0395ae8764846f75127f107a939dec73ca9201b1c920736b6c79bfae80d5b540eab88696d9cf2b6509bdeea769f6ee6acc0f5b641d7c0c4f10cffe8a5c40f92a63806b04e8c7827a519ec775080a5bad7a4a03fa6c4c7086176a0fd26ee56b22016af620a0ecbea6b2879dc8abd8844a2b8a54bad1220aa8ffc60313432d41fb9e730312cb8035d6200110545e919dee73be05732f303b6e7b458cc70e9a030cf9cad455a05707d0458785acc59bf834dfef",
   "result": {
     "valid": true
   },
@@ -55,12 +54,12 @@
         "5a4d330bd5d5fe02528f8c3b2a7d3dcc223d11452f2f772e95cc36b74fc4c60c"
       ]
     },
-    "A_bar": "8de2b23c71d0cd0a2b1088ac05eca3956789465b81288f6a3d0597c9ca60b9d029f9e0871d8caa23e781752dcaa05a7f",
-    "B_bar": "8c4b2766be6b4013b8498242faa4837f7a1a34f3642d8bb8424a5061421086846a247eeca1c00c623637f1af27f7cba9",
-    "D": "8b282bdf73f94a2e53cd43d1376756a20a97fb727425bf897ba06d71c9ce347a5b581bd280ed5b9b7940a4bd995722c6",
-    "T1": "80006e495e8293da2a6f5451548e593623e5988da761bdf8c0be7530387e0129a0fbf757f78e146a85f651b03958bcb3",
-    "T2": "b8cd62c9ba796c99037d951360a5217fc137cfef4bf43585defeb718b4fe350d8edc445d309cdbdb99985efa681d3b4a",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95",
-    "challenge": "2ade300ccd65d135eb140e629d65ec2116260c76eec6bf46af46c07768e50ea9"
+    "A_bar": "8b3f43fbbf9649ee4992f8f9659261229ea655edcf678c498387eb35b5a1bfc9a6e75c35a0e278bd287dee634ea7ec99",
+    "B_bar": "9283bee904996317f39fe21acd540d54d5b059a03fe710c3a7c7458903f1ce7f571f24f8d0b4c33e8a360156da17cd2a",
+    "D": "88ff88dda253a3514af6af70b8ca6d70b1b90ffe7a5f1ae1f84e0b5b773e03d7bc3e6c802a908338cf2f4f9a42594725",
+    "T1": "b47c7fdf1d5f18f776b436973084aef0d56550cc061584520ebd25b84bf2b9648111b2090aa6e275059c9517a7d6fd1d",
+    "T2": "a22a1474d8ef231d4acb70f707cb0b6f30a6fd373c5a39269142327015608ccbb03830106319691c9f6559db262600da",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04",
+    "challenge": "05732f303b6e7b458cc70e9a030cf9cad455a05707d0458785acc59bf834dfef"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/proof/proof008.json b/fixture_data_blind/bls12-381-shake-256/proof/proof008.json
index 7f68a7f..84a2ca9 100644
--- a/fixture_data_blind/bls12-381-shake-256/proof/proof008.json
+++ b/fixture_data_blind/bls12-381-shake-256/proof/proof008.json
@@ -12,7 +12,7 @@
     }
   },
   "signerPublicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5",
-  "signature": "8886984283bc433d56ac0f29bab40fb2273d0e7e42f5891c80c357473b504e2aae77658efbb0035cbf32771b7fe8dbbc3509d8e6d2a2a9917304e5a0650e9a6583edb53f82263222a92b41a531784d6e",
+  "signature": "abc558ec1e0899c9ad878d4fd19fe9d622920684038ecaf81488c1b67c1c49a6213f62674d08ac6eff67cf02b046ce4d4a70f7153dc7d6d4cbf17dc2a305acef53a4a4557ae63bdb87226df2e28df1d8",
   "commitmentWithProof": null,
   "proverBlind": null,
   "signerBlind": null,
@@ -26,14 +26,7 @@
     "8": "96012096"
   },
   "revealedCommittedMessages": null,
-  "disclosedData": {
-    "0": "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
-    "2": "7372e9daa5ed31e6cd5c825eac1b855e84476a1d94932aa348e07b73",
-    "4": "496694774c5604ab1b2544eababcf0f53278ff50",
-    "6": "d183ddc6e2665aa4e2f088af",
-    "8": "96012096"
-  },
-  "proof": "8fa620d86d48ae44e658bfc2b414fad0e6f1333e3a852eb455b38144760850d81b828d55aa7d010090e411a448fad299b484d2871adfce8c62d35c262729e602751006905d9a3e34b4862fb4761a3795e16229f4993da7beef62560ab960d96c88ea4ab174786e16359f47da8f036ced2e839781a1fa809917284b334efd3f8b4efd24dc20082f2e6dde9efb4581a42a19299171a5818d227a190727fb62a05a7038497dd2ec00013c5e3b7b7d2546f62331a9700dfa311dcffaca4484c9f36156ab2e13871b7b8285fec34c1766cc49419709dde4e65a92bdd5c79b00d3c2751932695a52a213704f9c91b20341c73a5035fbc008bcb92ef75aae3e7879c562c2185da089fd17a6ce8c005c85d3f22f66304286cc954b89d3a1afc4d25e77ef1e9f8759582874e84e312b875523a66150e15ef4092933436e65c8365cb375e5e1c03cf418576080c66ad936faef3b170ebd1e30068c7e98f50678083f328ebe4a30ee5974130e931e87474b006b7900632bb71522ff387d83253ddc8247502eef23db0959970bab30b62ffafe36e5bd5a8a07acfe29f665af21240f7833e5a7ed093c25e8a00a22c35a151d7a9af838",
+  "proof": "b253fe314909bcc37d6ead780a45928b897b861df3ba0f2c17ba840a4e217d9e8012ae2592071bdd6631c11b9976bcf691505448e21f8eaf2203dcc1c420b8de04b019ab97500209344625de28897c7ef3c53b9648f26ccc664c960500425b5690e1a97c1b0d339107ae11f72cc2662b304b2fabc7fc3b3752d85f831873cf2ae01919569fa98f68182fa99847e4e7164fc6c351dbad13920dd6305222ad828dc1f2b3975b5ad7ceded3eec02626fb0402f777334696b7bb08a554f354ae1edb98a9b19f1779ab5916d3358047e9531268a774ea28faa6f59bcafca49c0aec12984639770aa4538ef169b0185c6356e55f1e9bee32b3b2c591fe33d50b4e578c80ed8e17b5518f4643ff6083bc9b76f023e0ab9422bc613b7f880da93a1601600f1f4cb7edd0ac8013099fcc25685b3b0c1530c32568059c27dd07555d044488a5597e1696c7890810ca5d72c5b12baf5b5344e6583a7d11f827b25cb825b62a1fcf038962735dba259f656a97fe12063ebe486df17dcd7893ef1ab894a50e9bb4de1b223db65e88e51f4371d8d8350265f2bf6e3dcde2dece63dd45ffcdecc8019f04664cb245f45ecdbc945e8a47723209efc268ab0e1f8266a1c283c91434fcd8c149ac811b1b34677495c7ee0a79",
   "result": {
     "valid": true
   },
@@ -49,15 +42,16 @@
         "441e55f5927fb14f4059f4d4c7aad45b72349b50436cd8d2cd5ae3666ecd64dd",
         "10292482d9e08dc8d3a14223dfdbe4a14433ddfbff0950732a12f99edd78efd9",
         "1acd7900624f83027ee6c7700c579d10eaa0060dba6b94322470949717394645",
-        "4e525012cc1649cd7a6a4d3a16899e39b9d877243716e6212effb6320294a382"
+        "4e525012cc1649cd7a6a4d3a16899e39b9d877243716e6212effb6320294a382",
+        "65f2bf6e3dcde2dece63dd45ffcdecc8019f04664cb245f45ecdbc945e8a4772"
       ]
     },
-    "A_bar": "8fa620d86d48ae44e658bfc2b414fad0e6f1333e3a852eb455b38144760850d81b828d55aa7d010090e411a448fad299",
-    "B_bar": "b484d2871adfce8c62d35c262729e602751006905d9a3e34b4862fb4761a3795e16229f4993da7beef62560ab960d96c",
-    "D": "88ea4ab174786e16359f47da8f036ced2e839781a1fa809917284b334efd3f8b4efd24dc20082f2e6dde9efb4581a42a",
-    "T1": "a16e8bfa6283d39547678e9d02ac67ce786b6f322e6417b6d53b1609ee11e9c037b9da87048824c9e5647832b7f917bc",
-    "T2": "af8fdc785001adf4baf4513baf913a158409172ece061c6e452d0f97f556b810aa8710e9cb2431d993084809e3af62bd",
-    "domain": "4e6f04eeb36ed65d8f088e7adf6c106c0db79527243ce19389514b389acf7adf",
-    "challenge": "5a8a07acfe29f665af21240f7833e5a7ed093c25e8a00a22c35a151d7a9af838"
+    "A_bar": "b253fe314909bcc37d6ead780a45928b897b861df3ba0f2c17ba840a4e217d9e8012ae2592071bdd6631c11b9976bcf6",
+    "B_bar": "91505448e21f8eaf2203dcc1c420b8de04b019ab97500209344625de28897c7ef3c53b9648f26ccc664c960500425b56",
+    "D": "90e1a97c1b0d339107ae11f72cc2662b304b2fabc7fc3b3752d85f831873cf2ae01919569fa98f68182fa99847e4e716",
+    "T1": "8a7302ad35f4207653c47edc6b7f387cce99fa86ff70a5b321883ce7597c51ecf9e0868f01ee8a88f75185831c3fcbb3",
+    "T2": "93de57520db22920522b0333764b0d28c19883c5464230e8529555a28cee9614f55c7ec33c568eed567dcb26bff8e944",
+    "domain": "62638964b2b8eb67c2635a8b87731e2f876e7e84fc4f051903022a731c5fe3b8",
+    "challenge": "3209efc268ab0e1f8266a1c283c91434fcd8c149ac811b1b34677495c7ee0a79"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/signature/signature001.json b/fixture_data_blind/bls12-381-shake-256/signature/signature001.json
index a362841..568f668 100644
--- a/fixture_data_blind/bls12-381-shake-256/signature/signature001.json
+++ b/fixture_data_blind/bls12-381-shake-256/signature/signature001.json
@@ -15,18 +15,18 @@
     "secretKey": "2eee0f60a8a3a8bec0ee942bfd46cbdae9a0738ee68f5a64e7238311cf09a079",
     "publicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5"
   },
-  "commitmentWithProof": "95a6f21801b2010a9016c590cd6f0d59682e908a46cdc9856eea2c5000545626fc755c13ce93a71e371b0ae05491326302a8e40b4fc1197d75c46d2114c711d9186e4af0498dab260ae56f81dbc59f7b2a9f4883479ce40e765a32b6481766ed5aeeddecd2decd277460a5e129a22934",
+  "commitmentWithProof": "b6389b0fdf04b9c35165acb11685e02193c53c3c1bb8ef3a9404dcee1727a365a3ac6ba7fc32654101cc72cc0ee7d32b23d2018bd6dc2f932c71d4401e763d4ed9999ee6c98837aa7dbe823050697dd744b05920ad0b6393e94f9b86e92d419406945f1e79d4be58dbaf9dc95237c951",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [],
   "committedMessages": [],
   "proverBlind": "30bd5c9bd2b61c44dd169c92cf28bb607830c56073f10e7a800c857cb05ec249",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
-  "signature": "90c93d864fb857dc4290e1cb2f6c82973c2562b4bfb8edb61c2300da84b7d709733024c215acc0e224ee4b64ab5987d0312e84786009cece2aee01884b19c81a592aefb557f025fccdd8c67ca0a5d8c3",
+  "signature": "94e59d341a107330ebee0f7022bfe8639139c1383a945a9371fbc3046f71cec86fd6528d98b7ba388da6394cfc4ca62645cba02f83bb6a6c3ab736d7e45f60fd7506d28ee86b7e2a1c81cb86d4acf722",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "b34e5cf13d77074c4762d92f98cc6b8c2567c816a2ea792d0f49263b8da314b5493830b78563fdb9e2abcab2a7a3c21f",
-    "domain": "41f87ee87af7a093831d77576c64d41e0d89bcd05ea6c9dd5be25bce3c728c55"
+    "B": "96d691cae20b5089b65383a1a39e33efef0e00c5a88d779af0895daddaad1f79bc361ae64458b69db1741077c9b63e54",
+    "domain": "48d64a62d7dbc8d88d643f15b3c8a1eed78afe3a80bc3e41bc2f92257b25f6d8"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/signature/signature002.json b/fixture_data_blind/bls12-381-shake-256/signature/signature002.json
index b1d9a67..1f7391b 100644
--- a/fixture_data_blind/bls12-381-shake-256/signature/signature002.json
+++ b/fixture_data_blind/bls12-381-shake-256/signature/signature002.json
@@ -15,7 +15,7 @@
     "secretKey": "2eee0f60a8a3a8bec0ee942bfd46cbdae9a0738ee68f5a64e7238311cf09a079",
     "publicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5"
   },
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [],
   "committedMessages": [
@@ -27,12 +27,12 @@
   ],
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
-  "signature": "b788904003da89dc167016c3d58a296a145c411df7cc616cfeb79db8d07d5361210ef79599453acc7ee706d80e114be369ca4043e008ea4373e1d3d7bb60c11161d1d6d67ad23a808f0ce52677c724dd",
+  "signature": "86f46e9f656965c1f88f5f58243127ddc37fd38f4edba8e1d111d0c0aabaff1cd5d10b9b918933b743744b61c0ddce9e0764552e596674db723e7234233c7c97dd14270c7a0fffc70ef65b2e1137004a",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "a537c41dd0dac2de5d21296e32e43f07b27e2ea4c1757247c36fdf7d5541d9e97a483e0b729a8b83638f15fba0cbda29",
-    "domain": "2ff95924f5218644c1a5d1722d815146e5b2c195d231421aea572e00527849d2"
+    "B": "b7fc207ed2d77c2e4058acf2ef5f3b0b4ee822fcf8de0a5fde095db175fa8bfa39af4b46fc9402cd9cd48a60be77c57e",
+    "domain": "3600988bb64779f01c57bfb0524521bc241aa0fdfc92e1b892ac2066edcceef1"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/signature/signature003.json b/fixture_data_blind/bls12-381-shake-256/signature/signature003.json
index a9348ad..b8097ab 100644
--- a/fixture_data_blind/bls12-381-shake-256/signature/signature003.json
+++ b/fixture_data_blind/bls12-381-shake-256/signature/signature003.json
@@ -15,7 +15,7 @@
     "secretKey": "2eee0f60a8a3a8bec0ee942bfd46cbdae9a0738ee68f5a64e7238311cf09a079",
     "publicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5"
   },
-  "commitmentWithProof": "95a6f21801b2010a9016c590cd6f0d59682e908a46cdc9856eea2c5000545626fc755c13ce93a71e371b0ae05491326302a8e40b4fc1197d75c46d2114c711d9186e4af0498dab260ae56f81dbc59f7b2a9f4883479ce40e765a32b6481766ed5aeeddecd2decd277460a5e129a22934",
+  "commitmentWithProof": "b6389b0fdf04b9c35165acb11685e02193c53c3c1bb8ef3a9404dcee1727a365a3ac6ba7fc32654101cc72cc0ee7d32b23d2018bd6dc2f932c71d4401e763d4ed9999ee6c98837aa7dbe823050697dd744b05920ad0b6393e94f9b86e92d419406945f1e79d4be58dbaf9dc95237c951",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
@@ -32,12 +32,12 @@
   "committedMessages": [],
   "proverBlind": "30bd5c9bd2b61c44dd169c92cf28bb607830c56073f10e7a800c857cb05ec249",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
-  "signature": "81d03e119cf3a1257a58b288c27132d0ec37e3695eb37ecc064094221baa4f9775483ed57227385659498480f8e92d8d28a9f576cbdc2f2613c68d6184598dc47d9c12cc94654072bd9ee708f72d02b5",
+  "signature": "aefec656164a1d429acf8d7f1a7daf1fe2fcc959428633fc76748d15f4515f2c1ff7d26a6e784b20c743f9d01c8f73d51fe9585124b79cf0122ee58acb41e0e1e6940af4ad3eab5fb63e2438a946be94",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "92c9bd227788c660f82397b7cadbebdcb83bfc4256362605caebd57849ca17371c5dd67af7b763f0c207eb73cd0d9d97",
-    "domain": "1561412ed694d0eb532e042ae2098fc999325394317c686ce94a84db29552100"
+    "B": "b5f5dfb257702b03b05bb835b2ec5be89f17a490e6b0a3c0fb5f47fb0845c84450533bebb5921efffd48417071ea4c46",
+    "domain": "62638964b2b8eb67c2635a8b87731e2f876e7e84fc4f051903022a731c5fe3b8"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/signature/signature004.json b/fixture_data_blind/bls12-381-shake-256/signature/signature004.json
index 6ab91ed..fb181b5 100644
--- a/fixture_data_blind/bls12-381-shake-256/signature/signature004.json
+++ b/fixture_data_blind/bls12-381-shake-256/signature/signature004.json
@@ -15,7 +15,7 @@
     "secretKey": "2eee0f60a8a3a8bec0ee942bfd46cbdae9a0738ee68f5a64e7238311cf09a079",
     "publicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5"
   },
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
@@ -38,12 +38,12 @@
   ],
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": "49541deb67dc42d5509d39548637959bc43e105fff02c780a308c78e0a1e3c7f",
-  "signature": "95ef34d43451fe55d3887c7d32955641dbd13814db0d5d55e63fee1f0d8e2bf5601924eb4e5015e895b5affe96f96d274bfcd2c2c902883cb210f2bfca6b6c50b8e6768cda43000e6db777e2e0961fd9",
+  "signature": "98699909137b16b5ebfdec7396d515f606415353f4ef0a329db11bb2fddd266900e54219da5cec913c1d4593b8231a1842c1659bc991b18e778c195540621d097d0288aba536052b1d14510d3ed165f5",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "aad174dad5a717f105ef200da94a6a16ee1354f3a0095f082b9b3f621072e438f6889182cfec55d2db07d1b899e96c3d",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95"
+    "B": "aae3698e7234be35ab7310270e9ed3a9f000b5a94ad3ea0a2d5a8677331de7dc806a0ac97c94f76a508b85ac386655a6",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/signature/signature005.json b/fixture_data_blind/bls12-381-shake-256/signature/signature005.json
index e0ecd03..299be81 100644
--- a/fixture_data_blind/bls12-381-shake-256/signature/signature005.json
+++ b/fixture_data_blind/bls12-381-shake-256/signature/signature005.json
@@ -15,7 +15,7 @@
     "secretKey": "2eee0f60a8a3a8bec0ee942bfd46cbdae9a0738ee68f5a64e7238311cf09a079",
     "publicKey": "92d37d1d6cd38fea3a873953333eab23a4c0377e3e049974eb62bd45949cdeb18fb0490edcd4429adff56e65cbce42cf188b31bddbd619e419b99c2c41b38179eb001963bc3decaae0d9f702c7a8c004f207f46c734a5eae2e8e82833f3e7ea5"
   },
-  "commitmentWithProof": "a90a9c986623c7df72f1b55f885a7f25070d5b73178f7139fd6e948067e9f748b1cc0d4db3cbb9123a18851714ec9c161b678690dbd0ae67f4bac061bb80824ba208906d581586971c6a32e2a162eddf0ed4a8cc260f2cc9b505fd5ea078d21ae76159866c476cb129ad719511edbac763ec9b34c7943c520f598bacd7775e8345a9b3c2c2490fab27c97f1529ff319b4995ea15ff5e46ec26347d6a6bbf2e4b2a8da145f6afd5444464d86f79cd7df32fcc665b9245e138c752decfb3d507f2024af86b202741bf946e199ac77730a070821d7df69ce563d2d4142572431047dc6b544e4a8280ada8c3c01a2d3f454e4cf1dc293f09e6a5b743f275286ce601f28b1838441265c1c18b4425b8bd3d5c",
+  "commitmentWithProof": "85d8034b358566ebfd26f921211b257d30def9962ddf80dc7cbdbf96da2bf598a8bbdc03bdc311ff290673ab29edf4a642be726c577a1aaeb11d00d10c5a07c824bbf8e47af13042f570b6bfc05e42783d70fb3ee76ab7c2565fda74ed6536e14105adf9ae943736a6c96c1102d1dc4424eda4ee1961f0d450736d1cc9f6b3ad2f9f1bcd3b63ef5445798b65ad04806240edee143b5c7c57f61ab7fc9fd8f0b05d984e12cee674541b6a79202931e0ef11bcfc908660861b48cfd4ce0970c9726d9359b4bd0c853da78891e9c9db41f2029195279d92f6831b37b5c6d5ac28840e97c12f7962e65adac6705ae712daa61c0c0bda85a3da6850a8dce296797beff88b1c8e8459dba0730ecace09177f79",
   "header": "11223344556677889900aabbccddeeff",
   "messages": [
     "9872ad089e452c7b6e283dfac2a80d58e8d0ff71cc4d5e310a1debdda4a45f02",
@@ -38,12 +38,12 @@
   ],
   "proverBlind": "41fb2f74c30256398c927a262602b5ac3ebc6f84d9169476f8fcb1525c93b649",
   "signerBlind": null,
-  "signature": "b074112a56caea128a775a9588ab9d2c168fbc40450ecb7b559d6ffb61989896f24783816324ffb55bade3d75c4edfdd03c8effa3dddc82612be454e3c22df986af1e230c136d20cdaa3f4ad2195e39b",
+  "signature": "823d5849764eff90d9d57252233dc4b2a694224f90d56cc81bcbcc0b3293096f3f4fdb309e06c1163a47bc61b681fdb149bf605aaf3ec89d0784e3cca39500d6acd0356d90c8ba6bef9ef6960bb60be1",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "81717a1f1c72a748c6a071d58bab0f830169da872d79decde1212ef439f8a153340dcc9e61522f518980d0e584969178",
-    "domain": "279f17f14e7e3986bb71cf6c8a1018460596e62eea6ed91bb81b9706f4729f95"
+    "B": "95e018b5b7fe84bff803e829231870d1dec64608083a6a7b4b8f5be66ee9a6e25a6d067f528e48712528205ae9cdf340",
+    "domain": "04ad1197bffbb54ae41c1d43c61dc29325c2dc771d5cc7dba67907b17f564a04"
   }
 }
\ No newline at end of file
diff --git a/fixture_data_blind/bls12-381-shake-256/signature/signature006.json b/fixture_data_blind/bls12-381-shake-256/signature/signature006.json
index d6c9aea..c07fb2d 100644
--- a/fixture_data_blind/bls12-381-shake-256/signature/signature006.json
+++ b/fixture_data_blind/bls12-381-shake-256/signature/signature006.json
@@ -28,12 +28,12 @@
   "committedMessages": null,
   "proverBlind": null,
   "signerBlind": null,
-  "signature": "8886984283bc433d56ac0f29bab40fb2273d0e7e42f5891c80c357473b504e2aae77658efbb0035cbf32771b7fe8dbbc3509d8e6d2a2a9917304e5a0650e9a6583edb53f82263222a92b41a531784d6e",
+  "signature": "abc558ec1e0899c9ad878d4fd19fe9d622920684038ecaf81488c1b67c1c49a6213f62674d08ac6eff67cf02b046ce4d4a70f7153dc7d6d4cbf17dc2a305acef53a4a4557ae63bdb87226df2e28df1d8",
   "result": {
     "valid": true
   },
   "trace": {
-    "B": "94ff8f3965846c90397b2e3a38dd0349f4b7ba049209fc99048f482ba21147e1c5bbe7f102fea9af93f47a7c5ad5a899",
-    "domain": "4e6f04eeb36ed65d8f088e7adf6c106c0db79527243ce19389514b389acf7adf"
+    "B": "8ce18ec220f427e23eced9bc5d6a90bf242941676569b406a179e7fe8a3d1c3ba7fd0271ce37817876e55fe1fdf598e5",
+    "domain": "62638964b2b8eb67c2635a8b87731e2f876e7e84fc4f051903022a731c5fe3b8"
   }
 }
\ No newline at end of file
diff --git a/src/bbsplus/blind.rs b/src/bbsplus/blind.rs
index 393122d..8283a6e 100644
--- a/src/bbsplus/blind.rs
+++ b/src/bbsplus/blind.rs
@@ -33,7 +33,7 @@ use bls12_381_plus::{G1Projective, Scalar};
 use elliptic_curve::hash2curve::ExpandMsg;
 
 impl<CS: BbsCiphersuite> BlindSignature<BBSplus<CS>> {
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-blind-signature-generation
+    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-blind-signature-generation
     ///
     /// # Description
     /// This operation returns a BBS blind signature from a secret key (SK), over a header, a set of messages and optionally a commitment value. If supplied, the commitment value must be accompanied by its proof of correctness (commitment_with_proof). The issuer can also further randomize the supplied commitment, by supplying a random scalar (signer_blind)
@@ -74,7 +74,9 @@ impl<CS: BbsCiphersuite> BlindSignature<BBSplus<CS>> {
                 .ok_or(Error::InvalidCommitmentProof)?;
         }
 
-        let generators = Generators::create::<CS>(M + L + 1, Some(CS::API_ID_BLIND));
+        let generators = Generators::create::<CS>(L + 1, Some(CS::API_ID_BLIND));
+        let blind_generators =
+            Generators::create::<CS>(M + 1, Some(&[b"BLIND_", CS::API_ID_BLIND].concat()));
 
         let message_scalars = BBSplusMessage::messages_to_scalar::<CS>(messages, CS::API_ID_BLIND)?;
 
@@ -82,6 +84,7 @@ impl<CS: BbsCiphersuite> BlindSignature<BBSplus<CS>> {
             sk,
             pk,
             &generators,
+            &blind_generators,
             commitment_with_proof,
             header,
             &message_scalars,
@@ -92,7 +95,7 @@ impl<CS: BbsCiphersuite> BlindSignature<BBSplus<CS>> {
         Ok(Self::BBSplus(blind_sig))
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-blind-signature-verificatio
+    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-blind-signature-verificatio
     ///
     /// # Description
     /// This operation validates a blind BBS signature ([`BBSplusSignature`]), given the Signer's public key (PK), a header (header), a set of known to the Signer messages (messages) and if used, a set of committed messages (committed_messages), the `secret_prover_blind` as returned by the [`Commitment::commit`] operation and a blind factor supplied by the Signer (`signer_blind`).
@@ -121,31 +124,35 @@ impl<CS: BbsCiphersuite> BlindSignature<BBSplus<CS>> {
     ) -> Result<(), Error> {
         let messages = messages.unwrap_or(&[]);
         let committed_messages = committed_messages.unwrap_or(&[]);
+        let api_id = CS::API_ID_BLIND;
 
-        let mut message_scalars = Vec::new();
+        let L = messages.len();
+        let M = committed_messages.len();
 
-        let secret_prover_blind = secret_prover_blind.unwrap_or(&BlindFactor(Scalar::ZERO));
+        let generators = Generators::create::<CS>(L + 1, Some(api_id));
+        let blind_generators = Generators::create::<CS>(M + 1, Some(&[b"BLIND_", api_id].concat()));
 
-        if secret_prover_blind.0 != Scalar::ZERO {
-            let signer_blind = signer_blind.unwrap_or(&BlindFactor(Scalar::ZERO));
-            let message = BBSplusMessage::new(secret_prover_blind.0 + signer_blind.0);
-            message_scalars.push(message);
-        }
+        let message_scalars = BBSplusMessage::messages_to_scalar::<CS>(messages, api_id)?;
 
-        let api_id = CS::API_ID_BLIND;
-        message_scalars.extend(BBSplusMessage::messages_to_scalar::<CS>(
-            committed_messages,
-            api_id,
-        )?);
-        message_scalars.extend(BBSplusMessage::messages_to_scalar::<CS>(messages, api_id)?);
+        let blind_factor = BBSplusMessage::new(
+            secret_prover_blind.map_or(Scalar::ZERO, |b| b.0)
+                + signer_blind.map_or(Scalar::ZERO, |b| b.0),
+        );
+        let committed_message_scalars =
+            BBSplusMessage::messages_to_scalar::<CS>(committed_messages, api_id)?;
 
-        let generators = Generators::create::<CS>(message_scalars.len() + 1, Some(api_id));
+        let tmp_messages = [
+            &*message_scalars,
+            core::slice::from_ref(&blind_factor),
+            &*committed_message_scalars,
+        ]
+        .concat();
 
         core_verify::<CS>(
             pk,
             self.bbsPlusBlindSignature(),
-            &message_scalars,
-            generators,
+            &tmp_messages,
+            generators.append(blind_generators),
             header,
             Some(api_id),
         )
@@ -181,7 +188,7 @@ impl<CS: BbsCiphersuite> BlindSignature<BBSplus<CS>> {
     }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-core-blind-sign
+/// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-core-blind-sign
 ///
 /// # Description
 /// This operation computes a blind BBS signature, from a secret key (SK), a set of generators (points of G1), a supplied commitment with its proof of correctness (commitment_with_proof), a header (header) and a set of messages (messages). The operation also accepts a random scalar (signer_blind).
@@ -203,6 +210,7 @@ fn core_blind_sign<CS>(
     sk: &BBSplusSecretKey,
     pk: &BBSplusPublicKey,
     generators: &Generators,
+    blind_generators: &Generators,
     commitment_with_proof: &[u8],
     header: Option<&[u8]>,
     messages: &[BBSplusMessage],
@@ -213,42 +221,55 @@ where
     CS: BbsCiphersuite,
     CS::Expander: for<'a> ExpandMsg<'a>,
 {
+    let signer_blind = signer_blind.unwrap_or(&BlindFactor(Scalar::ZERO));
     let api_id = api_id.unwrap_or(b"");
     let signature_dst = [api_id, CS::H2S].concat();
-    let L = messages.len();
 
-    let (mut commit, M) = Commitment::<BBSplus<CS>>::deserialize_and_validate_commit(
+    let L = messages.len();
+    let Q1 = generators.values[0];
+    let H_points = &generators.values[1..];
+    let Q2 = blind_generators
+        .values
+        .first()
+        .copied()
+        .ok_or(Error::NotEnoughGenerators)?;
+
+    let mut commit = Commitment::<BBSplus<CS>>::deserialize_and_validate_commit(
         Some(commitment_with_proof),
-        generators,
+        blind_generators,
         Some(api_id),
     )?;
-    let Q1 = generators.values[0];
-
-    let Q2 = if commitment_with_proof.is_empty() {
-        G1Projective::IDENTITY
-    } else {
-        generators.values[1]
-    };
-
-    let signer_blind = signer_blind.unwrap_or(&BlindFactor(Scalar::ZERO));
 
-    let H_points = &generators.values[M + 1..M + L + 1];
-
-    let temp_generators = &generators.values[1..M + L + 1];
-
-    let domain = calculate_domain::<CS>(pk, Q1, temp_generators, header, Some(api_id))?;
+    // The Blind BBS spec says to pass `generators.append(blind_generators)` to a
+    // `calculate_domain`, but it does not name Q1 as its own parameter like
+    // draft-irtf-cfrg-bbs-signatures-06 does. This implementation of calculate_domain matches the
+    // general BBS spec, in which Q1 is its own parameter, so it's not included in the generators.
+    //
+    // It would appear that some of the directions in the spec here need to be clarified. The
+    // fixture with no commitmentWithProof requires the one blind generator that gets made, but
+    // otherwise we actually need to drop the last implied generator created here.
+    let tmp_generators = [
+        &generators.values[1..],
+        core::slice::from_ref(&Q2),
+        &blind_generators
+            .values
+            .get(1..blind_generators.values.len() - 1)
+            .unwrap_or_default(),
+    ]
+    .concat();
+    let domain = calculate_domain::<CS>(pk, Q1, &tmp_generators, header, Some(api_id))?;
 
     let mut e_octs: Vec<u8> = Vec::new();
     e_octs.extend_from_slice(&sk.to_bytes());
-    e_octs.extend_from_slice(&domain.to_bytes_be());
+    e_octs.extend_from_slice(commitment_with_proof);
+    if signer_blind.0 != Scalar::ZERO {
+        e_octs.extend_from_slice(&signer_blind.to_bytes());
+    }
     messages
         .iter()
         .map(|&p| p.value.to_bytes_be())
         .for_each(|a| e_octs.extend_from_slice(&a));
-    if signer_blind.0 != Scalar::ZERO {
-        e_octs.extend_from_slice(&signer_blind.to_bytes());
-    }
-    e_octs.extend_from_slice(commitment_with_proof);
+    e_octs.extend_from_slice(&domain.to_bytes_be());
 
     let e = hash_to_scalar::<CS>(&e_octs, &signature_dst)?; //TODO: Not sure where the Signature DST ("BBS_BLS12381G1_XMD:SHA-256_SSWU_RO_H2G_HM2S_SIGNATURE_MOCK_RANDOM_SCALARS_DST_") in the fixtures is used
     if signer_blind.0 != Scalar::ZERO {
@@ -256,16 +277,14 @@ where
     }
 
     let mut B = generators.g1_base_point + Q1 * domain;
-
     for i in 0..L {
         B += H_points[i] * messages[i].value;
     }
-
     B += commit;
 
     let sk_e = sk.0 + e;
     let sk_e_inv = Option::<Scalar>::from(sk_e.invert())
-        .ok_or(Error::BlindSignError("Invert scalar failed".to_owned()))?;
+        .ok_or_else(|| Error::BlindSignError("Invert scalar failed".to_owned()))?;
     let A = B * sk_e_inv;
 
     Ok(BBSplusSignature { A, e })
@@ -280,60 +299,36 @@ mod tests {
             keys::{BBSplusPublicKey, BBSplusSecretKey},
         },
         schemes::{
-            algorithms::{BBSplus, BbsBls12381Sha256, Scheme},
+            algorithms::{BBSplus, BbsBls12381Sha256, BbsBls12381Shake256, Scheme},
             generics::BlindSignature,
         },
     };
     use elliptic_curve::hash2curve::ExpandMsg;
     use std::fs;
 
-    //Blind Sign - SHA256 - UPDATED
-    #[test]
-    fn blind_sign_sha256_1() {
-        blind_sign::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "signature/signature001.json",
-        );
-    }
-
-    #[test]
-    fn blind_sign_sha256_2() {
-        blind_sign::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "signature/signature002.json",
-        );
-    }
-
-    #[test]
-    fn blind_sign_sha256_3() {
-        blind_sign::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "signature/signature003.json",
-        );
+    macro_rules! sign_tests {
+        ( $( ($t:ident, $p:literal): { $( ($n:ident, $f:literal), )+ },)+ ) => { $($(
+            #[test] fn $n() { blind_sign::<$t>($p, $f); }
+        )+)+ }
     }
 
-    #[test]
-    fn blind_sign_sha256_4() {
-        blind_sign::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "signature/signature004.json",
-        );
-    }
-
-    #[test]
-    fn blind_sign_sha256_5() {
-        blind_sign::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "signature/signature005.json",
-        );
-    }
-
-    #[test]
-    fn blind_sign_sha256_6() {
-        blind_sign::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "signature/signature006.json",
-        );
+    sign_tests! {
+        (BbsBls12381Sha256, "./fixture_data_blind/bls12-381-sha-256/"): {
+            (blind_sign_sha256_1, "signature/signature001.json"),
+            (blind_sign_sha256_2, "signature/signature002.json"),
+            (blind_sign_sha256_3, "signature/signature003.json"),
+            (blind_sign_sha256_4, "signature/signature004.json"),
+            (blind_sign_sha256_5, "signature/signature005.json"),
+            (blind_sign_sha256_6, "signature/signature006.json"),
+        },
+        (BbsBls12381Shake256, "./fixture_data_blind/bls12-381-shake-256/"): {
+            (blind_sign_shake256_1, "signature/signature001.json"),
+            (blind_sign_shake256_2, "signature/signature002.json"),
+            (blind_sign_shake256_3, "signature/signature003.json"),
+            (blind_sign_shake256_4, "signature/signature004.json"),
+            (blind_sign_shake256_5, "signature/signature005.json"),
+            (blind_sign_shake256_6, "signature/signature006.json"),
+        },
     }
 
     fn blind_sign<S: Scheme>(pathname: &str, filename: &str)
@@ -370,10 +365,16 @@ mod tests {
             None => None,
         };
 
-        let signer_blind: Option<[u8; 32]> = proof_json["signerBlind"]
-            .as_str()
-            .and_then(|s| hex::decode(s).ok())
-            .and_then(|b| b.try_into().ok());
+        let signer_blind: Option<[u8; 32]> = match proof_json["signerBlind"] {
+            serde_json::Value::Null => None,
+            serde_json::Value::String(ref s) => Some(
+                hex::decode(s)
+                    .ok()
+                    .and_then(|s| s.as_slice().try_into().ok())
+                    .expect("invalid signerBlind"),
+            ),
+            _ => panic!("invalid signerBlind"),
+        };
         let header = hex::decode(proof_json["header"].as_str().unwrap()).unwrap();
         let messages: Vec<String> = proof_json["messages"]
             .as_array()
diff --git a/src/bbsplus/commitment.rs b/src/bbsplus/commitment.rs
index 2e9d7c4..0a4fe86 100644
--- a/src/bbsplus/commitment.rs
+++ b/src/bbsplus/commitment.rs
@@ -78,28 +78,27 @@ impl<CS: BbsCiphersuite> Commitment<BBSplus<CS>> {
         Ok((Self::BBSplus(commitment_with_proof), secret))
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-commitment-validation-and-d
+    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-commitment-validation-and-d
     ///
     /// # Description
     /// The following is an API used by the `core_blind_sign` procedure to validate an optional commitment. The commitment input to `core_blind_sign` is optional. If a commitment is not supplied, or if it is the Identity_G1, the following operation will return the Identity_G1 as the commitment point, which will be ignored by all computations during `core_blind_sign`.
     ///
     /// # Inputs:
     /// * `commitment_with_proof` (OPTIONAL), octet string representing the serialization of [`BBSplusCommitment`]. If it is not supplied it defaults to the empty octet string.
-    /// * `generators` (REQUIRED), vector of points of G1.
+    /// * `blind_generators` (REQUIRED), vector of points of G1.
     /// * `api_id` (OPTIONAL), octet string. If not supplied it defaults to the empty octet string ("").
     ///
     /// # Output:
-    /// * ([`G1Projective`], [`usize`]), a tuple comprising from commitment and M; or [`Error`].
+    /// * [`G1Projective`], a commitment; or [`Error`].
     ///
     pub fn deserialize_and_validate_commit(
         commitment_with_proof: Option<&[u8]>,
-        generators: &Generators,
+        blind_generators: &Generators,
         api_id: Option<&[u8]>,
-    ) -> Result<(G1Projective, usize), Error> {
+    ) -> Result<G1Projective, Error> {
         let commitment_with_proof = commitment_with_proof.unwrap_or(&[]);
-
         if commitment_with_proof.is_empty() {
-            return Ok((G1Projective::IDENTITY, 0usize));
+            return Ok(G1Projective::IDENTITY);
         }
 
         let commitment_with_proof = Self::from_bytes(commitment_with_proof)?;
@@ -110,15 +109,12 @@ impl<CS: BbsCiphersuite> Commitment<BBSplus<CS>> {
         };
 
         let M = proof.m_cap.len() + 1;
-
-        if generators.values.len() < M + 1 {
+        if blind_generators.values.len() < M {
             return Err(Error::NotEnoughGenerators);
         }
 
-        let blind_generators = &generators.values[1..M + 1];
-
-        if verify_commitment::<CS>(commitment, &proof, &blind_generators, api_id).is_ok() {
-            Ok((commitment, M))
+        if verify_commitment::<CS>(commitment, &proof, &blind_generators.values, api_id).is_ok() {
+            Ok(commitment)
         } else {
             Err(Error::InvalidCommitmentProof)
         }
@@ -153,7 +149,7 @@ impl BlindFactor {
     }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-commitment-computation
+/// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-commitment-computation
 ///
 /// # Description
 /// This operation is used by the Prover to create a commitment to a set of messages (committed_messages), that they intend to include to the blind signature. Note that this operation returns both the serialized combination of the commitment and its proof of correctness (commitment_with_proof), as well as the random scalar used to blind the commitment (secret_prover_blind).
@@ -174,16 +170,16 @@ where
     CS::Expander: for<'a> ExpandMsg<'a>,
 {
     let committed_messages = committed_messages.unwrap_or(&[]);
-    let M = committed_messages.len();
     let api_id = api_id.unwrap_or(b"");
 
-    let commited_message_scalars =
-        BBSplusMessage::messages_to_scalar::<CS>(committed_messages, api_id)?;
+    let M = committed_messages.len();
+    let generators = Generators::create::<CS>(M + 1, Some(&[b"BLIND_", api_id].concat())).values;
 
-    let generators = Generators::create::<CS>(M + 2, Some(api_id)).values;
+    let Q2 = generators[0];
+    let Js = &generators[1..M + 1];
 
-    let Q2 = generators[1];
-    let Js = &generators[2..M + 2];
+    let commited_message_scalars =
+        BBSplusMessage::messages_to_scalar::<CS>(committed_messages, api_id)?;
 
     #[cfg(not(test))]
     let random_scalars = calculate_random_scalars(M + 2);
@@ -226,7 +222,7 @@ where
     Ok((commitment_with_proof, secret_prover_blind))
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-commitment-verification
+/// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-commitment-verification
 ///
 /// # Description
 /// This operation is used by the Signer to verify the correctness of a commitment_proof for a supplied commitment, over a list of points of G1 called the blind_generators, used to compute that commitment.
@@ -253,9 +249,9 @@ where
     let api_id = api_id.unwrap_or(b"");
     let M = commitment_proof.m_cap.len();
 
-    if blind_generators.len() != M + 1 {
-        return Err(Error::NotEnoughGenerators);
-    }
+    let blind_generators = blind_generators
+        .get(..M + 1)
+        .ok_or(Error::NotEnoughGenerators)?;
 
     let G2 = blind_generators[0];
     let Js = &blind_generators[1..];
@@ -289,40 +285,23 @@ mod tests {
         },
     };
 
-    // Commitment - SHA256
-
-    #[test]
-    fn commit_sha256_1() {
-        commit::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "commit/commit001.json",
-        );
-    }
+    // Commitment
 
-    #[test]
-    fn commit_sha256_2() {
-        commit::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "commit/commit002.json",
-        );
+    macro_rules! commit_tests {
+        ( $( ($t:ident, $p:literal): { $( ($n:ident, $f:literal), )+ },)+ ) => { $($(
+            #[test] fn $n() { commit::<$t>($p, $f); }
+        )+)+ }
     }
 
-    // Commitment - SHAKE256
-
-    #[test]
-    fn commit_shake256_1() {
-        commit::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "commit/commit001.json",
-        );
-    }
-
-    #[test]
-    fn commit_shake256_2() {
-        commit::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "commit/commit002.json",
-        );
+    commit_tests! {
+        (BbsBls12381Sha256, "./fixture_data_blind/bls12-381-sha-256/"): {
+            (commit_sha256_1, "commit/commit001.json"),
+            (commit_sha256_2, "commit/commit002.json"),
+        },
+        (BbsBls12381Shake256, "./fixture_data_blind/bls12-381-shake-256/"): {
+            (commit_shake256_1, "commit/commit001.json"),
+            (commit_shake256_2, "commit/commit002.json"),
+        },
     }
 
     fn commit<S: Scheme>(pathname: &str, filename: &str)
@@ -361,14 +340,14 @@ mod tests {
 
         assert_eq!(hex::encode(secret.to_bytes()), prover_blind);
 
-        let generators = Generators::create::<S::Ciphersuite>(
-            committed_messages.len() + 2,
-            Some(<S::Ciphersuite as BbsCiphersuite>::API_ID_BLIND),
+        let blind_generators = Generators::create::<S::Ciphersuite>(
+            committed_messages.len() + 1,
+            Some(&[b"BLIND_", <S::Ciphersuite as BbsCiphersuite>::API_ID_BLIND].concat()),
         );
 
         let result = Commitment::<BBSplus<S::Ciphersuite>>::deserialize_and_validate_commit(
             Some(&commitment_with_proof_result_oct),
-            &generators,
+            &blind_generators,
             Some(<S::Ciphersuite as BbsCiphersuite>::API_ID_BLIND),
         )
         .is_ok();
diff --git a/src/bbsplus/generators.rs b/src/bbsplus/generators.rs
index 84693c4..241eb4d 100644
--- a/src/bbsplus/generators.rs
+++ b/src/bbsplus/generators.rs
@@ -71,9 +71,18 @@ impl Generators {
             values: generators[0..].to_vec(),
         }
     }
+
+    /// Utility to append one list of Generators to another.
+    /// # Panics
+    /// Panics if the Generators have different base points.
+    pub(crate) fn append(mut self, other: Self) -> Self {
+        assert_eq!(self.g1_base_point, other.g1_base_point);
+        self.values.extend(other.values);
+        self
+    }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-generators-calculation
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-generators-calculation
 ///
 /// # Description
 /// Generators creation
@@ -103,7 +112,7 @@ where
     let mut buffer = vec![0u8; CS::EXPAND_LEN];
     let mut generators = Vec::new();
     for i in 1..count + 1 {
-        v = [v, i2osp(i, 8)].concat();
+        v = [&*v, &i2osp::<8>(i)].concat();
         CS::Expander::expand_message(&[&v], &[&seed_dst], CS::EXPAND_LEN)
             .unwrap()
             .fill_bytes(&mut buffer);
diff --git a/src/bbsplus/keys.rs b/src/bbsplus/keys.rs
index 6a6dcf3..6ab6242 100644
--- a/src/bbsplus/keys.rs
+++ b/src/bbsplus/keys.rs
@@ -21,7 +21,8 @@ use crate::{
     },
     schemes::algorithms::BBSplus,
     utils::util::bbsplus_utils::{
-        generate_random_secret, hash_to_scalar, i2osp, parse_g2_projective_compressed, parse_g2_projective_uncompressed
+        generate_random_secret, hash_to_scalar, i2osp, parse_g2_projective_compressed,
+        parse_g2_projective_uncompressed,
     },
 };
 use bls12_381_plus::{G2Affine, G2Projective, Scalar};
@@ -180,7 +181,6 @@ impl<CS: BbsCiphersuite> KeyPair<BBSplus<CS>> {
         CS::Expander: for<'a> ExpandMsg<'a>,
     {
         let key_material = generate_random_secret(64);
-        
         let sk = key_gen::<CS>(&key_material, None, None)?;
 
         let pk = sk_to_pk(sk);
@@ -192,7 +192,7 @@ impl<CS: BbsCiphersuite> KeyPair<BBSplus<CS>> {
     }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-secret-key -> SK = KeyGen(key_material, key_info, key_dst)
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-secret-key -> SK = KeyGen(key_material, key_info, key_dst)
 ///
 /// # Description
 /// This operation generates a secret key (SK) deterministically from a secret octet string (key_material)
@@ -232,7 +232,7 @@ where
     let key_dst = key_dst.unwrap_or(&key_dst_default);
 
     // derive_input = key_material || I2OSP(length(key_info), 2) || key_info
-    let derive_input = [key_material, &i2osp(key_info.len(), 2), key_info].concat();
+    let derive_input = [key_material, &i2osp::<2>(key_info.len()), key_info].concat();
 
     // SK = hash_to_scalar(derive_input, key_dst)
     let sk = hash_to_scalar::<CS>(&derive_input, key_dst)?;
diff --git a/src/bbsplus/proof.rs b/src/bbsplus/proof.rs
index 1fc0c0e..08b4f2f 100644
--- a/src/bbsplus/proof.rs
+++ b/src/bbsplus/proof.rs
@@ -12,17 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::{commitment::BlindFactor, keys::BBSplusPublicKey, signature::BBSplusSignature};
+use super::{
+    ciphersuites::BbsCiphersuite, commitment::BlindFactor, generators::Generators,
+    keys::BBSplusPublicKey, signature::BBSplusSignature,
+};
 use crate::{
-    bbsplus::{ciphersuites::BbsCiphersuite, generators::Generators},
     errors::Error,
     schemes::{algorithms::BBSplus, generics::PoKSignature},
     utils::{
         message::bbsplus_message::BBSplusMessage,
         util::{
             bbsplus_utils::{
-                calculate_domain, get_disclosed_data, get_messages, hash_to_scalar, i2osp,
-                parse_g1_projective, ScalarExt,
+                calculate_domain, get_messages, hash_to_scalar, i2osp, parse_g1_projective,
+                ScalarExt,
             },
             get_remaining_indexes,
         },
@@ -106,7 +108,7 @@ impl BBSplusPoKSignature {
 }
 
 impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-proof-generation-proofgen
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-proof-generation-proofgen
     ///
     /// # Description
     /// This operation creates BBS proof, which is a zero-knowledge, proof-of-knowledge of a BBS signature, while optionally disclosing any subset of the signed messages.
@@ -158,7 +160,7 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
         Ok(Self::BBSplus(proof))
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-proof-generation
+    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-proof-generation
     ///
     /// # Description
     /// This operation creates a BBS proof, which is a zero-knowledge, proof-of-knowledge, of a BBS signature, while optionally disclosing any subset of the signed messages. Note that in contrast to the [`Self::proof_gen`] operation, this operation accepts 2 different lists of messages and disclosed indexes, one for the messages known to the Signer (messages) and the corresponding disclosed indexes (disclosed_indexes) and one for the messages committed by the Prover (committed_messages) and the corresponding disclosed indexes (disclosed_commitment_indexes).
@@ -177,7 +179,7 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
     /// * `signer_blind` (OPTIONAL), a scalar value ([`BlindFactor`]).
     ///
     /// # Output:
-    /// ([`PoKSignature::BBSplus`], [`Vec<Vec<u8>>`], [`Vec<usize>`]) or [`Error`]: a PoK of a Signature, a vector of octet strings representing all the disclosed messages and their indexes.
+    /// [`PoKSignature::BBSplus`] or [`Error`]: a PoK of a Signature, a vector of octet strings representing all the disclosed messages and their indexes.
     ///
     pub fn blind_proof_gen(
         pk: &BBSplusPublicKey,
@@ -190,13 +192,14 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
         disclosed_commitment_indexes: Option<&[usize]>,
         secret_prover_blind: Option<&BlindFactor>,
         signer_blind: Option<&BlindFactor>,
-    ) -> Result<(Self, Vec<Vec<u8>>, Vec<usize>), Error>
+    ) -> Result<Self, Error>
     where
         CS::Expander: for<'a> ExpandMsg<'a>,
     {
         let signature = BBSplusSignature::from_bytes(
             signature.try_into().map_err(|_| Error::InvalidSignature)?,
         )?;
+        let api_id = CS::API_ID_BLIND;
         let messages = messages.unwrap_or(&[]);
         let committed_messages = committed_messages.unwrap_or(&[]);
         let L = messages.len();
@@ -209,57 +212,48 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
             return Err(Error::BlindProofGenError(
                 "number of disclosed indexes is grater than the number of messages".to_owned(),
             ));
-        }
-
-        if disclosed_indexes.iter().any(|&i| i >= L) {
+        } else if disclosed_indexes.iter().any(|&i| i >= L) {
             return Err(Error::BlindProofGenError(
                 "disclosed index out of range".to_owned(),
             ));
-        }
-
-        if disclosed_commitment_indexes.len() > M {
+        } else if disclosed_commitment_indexes.len() > M {
             return Err(Error::BlindProofGenError("number of commitment disclosed indexes is grater than the number of committed messages".to_owned()));
-        }
-
-        if disclosed_commitment_indexes.iter().any(|&i| i >= M) {
+        } else if disclosed_commitment_indexes.iter().any(|&i| i >= M) {
             return Err(Error::BlindProofGenError(
                 "commitment disclosed index out of range".to_owned(),
             ));
         }
 
-        let mut message_scalars = Vec::new();
+        let generators = Generators::create::<CS>(L + 1, Some(api_id));
+        let blind_generators = Generators::create::<CS>(M + 1, Some(&[b"BLIND_", api_id].concat()));
 
-        let secret_prover_blind = secret_prover_blind.unwrap_or(&BlindFactor(Scalar::ZERO));
-
-        if secret_prover_blind.0 != Scalar::ZERO {
-            let signer_blind = signer_blind.unwrap_or(&BlindFactor(Scalar::ZERO));
-            let message = BBSplusMessage::new(secret_prover_blind.0 + signer_blind.0);
-            message_scalars.push(message);
-        }
-
-        let api_id = CS::API_ID_BLIND;
-        message_scalars.extend(BBSplusMessage::messages_to_scalar::<CS>(
-            committed_messages,
-            api_id,
-        )?);
-        message_scalars.extend(BBSplusMessage::messages_to_scalar::<CS>(messages, api_id)?);
+        let message_scalars = BBSplusMessage::messages_to_scalar::<CS>(messages, api_id)?;
+        let blind_factor = BBSplusMessage::new(
+            secret_prover_blind.map_or(Scalar::ZERO, |b| b.0)
+                + signer_blind.map_or(Scalar::ZERO, |b| b.0),
+        );
+        let committed_message_scalars =
+            BBSplusMessage::messages_to_scalar::<CS>(committed_messages, api_id)?;
 
-        let generators = Generators::create::<CS>(message_scalars.len() + 1, Some(api_id));
+        let indexes = disclosed_indexes
+            .iter()
+            .copied()
+            .chain(disclosed_commitment_indexes.iter().map(|&j| j + L + 1))
+            .collect::<Vec<_>>();
 
-        let (disclosed_messages, disclosed_indexes) = get_disclosed_data(
-            messages,
-            committed_messages,
-            disclosed_indexes,
-            disclosed_commitment_indexes,
-            secret_prover_blind,
-        );
+        let tmp_messages = [
+            &*message_scalars,
+            core::slice::from_ref(&blind_factor),
+            &*committed_message_scalars,
+        ]
+        .concat();
 
         let proof = core_proof_gen::<CS>(
             pk,
             &signature,
-            &generators,
-            &message_scalars,
-            &disclosed_indexes,
+            &generators.append(blind_generators),
+            &tmp_messages,
+            &indexes,
             header,
             ph,
             Some(api_id),
@@ -267,10 +261,10 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
             &CS::BLIND_PROOF_DST,
         )?;
 
-        Ok((Self::BBSplus(proof), disclosed_messages, disclosed_indexes))
+        Ok(Self::BBSplus(proof))
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-proof-verification-proofver
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-proof-verification-proofver
     ///
     /// # Description
     /// The ProofVerify operation validates a BBS proof, given the Signer's public key (PK), a header and presentation header values, the disclosed messages and the indexes those messages had in the original vector of signed messages.
@@ -326,48 +320,85 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
         result
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-proof-verification
+    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-proof-verification
     ///
     /// # Description
-    /// It is the same as [`Self::proof_verify`] but inside i using a different api_id parameter ([`BbsCiphersuite::API_ID_BLIND`])
+    /// The ProofVerify operation validates a BBS proof, given the Signer's public key (PK), a
+    /// header and presentation header values, two arrays of disclosed messages (the ones known to
+    /// the Signer and the ones committed by the prover) and two corresponding arrays of indexes
+    /// those messages had in the original vectors of signed messages. In addition, the
+    /// BlindProofVerify operation defined in this section accepts the integer L, representing the
+    /// total number of signed messages known by the Signer.
+    ///
+    /// # Inputs:
+    /// * `self`, a proof.
+    /// * `pk` (REQUIRED), the Signer public key.
+    /// * `header` (OPTIONAL), an octet string containing context and application.
+    /// * `ph` (OPTIONAL), an octet string containing the presentation header.
+    /// * `L` (OPTIONAL), an integer, representing the total number of Signer known messages if not supplied it defaults to 0.
+    /// * `disclosed_messages` (OPTIONAL), a vector of octet string representing the messages disclosed to the Verifier.
+    /// * `disclosed_committed_messages` (OPTIONAL), a vector of octet string representing the committed messages disclosed to the Verifier.
+    /// * `disclosed_indexes` (OPTIONAL), vector of usize in ascending order. Indexes of disclosed messages.
+    /// * `disclosed_commitment_indexes` (OPTIONAL), vector of usize in ascending order. Indexes of disclosed committed messages.
+    ///
+    /// # Output:
+    /// a result: [`Ok`] or [`Error`].
     ///
     pub fn blind_proof_verify(
         &self,
         pk: &BBSplusPublicKey,
-        disclosed_messages: Option<&[Vec<u8>]>,
-        disclosed_indexes: Option<&[usize]>,
         header: Option<&[u8]>,
         ph: Option<&[u8]>,
+        L: Option<usize>,
+        disclosed_messages: Option<&[Vec<u8>]>,
+        disclosed_committed_messages: Option<&[Vec<u8>]>,
+        disclosed_indexes: Option<&[usize]>,
+        disclosed_commitment_indexes: Option<&[usize]>,
     ) -> Result<(), Error>
     where
         CS::Expander: for<'a> ExpandMsg<'a>,
     {
         let proof = self.to_bbsplus_proof();
+        let L = L.unwrap_or(0);
         let disclosed_messages = disclosed_messages.unwrap_or(&[]);
+        let disclosed_committed_messages = disclosed_committed_messages.unwrap_or(&[]);
         let mut disclosed_indexes = disclosed_indexes.unwrap_or(&[]).to_vec();
         disclosed_indexes.sort();
         disclosed_indexes.dedup();
+        let mut disclosed_commitment_indexes = disclosed_commitment_indexes.unwrap_or(&[]).to_vec();
+        disclosed_commitment_indexes.sort();
+        disclosed_commitment_indexes.dedup();
+
+        let api_id = CS::API_ID_BLIND;
 
         let U = proof.m_cap.len();
-        let R = disclosed_indexes.len();
+        let M = disclosed_indexes.len() + disclosed_commitment_indexes.len() + U - 1 - L;
 
-        let disclosed_message_scalars =
-            BBSplusMessage::messages_to_scalar::<CS>(disclosed_messages, CS::API_ID_BLIND)?;
+        let generators = Generators::create::<CS>(L + 1, Some(api_id));
+        let blind_generators = Generators::create::<CS>(M + 1, Some(&[b"BLIND_", api_id].concat()));
 
-        let generators = Generators::create::<CS>(U + R + 1, Some(CS::API_ID_BLIND));
+        let message_scalars = [
+            BBSplusMessage::messages_to_scalar::<CS>(disclosed_messages, api_id)?,
+            BBSplusMessage::messages_to_scalar::<CS>(disclosed_committed_messages, api_id)?,
+        ]
+        .concat();
 
-        let result = core_proof_verify::<CS>(
+        let indexes = disclosed_indexes
+            .iter()
+            .copied()
+            .chain(disclosed_commitment_indexes.iter().map(|j| j + L + 1))
+            .collect::<Vec<_>>();
+
+        core_proof_verify::<CS>(
             pk,
             proof,
-            &generators,
+            &generators.append(blind_generators),
             header,
             ph,
-            &disclosed_message_scalars,
-            &disclosed_indexes,
-            Some(CS::API_ID_BLIND),
-        );
-
-        result
+            &message_scalars,
+            &indexes,
+            Some(api_id),
+        )
     }
 
     pub fn to_bytes(&self) -> Vec<u8> {
@@ -386,7 +417,7 @@ impl<CS: BbsCiphersuite> PoKSignature<BBSplus<CS>> {
     }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-coreproofgen
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-coreproofgen
 ///
 /// # Description
 /// This operation computes a zero-knowledge proof-of-knowledge of a signature, while optionally selectively disclosing from the original set of signed messages. The Prover may also supply a presentation header (ph).
@@ -433,7 +464,7 @@ where
 
     let U = L
         .checked_sub(R)
-        .ok_or(Error::ProofGenError("R > L".to_owned()))?;
+        .ok_or_else(|| Error::ProofGenError("R > L".to_owned()))?;
 
     if let Some(invalid_index) = disclosed_indexes.iter().find(|&&i| i > L - 1) {
         return Err(Error::ProofGenError(format!(
@@ -493,7 +524,7 @@ struct ProofInitResult {
     domain: Scalar,
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-proof-initialization
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-proof-initialization
 ///
 /// # Description
 /// This operation initializes the proof and returns one of the inputs passed to the challenge calculation operation ([`proof_challenge_calculate`]), during the [`core_proof_gen`] operation.
@@ -575,7 +606,7 @@ where
     })
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-challenge-calculation
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-challenge-calculation
 ///
 /// # Description
 /// This operation calculates the challenge scalar value, used during the [`core_proof_gen`] and [`core_proof_verify`], as part of the Fiat-Shamir heuristic, for making the proof protocol non-interactive (in a interactive setting, the challenge would be a random value supplied by the Verifier).
@@ -615,31 +646,27 @@ where
     let ph = ph.unwrap_or(b"");
 
     let mut c_arr: Vec<u8> = Vec::new();
+    c_arr.extend_from_slice(&i2osp::<8>(R));
+    for (i, m) in core::iter::zip(disclosed_indexes, disclosed_messages) {
+        c_arr.extend_from_slice(&i2osp::<8>(*i));
+        c_arr.extend_from_slice(&m.value.to_bytes_be());
+    }
     c_arr.extend_from_slice(&init_res.Abar.to_affine().to_compressed());
     c_arr.extend_from_slice(&init_res.Bbar.to_affine().to_compressed());
     c_arr.extend_from_slice(&init_res.D.to_affine().to_compressed());
     c_arr.extend_from_slice(&init_res.T1.to_affine().to_compressed());
     c_arr.extend_from_slice(&init_res.T2.to_affine().to_compressed());
-    c_arr.extend_from_slice(&i2osp(R, 8));
-    disclosed_indexes
-        .iter()
-        .for_each(|&i| c_arr.extend_from_slice(&i2osp(i, 8)));
-    disclosed_messages
-        .iter()
-        .for_each(|m| c_arr.extend_from_slice(&m.value.to_bytes_be()));
     c_arr.extend_from_slice(&init_res.domain.to_bytes_be());
 
-    let ph_i2osp = i2osp(ph.len(), 8);
+    let ph_i2osp = i2osp::<8>(ph.len());
 
     c_arr.extend_from_slice(&ph_i2osp);
     c_arr.extend_from_slice(ph);
 
-    let challenge = hash_to_scalar::<CS>(&c_arr, &challenge_dst)?;
-
-    Ok(challenge)
+    hash_to_scalar::<CS>(&c_arr, &challenge_dst)
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-proof-finalization
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-proof-finalization
 ///
 /// # Description
 /// This operation finalizes the proof calculation during the [`core_proof_gen`] operation and returns the PoK [`BBSplusPoKSignature`].
@@ -671,7 +698,7 @@ fn proof_finalize(
     let m_tilde = &random_scalars[5..(5 + U)];
 
     let r3 = Option::<Scalar>::from(r2.invert())
-        .ok_or(Error::ProofGenError("Invert scalar failed".to_owned()))?;
+        .ok_or_else(|| Error::ProofGenError("Invert scalar failed".to_owned()))?;
 
     let e_cap = e_tilde + e * challenge;
 
@@ -696,7 +723,7 @@ fn proof_finalize(
     })
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-coreproofverify
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-coreproofverify
 ///
 /// # Description
 /// This operation checks that a proof is valid for a header, vector of disclosed messages (disclosed_messages) along side their index corresponding to their original position when signed (disclosed_indexes) and presentation header (ph) against a public key (PK).
@@ -763,7 +790,7 @@ where
     }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-proof-verification-initiali
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-proof-verification-initiali
 ///
 /// # Description
 /// This operation initializes the proof verification operation and returns part of the input that will be passed to the challenge calculation operation ([`proof_challenge_calculate`]), during the [`core_proof_verify`] operation.
@@ -911,7 +938,6 @@ mod tests {
         utils::util::bbsplus_utils::{get_messages_vec, ScalarExt},
     };
     use elliptic_curve::hash2curve::ExpandMsg;
-    use std::{collections::BTreeMap, fs};
 
     //mocked_rng - SHA256 - UPDATED
     #[test]
@@ -925,302 +951,80 @@ mod tests {
         mocked_rng::<BbsBls12381Shake256>("./fixture_data/bls12-381-shake-256/", "mockedRng.json");
     }
 
-    //SIGNATURE POK - SHA256
-    #[test]
-    fn proof_check_sha256_1() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof001.json")
-    }
-    #[test]
-    fn proof_check_sha256_2() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof002.json")
-    }
-    #[test]
-    fn proof_check_sha256_3() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof003.json")
-    }
-    #[test]
-    fn proof_check_sha256_4() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof004.json")
-    }
-    #[test]
-    fn proof_check_sha256_5() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof005.json")
-    }
-    #[test]
-    fn proof_check_sha256_6() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof006.json")
-    }
-    #[test]
-    fn proof_check_sha256_7() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof007.json")
-    }
-    #[test]
-    fn proof_check_sha256_8() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof008.json")
-    }
-    #[test]
-    fn proof_check_sha256_9() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof009.json")
-    }
-    #[test]
-    fn proof_check_sha256_10() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof010.json")
-    }
-    #[test]
-    fn proof_check_sha256_11() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof011.json")
-    }
-    #[test]
-    fn proof_check_sha256_12() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof012.json")
-    }
-    #[test]
-    fn proof_check_sha256_13() {
-        proof_check::<BbsBls12381Sha256>("./fixture_data/bls12-381-sha-256/", "proof/proof013.json")
-    }
-
-    //SIGNATURE POK - SHAKE256
-
-    #[test]
-    fn proof_check_shake256_1() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof001.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_2() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof002.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_3() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof003.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_4() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof004.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_5() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof005.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_6() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof006.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_7() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof007.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_8() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof008.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_9() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof009.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_10() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof010.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_11() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof011.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_12() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof012.json",
-        )
-    }
-    #[test]
-    fn proof_check_shake256_13() {
-        proof_check::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "proof/proof013.json",
-        )
-    }
-
-    // BLIND PROOF OF KNOWLEDGE OF A SIGNATURE - SHA256
-
-    #[test]
-    fn blind_proof_check_sha256_1() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof001.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_sha256_2() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof002.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_sha256_3() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof003.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_sha256_4() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof004.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_sha256_5() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof005.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_sha256_6() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof006.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_sha256_7() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof007.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    #[ignore]
-    fn blind_proof_check_sha256_8() {
-        blind_proof_check::<BbsBls12381Sha256>(
-            "./fixture_data_blind/bls12-381-sha-256/",
-            "proof/proof008.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    // BLIND PROOF OF KNOWLEDGE OF A SIGNATURE - SHAKE256
-
-    #[test]
-    fn blind_proof_check_shake256_1() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof001.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_shake256_2() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof002.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_shake256_3() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof003.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_shake256_4() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof004.json",
-            "./fixture_data_blind/",
-        )
-    }
-
-    #[test]
-    fn blind_proof_check_shake256_5() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof005.json",
-            "./fixture_data_blind/",
-        )
+    //SIGNATURE POK
+
+    macro_rules! proof_tests {
+        ( $( ($t:ident, $p:literal): { $( ($n:ident, $f:literal), )+ },)+ ) => { $($(
+            #[test] fn $n() { proof_check::<$t>($p, $f); }
+        )+)+ }
+    }
+
+    proof_tests! {
+        (BbsBls12381Sha256, "./fixture_data/bls12-381-sha-256/"): {
+            (proof_check_sha256_1, "proof/proof001.json"),
+            (proof_check_sha256_2, "proof/proof002.json"),
+            (proof_check_sha256_3, "proof/proof003.json"),
+            (proof_check_sha256_4, "proof/proof004.json"),
+            (proof_check_sha256_5, "proof/proof005.json"),
+            (proof_check_sha256_6, "proof/proof006.json"),
+            (proof_check_sha256_7, "proof/proof007.json"),
+            (proof_check_sha256_8, "proof/proof008.json"),
+            (proof_check_sha256_9, "proof/proof009.json"),
+            (proof_check_sha256_10, "proof/proof010.json"),
+            (proof_check_sha256_11, "proof/proof011.json"),
+            (proof_check_sha256_12, "proof/proof012.json"),
+            (proof_check_sha256_13, "proof/proof013.json"),
+            (proof_check_sha256_14, "proof/proof014.json"),
+            (proof_check_sha256_15, "proof/proof015.json"),
+        },
+        (BbsBls12381Shake256, "./fixture_data/bls12-381-shake-256/"): {
+            (proof_check_shake256_1, "proof/proof001.json"),
+            (proof_check_shake256_2, "proof/proof002.json"),
+            (proof_check_shake256_3, "proof/proof003.json"),
+            (proof_check_shake256_4, "proof/proof004.json"),
+            (proof_check_shake256_5, "proof/proof005.json"),
+            (proof_check_shake256_6, "proof/proof006.json"),
+            (proof_check_shake256_7, "proof/proof007.json"),
+            (proof_check_shake256_8, "proof/proof008.json"),
+            (proof_check_shake256_9, "proof/proof009.json"),
+            (proof_check_shake256_10, "proof/proof010.json"),
+            (proof_check_shake256_11, "proof/proof011.json"),
+            (proof_check_shake256_12, "proof/proof012.json"),
+            (proof_check_shake256_13, "proof/proof013.json"),
+            (proof_check_shake256_14, "proof/proof014.json"),
+            (proof_check_shake256_15, "proof/proof015.json"),
+        },
     }
 
-    #[test]
-    fn blind_proof_check_shake256_6() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof006.json",
-            "./fixture_data_blind/",
-        )
-    }
+    // BLIND PROOF OF KNOWLEDGE OF A SIGNATURE
 
-    #[test]
-    fn blind_proof_check_shake256_7() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof007.json",
-            "./fixture_data_blind/",
-        )
+    macro_rules! blind_proof_tests {
+        ( $( ($t:ident, $p:literal): { $( ($n:ident, $f:literal), )+ },)+ ) => { $($(
+            #[test] fn $n() { blind_proof_check::<$t>($p, $f, "./fixture_data_blind/"); }
+        )+)+ }
     }
 
-    #[test]
-    #[ignore]
-    fn blind_proof_check_shake256_8() {
-        blind_proof_check::<BbsBls12381Shake256>(
-            "./fixture_data_blind/bls12-381-shake-256/",
-            "proof/proof008.json",
-            "./fixture_data_blind/",
-        )
+    blind_proof_tests! {
+        (BbsBls12381Sha256, "./fixture_data_blind/bls12-381-sha-256/"): {
+            (blind_proof_check_sha256_1, "proof/proof001.json"),
+            (blind_proof_check_sha256_2, "proof/proof002.json"),
+            (blind_proof_check_sha256_3, "proof/proof003.json"),
+            (blind_proof_check_sha256_4, "proof/proof004.json"),
+            (blind_proof_check_sha256_5, "proof/proof005.json"),
+            (blind_proof_check_sha256_6, "proof/proof006.json"),
+            (blind_proof_check_sha256_7, "proof/proof007.json"),
+            (blind_proof_check_sha256_8, "proof/proof008.json"),
+        },
+        (BbsBls12381Shake256, "./fixture_data_blind/bls12-381-shake-256/"): {
+            (blind_proof_check_shake256_1, "proof/proof001.json"),
+            (blind_proof_check_shake256_2, "proof/proof002.json"),
+            (blind_proof_check_shake256_3, "proof/proof003.json"),
+            (blind_proof_check_shake256_4, "proof/proof004.json"),
+            (blind_proof_check_shake256_5, "proof/proof005.json"),
+            (blind_proof_check_shake256_6, "proof/proof006.json"),
+            (blind_proof_check_shake256_7, "proof/proof007.json"),
+            (blind_proof_check_shake256_8, "proof/proof008.json"),
+        },
     }
 
     fn mocked_rng<S: Scheme>(pathname: &str, filename: &str)
@@ -1228,7 +1032,8 @@ mod tests {
         S::Ciphersuite: BbsCiphersuite,
         <S::Ciphersuite as BbsCiphersuite>::Expander: for<'a> ExpandMsg<'a>,
     {
-        let data = fs::read_to_string([pathname, filename].concat()).expect("Unable to read file");
+        let data =
+            std::fs::read_to_string([pathname, filename].concat()).expect("Unable to read file");
         let res: serde_json::Value = serde_json::from_str(&data).expect("Unable to parse");
         eprintln!("Mocked Random Scalars");
 
@@ -1270,8 +1075,8 @@ mod tests {
         S::Ciphersuite: BbsCiphersuite,
         <S::Ciphersuite as BbsCiphersuite>::Expander: for<'a> ExpandMsg<'a>,
     {
-        let data =
-            fs::read_to_string([pathname, proof_filename].concat()).expect("Unable to read file");
+        let data = std::fs::read_to_string([pathname, proof_filename].concat())
+            .expect("Unable to read file");
         let proof_json: serde_json::Value = serde_json::from_str(&data).expect("Unable to parse");
 
         let signerPK_hex = proof_json["signerPublicKey"].as_str().unwrap();
@@ -1380,11 +1185,11 @@ mod tests {
         S::Ciphersuite: BbsCiphersuite,
         <S::Ciphersuite as BbsCiphersuite>::Expander: for<'a> ExpandMsg<'a>,
     {
-        let data =
-            fs::read_to_string([pathname, proof_filename].concat()).expect("Unable to read file");
+        let data = std::fs::read_to_string([pathname, proof_filename].concat())
+            .expect("Unable to read file");
         let proof_json: serde_json::Value = serde_json::from_str(&data).expect("Unable to parse");
 
-        let messages_data = fs::read_to_string([messages_path, "messages.json"].concat())
+        let messages_data = std::fs::read_to_string([messages_path, "messages.json"].concat())
             .expect("Unable to read file");
         let messages_json: serde_json::Value =
             serde_json::from_str(&messages_data).expect("Unable to parse");
@@ -1433,55 +1238,56 @@ mod tests {
         )
         .unwrap();
 
-        let disclosed_indexes: Option<Vec<usize>> =
-            if let Some(values) = proof_json["revealedMessages"].as_object() {
-                Some(values.keys().map(|s| s.parse().unwrap()).collect())
-            } else {
-                None
-            };
-
-        let disclosed_commitment_indexes: Option<Vec<usize>> =
-            if let Some(values) = proof_json["revealedCommittedMessages"].as_object() {
-                Some(values.keys().map(|s| s.parse().unwrap()).collect())
-            } else {
-                None
-            };
-
-        let mut used_committed_messages: Option<Vec<Vec<u8>>> = None;
-
-        if disclosed_commitment_indexes.is_some() {
-            used_committed_messages = committed_messages;
-        }
-
-        let (proof, disclosed_msgs, disclosed_idxs) =
-            PoKSignature::<BBSplus<S::Ciphersuite>>::blind_proof_gen(
-                &pk,
-                &signature.to_bytes(),
-                Some(&header),
-                Some(&ph),
-                messages.as_deref(),
-                used_committed_messages.as_deref(),
-                disclosed_indexes.as_deref(),
-                disclosed_commitment_indexes.as_deref(),
-                secret_prover_blind.as_ref(),
-                signer_blind.as_ref(),
-            )
-            .unwrap();
-
-        if let Some(values) = proof_json["disclosedData"].as_object() {
-            let mut sorted_values = BTreeMap::new();
-            for (key, value) in values {
-                sorted_values.insert(key.parse::<usize>().unwrap(), value);
-            }
+        let (disclosed_messages, disclosed_indexes) = proof_json["revealedMessages"]
+            .as_object()
+            .map(|values| {
+                let messages = values
+                    .values()
+                    .map(|h| hex::decode(h.as_str().unwrap()).unwrap())
+                    .collect::<Vec<_>>();
+                let indexes = values
+                    .keys()
+                    .map(|s| s.parse().unwrap())
+                    .collect::<Vec<_>>();
+                (messages, indexes)
+            })
+            .map_or((None, None), |(m, i)| (Some(m), Some(i))); // unzip() in 1.66+
+
+        let (disclosed_committed_messages, disclosed_commitment_indexes) = proof_json
+            ["revealedCommittedMessages"]
+            .as_object()
+            .map(|values| {
+                let messages = values
+                    .values()
+                    .map(|h| hex::decode(h.as_str().unwrap()).unwrap())
+                    .collect::<Vec<_>>();
+                let indexes = values
+                    .keys()
+                    .map(|s| s.parse().unwrap())
+                    .collect::<Vec<_>>();
+                (messages, indexes)
+            })
+            .map_or((None, None), |(m, i)| (Some(m), Some(i))); // unzip() in 1.66+
+
+        let used_committed_messages = if disclosed_commitment_indexes.is_some() {
+            committed_messages
+        } else {
+            None
+        };
 
-            let idxs: Vec<usize> = sorted_values.keys().map(|&s| s).collect();
-            assert_eq!(disclosed_idxs, idxs);
-            let msgs: Vec<Vec<u8>> = sorted_values
-                .values()
-                .map(|s| hex::decode(s.as_str().unwrap()).unwrap())
-                .collect();
-            assert_eq!(disclosed_msgs, msgs);
-        }
+        let proof = PoKSignature::<BBSplus<S::Ciphersuite>>::blind_proof_gen(
+            &pk,
+            &signature.to_bytes(),
+            Some(&header),
+            Some(&ph),
+            messages.as_deref(),
+            used_committed_messages.as_deref(),
+            disclosed_indexes.as_deref(),
+            disclosed_commitment_indexes.as_deref(),
+            secret_prover_blind.as_ref(),
+            signer_blind.as_ref(),
+        )
+        .unwrap();
 
         let expected_proof = proof_json["proof"].as_str().unwrap();
 
@@ -1490,10 +1296,13 @@ mod tests {
         let result = proof
             .blind_proof_verify(
                 &pk,
-                Some(&disclosed_msgs),
-                Some(&disclosed_idxs),
                 Some(&header),
                 Some(&ph),
+                messages.as_ref().map(Vec::len),
+                disclosed_messages.as_deref(),
+                disclosed_committed_messages.as_deref(),
+                disclosed_indexes.as_deref(),
+                disclosed_commitment_indexes.as_deref(),
             )
             .is_ok();
 
diff --git a/src/bbsplus/signature.rs b/src/bbsplus/signature.rs
index 96433bb..29c2cf9 100644
--- a/src/bbsplus/signature.rs
+++ b/src/bbsplus/signature.rs
@@ -53,7 +53,7 @@ impl BBSplusSignature {
             .map_err(|_| Error::InvalidSignature)?;
 
         Ok(Self { A, e })
-    }  
+    }
 }
 
 impl<CS: BbsCiphersuite> Signature<BBSplus<CS>> {
@@ -71,7 +71,7 @@ impl<CS: BbsCiphersuite> Signature<BBSplus<CS>> {
         }
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-signature-generation-sign
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-signature-generation-sign
     /// # Description
     /// The `sign` API returns a BBS signature from a secret key (SK), over a header and a set of messages.
     ///
@@ -107,7 +107,7 @@ impl<CS: BbsCiphersuite> Signature<BBSplus<CS>> {
         Ok(Self::BBSplus(signature))
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-signature-verification-veri
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-signature-verification-veri
     /// # Description
     /// The `verify` API validates a BBS signature, given a public key (PK), a header and a set of messages
     /// # Inputs:
@@ -197,9 +197,8 @@ impl<CS: BbsCiphersuite> Signature<BBSplus<CS>> {
         B = B + (-H_i * old_message_scalar.value);
         B = B + (H_i * new_message_scalar.value);
 
-        let sk_e_inv = Option::<Scalar>::from(sk_e.invert()).ok_or(Error::UpdateSignatureError(
-            "Invert scalar failed".to_owned(),
-        ))?;
+        let sk_e_inv = Option::<Scalar>::from(sk_e.invert())
+            .ok_or_else(|| Error::UpdateSignatureError("Invert scalar failed".to_owned()))?;
         let A = B * sk_e_inv;
 
         if A == G1Projective::IDENTITY {
@@ -210,7 +209,7 @@ impl<CS: BbsCiphersuite> Signature<BBSplus<CS>> {
     }
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-coresign
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-coresign
 /// # Description
 /// This operation computes a deterministic signature from a secret key (SK), a set of generators (points of G1) and optionally a header and a vector of messages.
 ///
@@ -251,11 +250,11 @@ where
 
     let domain = calculate_domain::<CS>(pk, Q1, H_points, header, Some(api_id))?;
 
-    //serialize
-    let mut input: Vec<Scalar> = Vec::new();
-    input.push(sk.0);
-    input.push(domain);
-    messages.iter().for_each(|m| input.push(m.value)); //the to_byte_le() may be needed instead
+    // Serialize
+    let input: Vec<Scalar> = core::iter::once(sk.0)
+        .chain(messages.iter().map(|m| m.value))
+        .chain(core::iter::once(domain))
+        .collect();
 
     let e = hash_to_scalar::<CS>(&serialize(&input), &signature_dst)?;
 
@@ -279,7 +278,7 @@ where
     Ok(BBSplusSignature { A, e: e })
 }
 
-/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-coreverify
+/// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-coreverify
 /// # Description
 /// This operation checks that a signature is valid for a given set of generators, header and vector of messages, against a supplied public key (PK). The set of messages MUST be supplied in this operation in the same order they were supplied to `core_sign` when creating the signature.
 ///
@@ -354,133 +353,38 @@ mod tests {
     use std::fs;
 
     //MSG SIGNATURE
-    #[test]
-    fn msg_signature_sha256_1() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature001.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_2() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature002.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_3() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature003.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_4() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature004.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_5() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature005.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_6() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature006.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_7() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature007.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_8() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature008.json",
-        );
-    }
-    #[test]
-    fn msg_signature_sha256_9() {
-        msg_signature::<BbsBls12381Sha256>(
-            "./fixture_data/bls12-381-sha-256/",
-            "signature/signature009.json",
-        );
-    }
 
-    //MSG SIGNATURE - SHAKE256
-    #[test]
-    fn msg_signature_shake256_1() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature001.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_2() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature002.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_3() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature003.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_4() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature004.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_5() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature005.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_6() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature006.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_7() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature007.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_8() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature008.json",
-        );
-    }
-    #[test]
-    fn msg_signature_shake256_9() {
-        msg_signature::<BbsBls12381Shake256>(
-            "./fixture_data/bls12-381-shake-256/",
-            "signature/signature009.json",
-        );
+    macro_rules! msg_tests {
+        ( $( ($t:ident, $p:literal): { $( ($n:ident, $f:literal), )+ },)+ ) => { $($(
+            #[test] fn $n() { msg_signature::<$t>($p, $f); }
+        )+)+ }
+    }
+
+    msg_tests! {
+        (BbsBls12381Sha256, "./fixture_data/bls12-381-sha-256/"): {
+            (msg_signature_sha256_1, "signature/signature001.json"),
+            (msg_signature_sha256_2, "signature/signature002.json"),
+            (msg_signature_sha256_3, "signature/signature003.json"),
+            (msg_signature_sha256_4, "signature/signature004.json"),
+            (msg_signature_sha256_5, "signature/signature005.json"),
+            (msg_signature_sha256_6, "signature/signature006.json"),
+            (msg_signature_sha256_7, "signature/signature007.json"),
+            (msg_signature_sha256_8, "signature/signature008.json"),
+            (msg_signature_sha256_9, "signature/signature009.json"),
+            (msg_signature_sha256_10, "signature/signature010.json"),
+        },
+        (BbsBls12381Shake256, "./fixture_data/bls12-381-shake-256/"): {
+            (msg_signature_shake256_1, "signature/signature001.json"),
+            (msg_signature_shake256_2, "signature/signature002.json"),
+            (msg_signature_shake256_3, "signature/signature003.json"),
+            (msg_signature_shake256_4, "signature/signature004.json"),
+            (msg_signature_shake256_5, "signature/signature005.json"),
+            (msg_signature_shake256_6, "signature/signature006.json"),
+            (msg_signature_shake256_7, "signature/signature007.json"),
+            (msg_signature_shake256_8, "signature/signature008.json"),
+            (msg_signature_shake256_9, "signature/signature009.json"),
+            (msg_signature_shake256_10, "signature/signature010.json"),
+        },
     }
 
     //Update Signature - SHA256
diff --git a/src/errors.rs b/src/errors.rs
index fbea6af..31bd57d 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -32,7 +32,7 @@ pub enum Error {
     MapMessageToScalarError,
     #[error("Not enough Generators")]
     NotEnoughGenerators,
-    /// [More Info](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-coresign) in the `Note` at the end
+    /// [More Info](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-coresign) in the `Note` at the end
     #[error(" A == Identity_G1")]
     G1IdentityError,
     #[error("Error during deserialization")]
diff --git a/src/utils/message.rs b/src/utils/message.rs
index 4c81002..2a28a21 100644
--- a/src/utils/message.rs
+++ b/src/utils/message.rs
@@ -32,7 +32,7 @@ pub mod bbsplus_message {
             Self { value: msg }
         }
 
-        /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-messages-to-scalars
+        /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-messages-to-scalars
         ///
         /// # Description
         /// The messages_to_scalars operation is used to map a list of messages to their respective scalar values
diff --git a/src/utils/util.rs b/src/utils/util.rs
index cbd49d7..550b64e 100644
--- a/src/utils/util.rs
+++ b/src/utils/util.rs
@@ -14,9 +14,8 @@
 
 #[cfg(feature = "bbsplus")]
 pub mod bbsplus_utils {
-    use crate::{bbsplus::ciphersuites::BbsCiphersuite, bbsplus::keys::BBSplusPublicKey};
     use crate::{
-        bbsplus::commitment::BlindFactor, errors::Error,
+        bbsplus::ciphersuites::BbsCiphersuite, bbsplus::keys::BBSplusPublicKey, errors::Error,
         utils::message::bbsplus_message::BBSplusMessage,
     };
     use bls12_381_plus::{G1Affine, G1Projective, G2Affine, G2Projective, Scalar};
@@ -75,21 +74,22 @@ pub mod bbsplus_utils {
         secret
     }
 
-    pub fn i2osp(x: usize, x_len: usize) -> Vec<u8> {
-        let mut result = Vec::new();
-
-        let mut x_copy = x;
-
-        for _ in 0..x_len {
-            result.push((x_copy % 256) as u8);
-            x_copy /= 256;
+    pub fn i2osp<const N: usize>(x: usize) -> [u8; N] {
+        const SYS_LEN: usize = (usize::BITS / 8) as usize;
+        assert!(N >= SYS_LEN || x >> (8 * N) == 0, "i2osp overflow");
+        let be_bytes = x.to_be_bytes();
+        let mut out = [0; N];
+
+        use core::cmp::Ordering;
+        match N.cmp(&SYS_LEN) {
+            Ordering::Equal => out.copy_from_slice(&be_bytes),
+            Ordering::Greater => out[N - SYS_LEN..].copy_from_slice(&x.to_be_bytes()),
+            Ordering::Less => out.copy_from_slice(&be_bytes[SYS_LEN - N..]),
         }
-
-        result.reverse(); // Since the most significant byte is at the end
-        result
+        out
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-hash-to-scalar
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-hash-to-scalar
     ///
     /// # Description
     /// This operation describes how to hash an arbitrary octet string to a scalar values in the multiplicative group of integers mod r
@@ -128,7 +128,7 @@ pub mod bbsplus_utils {
         ))
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-domain-calculation
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-domain-calculation
     ///
     /// # Description
     /// This operation calculates the domain value, a scalar representing the distillation of all essential contextual information for a signature. The same domain value must be calculated by all parties (the Signer, the Prover and the Verifier) for both the signature and proofs to be validated.
@@ -165,8 +165,7 @@ pub mod bbsplus_utils {
         let domain_dst = [api_id, CS::H2S].concat();
 
         let mut dom_octs: Vec<u8> = Vec::new();
-        let L_i2osp = i2osp(L, 8);
-        dom_octs.extend_from_slice(&L_i2osp);
+        dom_octs.extend_from_slice(&i2osp::<8>(L));
         dom_octs.extend_from_slice(&Q1.to_affine().to_compressed());
 
         H_points
@@ -180,9 +179,7 @@ pub mod bbsplus_utils {
         dom_input.extend_from_slice(&pk.to_bytes());
         dom_input.extend_from_slice(&dom_octs);
 
-        let header_i2osp = i2osp(header.len(), 8);
-
-        dom_input.extend_from_slice(&header_i2osp);
+        dom_input.extend_from_slice(&i2osp::<8>(header.len()));
         dom_input.extend_from_slice(header);
 
         hash_to_scalar::<CS>(&dom_input, &domain_dst)
@@ -289,7 +286,7 @@ pub mod bbsplus_utils {
         Scalar::random(rng)
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-random-scalars
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-random-scalars
     ///
     /// # Description
     /// This operation returns the requested number of pseudo-random scalars, using the `get_random` function
@@ -312,7 +309,7 @@ pub mod bbsplus_utils {
         random_scalars
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-05#name-mocked-random-scalars
+    /// https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-bbs-signatures-06#name-mocked-random-scalars
     ///
     /// # Description
     /// The seeded_random_scalars will deterministically calculate count random-looking scalars from a single SEED, given a domain separation tag (DST).
@@ -357,7 +354,7 @@ pub mod bbsplus_utils {
         scalars
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-blind-challenge-calculation
+    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-01#name-blind-challenge-calculation
     ///
     /// # Description
     /// Utility function to generate a challenge
@@ -390,68 +387,16 @@ pub mod bbsplus_utils {
         let blind_challenge_dst = [api_id, CS::H2S].concat();
 
         let mut c_arr: Vec<u8> = Vec::new();
-        c_arr.extend_from_slice(&C.to_affine().to_compressed());
-        c_arr.extend_from_slice(&Cbar.to_affine().to_compressed());
-        c_arr.extend_from_slice(&i2osp(M, 8));
+        c_arr.extend_from_slice(&i2osp::<8>(M));
         generators
             .iter()
             .for_each(|&i| c_arr.extend_from_slice(&i.to_affine().to_compressed()));
+        c_arr.extend_from_slice(&C.to_affine().to_compressed());
+        c_arr.extend_from_slice(&Cbar.to_affine().to_compressed());
 
         hash_to_scalar::<CS>(&c_arr, &blind_challenge_dst)
     }
 
-    /// https://datatracker.ietf.org/doc/html/draft-kalos-bbs-blind-signatures-00#name-present-and-verify-a-bbs-pr
-    ///
-    ///
-    /// # Description:
-    /// To avoid revealing which messages are committed to the signature, and which were known to the Signer to the proof Verifier, after calculating a BBS proof, the Prover will need to combine the disclosed committed messages as well as the disclosed messages known to the Signer to a single disclosed messages list. The same holds for the disclosed message indexes, where the ones corresponding to committed messages and the ones corresponding to messages known by the Signer should be combined together.
-    ///
-    /// # Inputs:
-    /// * `messages`, vector of octet strings.
-    /// * `committed_messages`, vector of octet strings.
-    /// * `disclosed_indexes` , vector of unsigned integers in ascending order. Indexes of disclosed messages.
-    /// * `disclosed_commitment_indexes`, vector of unsigned integers in ascending order. Indexes of disclosed messages.
-    ///
-    /// # Outputs:
-    ///
-    /// * a tuple `(Vec<Vec<u8>>, Vec<usize>)`, two vectors, one corresponding to the disclosed messages and one to the disclosed indexes.
-    ///
-    pub(crate) fn get_disclosed_data(
-        messages: &[Vec<u8>],
-        committed_messages: &[Vec<u8>],
-        disclosed_indexes: &[usize],
-        disclosed_commitment_indexes: &[usize],
-        secret_prover_blind: &BlindFactor,
-    ) -> (Vec<Vec<u8>>, Vec<usize>) {
-        let M = committed_messages.len();
-
-        let comm_used: usize = if secret_prover_blind.0 == Scalar::ZERO {
-            0
-        } else {
-            1
-        };
-
-        let mut indexes = Vec::new();
-
-        for &i in disclosed_commitment_indexes {
-            indexes.push(i + comm_used);
-        }
-
-        for &j in disclosed_indexes {
-            indexes.push(M + j + comm_used);
-        }
-
-        let mut disclosed_messages: Vec<Vec<u8>> = Vec::new();
-        disclosed_commitment_indexes
-            .iter()
-            .for_each(|&j| disclosed_messages.push(committed_messages[j].clone()));
-        disclosed_indexes
-            .iter()
-            .for_each(|&i| disclosed_messages.push(messages[i].clone()));
-
-        (disclosed_messages, indexes)
-    }
-
     #[cfg(test)]
     mod tests {
 
@@ -579,3 +524,29 @@ pub(crate) fn get_remaining_indexes(length: usize, indexes: &[usize]) -> Vec<usi
 
     remaining
 }
+
+#[cfg(test)]
+mod tests {
+    use super::bbsplus_utils::i2osp;
+
+    #[test]
+    fn test_i2osp() {
+        assert_eq!([0, 0, 0, 0, 1, 2, 3, 4], i2osp::<8>(0x1020304));
+        assert_eq!([0xf0, 0x0f], i2osp::<2>(0xf00f));
+        assert_eq!([0, 0, 0, 0, 0, 0, 0x12, 0x34], i2osp::<8>(0x1234));
+        assert_eq!([0, 0, 0, 0, 0x12, 0x34, 0x56, 0x78], i2osp::<8>(0x12345678));
+        assert_eq!([0, 0, 0x12, 0x34, 0x56, 0x78], i2osp::<6>(0x12345678));
+        assert_eq!([0, 0x12, 0x34, 0x56, 0x78], i2osp::<5>(0x12345678));
+        assert_eq!([0x12, 0x34, 0x56, 0x78], i2osp::<4>(0x12345678));
+        assert_eq!(
+            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0x12, 0x34, 0x56, 0x78],
+            i2osp::<13>(0x12345678)
+        );
+    }
+
+    #[test]
+    #[should_panic(expected = "i2osp overflow")]
+    fn test_i2osp_over() {
+        let _x = i2osp::<3>(0x12345678);
+    }
+}