diff --git a/data/bandersnatch_ed_sha512_ell2_ietf_vectors.json b/data/bandersnatch_ed_sha512_ell2_ietf_vectors.json
deleted file mode 100644
index 223c064..0000000
--- a/data/bandersnatch_ed_sha512_ell2_ietf_vectors.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-1",
-    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
-    "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
-    "alpha": "",
-    "ad": "",
-    "h": "b923c55b4b7d8c28156c87e005c6d8385a6f26019eee3149aaeb7ee7ce284b38",
-    "gamma": "208d1eacbedbfb00708a7068c708a565c0bd41c8155010c52e55c6837fecfa52",
-    "beta": "96b48404e1df9c738557ccbdfb5bc6f7b8fa3d281aa51742a5928e7a5d77cf5b4fc6ed61fc0f7e073dfc3ee8e06b1e5de55e93ecff8ad926cc99a08e8aa6a779",
-    "proof_c": "106f39b9ba10c49df8dfeeea43f8ff02823110fcd8de3ce6110124d29f75881c",
-    "proof_s": "49584112e665526173bfebb6f8949348b1accf72da122c77b501cd395464330c"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-2",
-    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
-    "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
-    "alpha": "0a",
-    "ad": "",
-    "h": "d905aaf894a97094b1d707ea7685fbc4ac501fc01cef25586a9c36288c5c6302",
-    "gamma": "25c5ab15ce5d973bfec7b6dd428b5b5971958a056d10cc18d5e9ccd0ee4c7b86",
-    "beta": "2ae6660f435f733482e4fb6a2c743288fc1d8a6b173b01f490929cd128514c518112bed1659bb8eab1535e279f9b7349fa316ba6f7bd8baa4ae410141bb565d2",
-    "proof_c": "ac8c53d06bb8c0946c479f1732e16800e810810fedda70f37b8a9c4f1016df11",
-    "proof_s": "9a3d82d40e8600276b5fd92cd8d21287abbece6ee357ff5e086126cf912e3d0a"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-3",
-    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
-    "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "587f7c01731c52ce4e02405a9642bf39da4b62befa0a0811f00dd1710a975cc4",
-    "gamma": "002030eb901d08fe85873b46cd5a1bd2a2c9fbce4f15e9e39066c1fe91be1c1f",
-    "beta": "5ca9dc5e02e908b5f1de31c85d30a064353420ab930a541db5f518eee07fb059323df22d2ce82d36a5bac52aa322f08072cc0b9c555a5e4179e3c11a067de7a2",
-    "proof_c": "2ae1f37e6427ec7f3b71e90b54eac7b0b21425760f46ca78908bc0fd2077ca16",
-    "proof_s": "78c7f35f0b3e8edd83a08a36a70c263cd7dba1ab81a2d6ee60242b4af06f2d03"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-4",
-    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
-    "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "c1cde8432c5bf619b14a403d611140c117a52ba31004574238bd58bf8fc6181f",
-    "gamma": "5d5a673794b7a0003a1c36f299c4d61055e4b680bb3c2ccd8858dce89c6cd5d3",
-    "beta": "0db282523110f629d8c9424afa66f4dfcb9e6dcea5f7891ab2ffc09eeb72a0ac11ac36841ec72644a5d24c1fa879872d3091c5e5b81940761f9f8f378f5013ae",
-    "proof_c": "7eb5a8b661e9d93203d7f7aa4b597e695be7c139b457fa5e33a866f4a66f2f12",
-    "proof_s": "cde921089ee5ec8d2d940e75819a6347cd8f0ccd215b712f90b278ed186cbb03"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-5",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "8af6936567d457e80f6715f403e20597c2ca58219974c3996a4e4414c3361635",
-    "gamma": "022abfa7670d5051a6a0e212467666abb955faafe7fe63446f50eb710383444c",
-    "beta": "126296afb914aa1225dfdddfe3bfd185b488801810e18034330b1c07409ccdc4f8deccfc30be219cb5186f80a523ae41720031ae39a78f18d3b14df8bb6d8e8a",
-    "proof_c": "4ddb0d1ebe4d7da9e2cca5c85e39b51166c969dfa30bbf69baafa22121b2000e",
-    "proof_s": "2616dff1f59ff7e7bfc25fa0fea37a9c37e93cf1b88a5e73505a195138590c0c"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-6",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "8af6936567d457e80f6715f403e20597c2ca58219974c3996a4e4414c3361635",
-    "gamma": "022abfa7670d5051a6a0e212467666abb955faafe7fe63446f50eb710383444c",
-    "beta": "126296afb914aa1225dfdddfe3bfd185b488801810e18034330b1c07409ccdc4f8deccfc30be219cb5186f80a523ae41720031ae39a78f18d3b14df8bb6d8e8a",
-    "proof_c": "087914abfd2a59a593384c538bb2f11480d4b196ae2a973ac33cb7dd2cc1541b",
-    "proof_s": "9ad1cdabc97035a05d76c4f4e3c1826deafbc3e4d41df6bf66eaa21d1ba63018"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-7",
-    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
-    "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "69dec7fe79f816d095b04cead45e856ff6c7e798f513e09291958e35a5590443",
-    "gamma": "9adeacd15eacdc651e4db1ea4c0917973eac2000479edf6132f3774601cc6902",
-    "beta": "ff5f6324ea18bbb4df92f7d6304bf27a0a44fa80fd40b985de8d43963a7e02c6ef6f0947911604155c6fe40f68cc91c96ffd358275b58960554274498a70f144",
-    "proof_c": "50a14bab81a42e118e8c167136db35b731a9194a250ae5e65452592742cbdb0e",
-    "proof_s": "a75b5327d1b921bb72e2e8c525c18d2fce661b365379ae9f1168c75d281d0100"
-  }
-]
\ No newline at end of file
diff --git a/data/bandersnatch_ed_sha512_ell2_pedersen_vectors.json b/data/bandersnatch_ed_sha512_ell2_pedersen_vectors.json
deleted file mode 100644
index 43743fa..0000000
--- a/data/bandersnatch_ed_sha512_ell2_pedersen_vectors.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-1",
-    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
-    "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
-    "alpha": "",
-    "ad": "",
-    "h": "b923c55b4b7d8c28156c87e005c6d8385a6f26019eee3149aaeb7ee7ce284b38",
-    "gamma": "208d1eacbedbfb00708a7068c708a565c0bd41c8155010c52e55c6837fecfa52",
-    "beta": "96b48404e1df9c738557ccbdfb5bc6f7b8fa3d281aa51742a5928e7a5d77cf5b4fc6ed61fc0f7e073dfc3ee8e06b1e5de55e93ecff8ad926cc99a08e8aa6a779",
-    "blinding": "a3f1a139943f3dc02c624505a5794dcc1a75651f60ca69081ebf9bdbd7458616",
-    "proof_pk_com": "2882f90320afdcf99680b8662efe846e2fd477cce00a47ac154f996c910b920a",
-    "proof_r": "71d85bb1a0edcf4362ec8137cdef1a856096e4f9995cc3a4db1781d3e9c7b817",
-    "proof_ok": "647c218cec9610102b202bcf7d29bdbf91770c326f07586051fa40bee863b63e",
-    "proof_s": "cda38b375717fa7790c18c70dcfcd6ce8f19b13819f088b74688f21dd127c412",
-    "proof_sb": "9b52eff1cc2ab908070a1ba89059ae3f6823b43702c60272c5d5943cceb6ac0e"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-2",
-    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
-    "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
-    "alpha": "0a",
-    "ad": "",
-    "h": "d905aaf894a97094b1d707ea7685fbc4ac501fc01cef25586a9c36288c5c6302",
-    "gamma": "25c5ab15ce5d973bfec7b6dd428b5b5971958a056d10cc18d5e9ccd0ee4c7b86",
-    "beta": "2ae6660f435f733482e4fb6a2c743288fc1d8a6b173b01f490929cd128514c518112bed1659bb8eab1535e279f9b7349fa316ba6f7bd8baa4ae410141bb565d2",
-    "blinding": "85a94726bcaeaf2db516a6a532ec2450488e7d093374f54de0ba05d2a36bb00a",
-    "proof_pk_com": "b28263558234202119a143c295a3fc5a35a6f830dd0c7018e3f33862d1986c1c",
-    "proof_r": "4cb8186c3da92e9be0179f894cdc364aabe1a890340aee9fd886bed45f5017e7",
-    "proof_ok": "83a9519edb8ecc4f360eee599c6c1310019c4c3451ca42b4887328e347003bdf",
-    "proof_s": "3e1b408e4ceb5a81e5b71527b01f541d5069438aaa279aa48c39bb7e34f24001",
-    "proof_sb": "1dc7b84f188a7fb5bf051464be19e54495f42bd723130992319bad7560023714"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-3",
-    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
-    "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "587f7c01731c52ce4e02405a9642bf39da4b62befa0a0811f00dd1710a975cc4",
-    "gamma": "002030eb901d08fe85873b46cd5a1bd2a2c9fbce4f15e9e39066c1fe91be1c1f",
-    "beta": "5ca9dc5e02e908b5f1de31c85d30a064353420ab930a541db5f518eee07fb059323df22d2ce82d36a5bac52aa322f08072cc0b9c555a5e4179e3c11a067de7a2",
-    "blinding": "cb3a17d3578d86e2f3b23bb47160327c391c808da28c6be53ed3189d22d78205",
-    "proof_pk_com": "f99d09a38f1a1ead7d9503fd601e2d8a56c09eaeb5fb3130035803e04033b49a",
-    "proof_r": "de58f590cd204247192f5b49d86c81ddc691fd6b55561fb33ccbec24ecbc86db",
-    "proof_ok": "d502f832afaddb7bb54e8c28cce458a2a9c3c6c230e4b85539913ec531de168b",
-    "proof_s": "1dd33771a9bfdcf94e6e95fa43e4667adf3279d9c2b22e0877abeb5e99a9e01b",
-    "proof_sb": "7863bbac83653e1a48bc0e814e4792c6b2d884522f5556bbb1844c151dcdb700"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-4",
-    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
-    "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "c1cde8432c5bf619b14a403d611140c117a52ba31004574238bd58bf8fc6181f",
-    "gamma": "5d5a673794b7a0003a1c36f299c4d61055e4b680bb3c2ccd8858dce89c6cd5d3",
-    "beta": "0db282523110f629d8c9424afa66f4dfcb9e6dcea5f7891ab2ffc09eeb72a0ac11ac36841ec72644a5d24c1fa879872d3091c5e5b81940761f9f8f378f5013ae",
-    "blinding": "141a8a762dff63c7c05b26d022a8027c515e57f067b5546532296f0ca40a1909",
-    "proof_pk_com": "e926e6b3cbca7b66c42cfc603c4ef2dabc3f5e1276b20d2807f007e974675cb1",
-    "proof_r": "29c56732de262411e71908326037f0f961776db2082bf3d88537265af6a57c92",
-    "proof_ok": "c59024c715d21f2a08fb0cd8cb24046558222c6753180853f9601d92186c5e3b",
-    "proof_s": "b818a32590aeb6d79d24cdc6cacb6d5cdc58ccb7025b82be1c1ba2cd34c2f005",
-    "proof_sb": "e854b63f9c4e0aab3a051885498d42b5ec354e619491ee9ff239bd3fb486b509"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-5",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "8af6936567d457e80f6715f403e20597c2ca58219974c3996a4e4414c3361635",
-    "gamma": "022abfa7670d5051a6a0e212467666abb955faafe7fe63446f50eb710383444c",
-    "beta": "126296afb914aa1225dfdddfe3bfd185b488801810e18034330b1c07409ccdc4f8deccfc30be219cb5186f80a523ae41720031ae39a78f18d3b14df8bb6d8e8a",
-    "blinding": "4749f32b7aa36158a4fdfb5bc7e63c40b62eb1d7c75036676e093571a3e9cb06",
-    "proof_pk_com": "e159e5494957bb478c4a4d142cde10dadd73a038f8b198c4321dff1271ab61b4",
-    "proof_r": "16a8409cc245978bf55279447d854adca637a58c8c7894a0972b190ad7314492",
-    "proof_ok": "3639790d6414b474aa1d53de4e7a896b4e6458c078867acd22200f00f20f280a",
-    "proof_s": "bbfd0996c8937c9aaabad9a254614b75c529f892fdfcfcfbe73486888545b610",
-    "proof_sb": "6bce65ffb002c6349213b720115ee1457214796c983618f32b4b79c8c559851b"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-6",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "8af6936567d457e80f6715f403e20597c2ca58219974c3996a4e4414c3361635",
-    "gamma": "022abfa7670d5051a6a0e212467666abb955faafe7fe63446f50eb710383444c",
-    "beta": "126296afb914aa1225dfdddfe3bfd185b488801810e18034330b1c07409ccdc4f8deccfc30be219cb5186f80a523ae41720031ae39a78f18d3b14df8bb6d8e8a",
-    "blinding": "1f64d22282d00a58d17d4fe4dc6e8b9772109b6091e1684649c6084fc842391b",
-    "proof_pk_com": "89e230c832f5c2ee1072d9d110151a2dafa4577d64b7fb0845855ae3d1c12fec",
-    "proof_r": "e3bd5e3a3f07efb256c989f22fcfe8494219dcd37b35419f5f10da68de09f125",
-    "proof_ok": "3639790d6414b474aa1d53de4e7a896b4e6458c078867acd22200f00f20f280a",
-    "proof_s": "ceff5ef2315be8be839b1f3c0314b72d976c2e14a2a27c2d1ce8465e90c98607",
-    "proof_sb": "0ea7abf79fc1bdebc8b9009cc5744358071c12e82a31565d35a8f91069b55c1b"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-7",
-    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
-    "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "69dec7fe79f816d095b04cead45e856ff6c7e798f513e09291958e35a5590443",
-    "gamma": "9adeacd15eacdc651e4db1ea4c0917973eac2000479edf6132f3774601cc6902",
-    "beta": "ff5f6324ea18bbb4df92f7d6304bf27a0a44fa80fd40b985de8d43963a7e02c6ef6f0947911604155c6fe40f68cc91c96ffd358275b58960554274498a70f144",
-    "blinding": "ea1f922fce5e359d92e0fdcda53a1d2e6b791c7e7a8ffad915f3535c6175f115",
-    "proof_pk_com": "f674ad5f72661aa0c2bc5ca83aee9794c8b8bbc4017abcc00a11a23a0b558e68",
-    "proof_r": "f77eaec55fe36b06f1d1f7eef7db24fdcce74c83fde19b1c322aca288e39948f",
-    "proof_ok": "b846dfbceb2a74fe102b3aec94e7b8460f5adcb609c407839ab6cb06d1e3bd38",
-    "proof_s": "35a41d1cb4d22b5c162d319b206db940b6fcef71bbe0c13a6376a89788292519",
-    "proof_sb": "c04b177f954d17e7c129ce8d55cb7f148b3957078c96e7229100dc50b7d62b02"
-  }
-]
\ No newline at end of file
diff --git a/data/bandersnatch_ed_sha512_ell2_ring_vectors.json b/data/bandersnatch_ed_sha512_ell2_ring_vectors.json
deleted file mode 100644
index a72d94e..0000000
--- a/data/bandersnatch_ed_sha512_ell2_ring_vectors.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-1",
-    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
-    "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
-    "alpha": "",
-    "ad": "",
-    "h": "b923c55b4b7d8c28156c87e005c6d8385a6f26019eee3149aaeb7ee7ce284b38",
-    "gamma": "208d1eacbedbfb00708a7068c708a565c0bd41c8155010c52e55c6837fecfa52",
-    "beta": "96b48404e1df9c738557ccbdfb5bc6f7b8fa3d281aa51742a5928e7a5d77cf5b4fc6ed61fc0f7e073dfc3ee8e06b1e5de55e93ecff8ad926cc99a08e8aa6a779",
-    "blinding": "a3f1a139943f3dc02c624505a5794dcc1a75651f60ca69081ebf9bdbd7458616",
-    "proof_pk_com": "2882f90320afdcf99680b8662efe846e2fd477cce00a47ac154f996c910b920a",
-    "proof_r": "71d85bb1a0edcf4362ec8137cdef1a856096e4f9995cc3a4db1781d3e9c7b817",
-    "proof_ok": "647c218cec9610102b202bcf7d29bdbf91770c326f07586051fa40bee863b63e",
-    "proof_s": "cda38b375717fa7790c18c70dcfcd6ce8f19b13819f088b74688f21dd127c412",
-    "proof_sb": "9b52eff1cc2ab908070a1ba89059ae3f6823b43702c60272c5d5943cceb6ac0e",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b4fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "89e2e79b6178c12684ac3a6bf9437af3a69dcc529f0021ec40bb006506837ae182bf4b908e46733d3a23507791169fda8ea11b18665fe894ee9f0754c0c3fec70c6b8d1444d9b604ce949cbf130642d89f72b6cb1f08e32a18cdbb00aadfdf1b92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "84251f616e4a04227cd2fcf59077db2a3f43575bdc4a60c21a09c6f4b98fecb795104cb5533c6c088015846caa08ffe49107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd8ed8d119f14c6f5029fbd58a337b351834e37e239cb56557779eb5dbd5934534d417e99b8534393ae55084a9765233ad849bf0906e4c3601c2c63bb7c9b55e0891203a8e8ce31ae910c75281f2961814e967f610d080dda67c683c170c66f8e998f8633aef4b1416e768447dc1761896d146e06d53108506fbcb95d414ee1c5967093934afa4217d96c6c5db561af7f6f14e6ec34d5502f8b126db63ce9eb863d1443a4af4ca6e9153a2b311bdfc68953d5da24e72144c453db8a622613e2e6833b617d0cbb8d1c9dc40b9c1122caccbdfa5781c0391b77490ae766dd3169c6637e9d5d76d4f702350e2ed9aba6f8d160d27f3675e2ccb8a26ab5f1075c17624e08efd3f76c4c4dde783aba37cc93172efb5306a1aef0591d5b9a306f2e51334742fcc685e7e0958e324db86ebe4bf94777c339fb5e97b370c3429795afa940ab0909da6d65c28199b1cabf958c3bb318c280e375c8ae8e2694143f59eda03ba0c5bf14d8bbd7a9bd8a70f7db4ecc5e5f7612b6282f1f0875030f7248064e8719f5c058d17369eb46a949ac02c97123a91c065f30e3d24d282202ee39de179cc11aede1b407a76de21fd7202c986e7dd2ce4b92a1ac5342a1f214348414cf624b2e7243cc5e8a5d1d02465df72cb84e2c266cffdf6365d0b845e81c2fa859213649db1f2995334a3561d730fe4d0f62f"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-2",
-    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
-    "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
-    "alpha": "0a",
-    "ad": "",
-    "h": "d905aaf894a97094b1d707ea7685fbc4ac501fc01cef25586a9c36288c5c6302",
-    "gamma": "25c5ab15ce5d973bfec7b6dd428b5b5971958a056d10cc18d5e9ccd0ee4c7b86",
-    "beta": "2ae6660f435f733482e4fb6a2c743288fc1d8a6b173b01f490929cd128514c518112bed1659bb8eab1535e279f9b7349fa316ba6f7bd8baa4ae410141bb565d2",
-    "blinding": "85a94726bcaeaf2db516a6a532ec2450488e7d093374f54de0ba05d2a36bb00a",
-    "proof_pk_com": "b28263558234202119a143c295a3fc5a35a6f830dd0c7018e3f33862d1986c1c",
-    "proof_r": "4cb8186c3da92e9be0179f894cdc364aabe1a890340aee9fd886bed45f5017e7",
-    "proof_ok": "83a9519edb8ecc4f360eee599c6c1310019c4c3451ca42b4887328e347003bdf",
-    "proof_s": "3e1b408e4ceb5a81e5b71527b01f541d5069438aaa279aa48c39bb7e34f24001",
-    "proof_sb": "1dc7b84f188a7fb5bf051464be19e54495f42bd723130992319bad7560023714",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c55ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf34fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "894fd4149cce66e5f39f11c0de38825da7d07c52de1d8e74ed170c6b1a2feec7bc158b35068bbcfa9455fd76f699c15cb5e9dfaba7a93cb264c07d9228e8c64273e2d5febe689b4b6279f21b1b0b26ec956f6d6d3fd5650edc1e4f7bf8d1663b92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "88e15ab86bfd02c6bbc4a6fda0dae46f9efe6a96ae3701daed38d6750a2d5ac33b96f7dd7a34b78ad3eda732740784bd9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddae75edd956b647c773b4b59548c27ee717acecd6b3f8a36be3bfaea9841e0bf66a7c591d5c336a8aec25aa996f4670daa6101f1a3d5517d847e7406df60f049f8435ff5f9e3b09789d10a6a3d8e13bb959212aa4e0cf0b957699349e225525a2ac00259d4cea4c90e929942bcf0d28119fe7381d8e30c6f66d0fa82c70a6df2ef84eda886a2c5989b152a947759be27a0b5744f79e6ea20c19c28542d24de230928a8c0ed5f17fe06f626eda156341ba142d3f2b05d646b41c71a877f4453a68364d5793f1607b9249c1aa275ba0dc9185d48976833bf0ad3855ff62dd159a677d73eabf04c6f305d43bad31fbf258b5396670ba7b049f28714ebe595cfec31127d3dfad0501160eb879c2f4bbe23fb2fbadf78a9024c15870243a104652f81c8b075a21e0ed8af0b1fa718957088e6271a2914adb24e6a0e0aaa23b4c675c4fa76e0537da88fc7e03caab26f766483a76018683ac0eab5089e1c4cf8d6f0236626971b02d3c2575ec5d54696081cb46506db5c7575659a2e74eabe15e6ff21aa3dccd1d7f3cc02fbf322c7504fa503c9199d570ec1696e8da7586ea50629819bb91eeba62157b244e2f97c7b710e4460b27ca4bd468600db1008a61d1514d12b51470335da7f5b4a663416092253498aa52a9d3223bdc4a69161dc0db587eb64456db6bad7d94d45695a41e3bef98dd"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-3",
-    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
-    "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "587f7c01731c52ce4e02405a9642bf39da4b62befa0a0811f00dd1710a975cc4",
-    "gamma": "002030eb901d08fe85873b46cd5a1bd2a2c9fbce4f15e9e39066c1fe91be1c1f",
-    "beta": "5ca9dc5e02e908b5f1de31c85d30a064353420ab930a541db5f518eee07fb059323df22d2ce82d36a5bac52aa322f08072cc0b9c555a5e4179e3c11a067de7a2",
-    "blinding": "cb3a17d3578d86e2f3b23bb47160327c391c808da28c6be53ed3189d22d78205",
-    "proof_pk_com": "f99d09a38f1a1ead7d9503fd601e2d8a56c09eaeb5fb3130035803e04033b49a",
-    "proof_r": "de58f590cd204247192f5b49d86c81ddc691fd6b55561fb33ccbec24ecbc86db",
-    "proof_ok": "d502f832afaddb7bb54e8c28cce458a2a9c3c6c230e4b85539913ec531de168b",
-    "proof_s": "1dd33771a9bfdcf94e6e95fa43e4667adf3279d9c2b22e0877abeb5e99a9e01b",
-    "proof_sb": "7863bbac83653e1a48bc0e814e4792c6b2d884522f5556bbb1844c151dcdb700",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c59d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca495064fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "a90130fa47aaf758299818bd119e7fecdddb62674541f78c5fa5371b9db62d0f8afd73d28225fb1ae60e8959c5f0e929b861ba122a1c8fa45fc9d2b8fb66666ef55fdcdfdae22addff823236613fb08b49a694b9f1ec38b72fc0a021857d302692e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "ae28c697167281871ae0b4d8eae5f7189e8b905bdfc652eea9f0a92f96eab8191439c44e5cf78f2824f9b19ed577f6b19107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd90346560e90a53ec6ec7c27eb6d55a1f8efca883bd7f6e15d0211127173601dfc3769a6dd1d43d907cbdff645caa98a9a42a5c1a713d7302ff9eae55b3ca8a79671d06fdb4ce619d78b2fdfe543a5d224629ac3625349437b6519acbc95d70d0f77d2db5a907386abcbabcbbf5ca020847f8c9dada241f6b0f220dda7a59143b9d5e637235b75733c1bd0d501288e972bfd53b98ed0752709ba4b639d2aa155b7c6a9ef3d99db8af1d40f91effe02d6fbe021327c528b9ab1623e44a1753d70bf7392d425a6f3e661a0f31bc44ad43909faaecb4dd59bc5682163a2d2f889a09a9aa852ed39ab26aacec48b809c0941e9d2e579e488937676678d388d14ecb36d5489fd64bbfcbbd835b084e3c842c16276482cf2fdd1c8470b0781b33ffd06e08d1096b39f8468e727fdf4b7f2176cdedc56a6439eff6891d253794231cd10bb71d50c3d33e1c07d2a1e8988483e1ce0aad0ee8ba51d177bb4778b36221c87ff27948b3a84118eac577df67a473d2bec0acd5aa6205c4fb54078a0a86c316fdbb27aafc153ce9c21a1ff0c7634dd7229380e3c00418f09515a189dc1501339891ed863c7037144c196b7bc37379d1e3fd0ff5ebe2f68d6c46c3805b01d17f5992890f2ad8376ade62923147c1aba065cdcb8d32053c0335cc015f0dce8bc380064f7e70ed10c876f7c248b8afb98eab"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-4",
-    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
-    "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "c1cde8432c5bf619b14a403d611140c117a52ba31004574238bd58bf8fc6181f",
-    "gamma": "5d5a673794b7a0003a1c36f299c4d61055e4b680bb3c2ccd8858dce89c6cd5d3",
-    "beta": "0db282523110f629d8c9424afa66f4dfcb9e6dcea5f7891ab2ffc09eeb72a0ac11ac36841ec72644a5d24c1fa879872d3091c5e5b81940761f9f8f378f5013ae",
-    "blinding": "141a8a762dff63c7c05b26d022a8027c515e57f067b5546532296f0ca40a1909",
-    "proof_pk_com": "e926e6b3cbca7b66c42cfc603c4ef2dabc3f5e1276b20d2807f007e974675cb1",
-    "proof_r": "29c56732de262411e71908326037f0f961776db2082bf3d88537265af6a57c92",
-    "proof_ok": "c59024c715d21f2a08fb0cd8cb24046558222c6753180853f9601d92186c5e3b",
-    "proof_s": "b818a32590aeb6d79d24cdc6cacb6d5cdc58ccb7025b82be1c1ba2cd34c2f005",
-    "proof_sb": "e854b63f9c4e0aab3a051885498d42b5ec354e619491ee9ff239bd3fb486b509",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d994fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "b62f3bf3e83646318894151bb51bb535a2539581773a01956f1874cb64e7a952809d40be330de7d34bf01162adb2675e94c21ba7db9087beeb87d536cce326fb20a5b816654432c73a772ede266d0d3bbae3f6aa0bcb31b5de62d33863a0098a92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "844527a973207561cea5ae17dde2da0db55440e2a1a0c363dd2b78e679f87db7a45bf9d8c7b774ccc7b38597d3084d499107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb3cb66f34289362aea2780d58718240e5aca0f23920dc5f03f819bbaeed966853ada5d39e84a51bf79fd697cbcbe3802a73c5492d807e2f256c558ace03bdb9bce545d37d4a1093559c1d7fce7ac9340d45e8860fe57af8c4e0765acf32b095665eea98bf07d5ccf48933049a4f592141ddbc7e86b7f63ca8bd9adcefec6724fdd205a0b552b8658e25abefd00dc58a51347a16c23cf9f894fb6b2d5a6670356fa5651ab64bb14d53f5b7a8f88a800c001988f98f70871f3f39792f25c05de0df3b685fd726cbc7b57feeb511a156ca8775a928ef7bcbe2095be4ba17c9f5456c9e6b316d83dae45288e3599253de73db3b42afb8765e4529be184c6306367117600b19f19b0a20114c3ee30769557297d794e6a63e90c7ad22c2bf07029533899a1b726c424c9c6b69de6f606d53cfd23ce8f3f5daf7a0505a1e93d41226860a7855f1ef2ecd5d363d4afd69318323f69443e54ff6993bd4d4f90b98336ce376b9a54ddd761bfdf6c55aa4b967ccf769f0d4e23c0019fa67389e605aa6cbd326d4afd362abf71b1ff7278ddb26ff06fab1ddac9d04136d8120a37dc66ed01460c4b830a591a534f3c939623e66bd83b0336c2b316ceaca3e04c0822581eb6a986a54f714ef1c923a37e3a896fb5d6b2f239b76633895fc3c5f91a5828f130574271e9d96dbef03249b981fa04374d44"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-5",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "8af6936567d457e80f6715f403e20597c2ca58219974c3996a4e4414c3361635",
-    "gamma": "022abfa7670d5051a6a0e212467666abb955faafe7fe63446f50eb710383444c",
-    "beta": "126296afb914aa1225dfdddfe3bfd185b488801810e18034330b1c07409ccdc4f8deccfc30be219cb5186f80a523ae41720031ae39a78f18d3b14df8bb6d8e8a",
-    "blinding": "4749f32b7aa36158a4fdfb5bc7e63c40b62eb1d7c75036676e093571a3e9cb06",
-    "proof_pk_com": "e159e5494957bb478c4a4d142cde10dadd73a038f8b198c4321dff1271ab61b4",
-    "proof_r": "16a8409cc245978bf55279447d854adca637a58c8c7894a0972b190ad7314492",
-    "proof_ok": "3639790d6414b474aa1d53de4e7a896b4e6458c078867acd22200f00f20f280a",
-    "proof_s": "bbfd0996c8937c9aaabad9a254614b75c529f892fdfcfcfbe73486888545b610",
-    "proof_sb": "6bce65ffb002c6349213b720115ee1457214796c983618f32b4b79c8c559851b",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac294fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "9436b3535d5dcffd6f15628fb028095f5c0733d067222f8893bb106f2fdac0f63dfcf69a5715522c7318b9b311264ee5a2b499057db5d1211e6b9f4633ad433d22dce5f20a95b8a8618b99539bb697791e02b1afcf6e2de8240d067396196b8392e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "8e5e1255cc32c05f95644c91c7ff9a652e59283e065db58551e84bf5a09994a2947bea0c283565f00a15d1ed0fe1f3019107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb9925d22bb116ebec12023f8766b000f48fe4f49586eae4607cdb8649578fb9f80e23c17aa66839063a8945a7f873e1988e74337026231aea9aeee1ccbd7c6cc37988b7a4234b59aa0fb3b6e8a42330c368262f7558bdb802a0d4a76f54180b173ec50ae034787cf014650c3237ec6d595381c7592595c7e0b4e314bb5a9003656f60ddb4e9bdcd9c0e689faadc2456e50663d20cb3bcd22548c5366c88d470a54869350c1a5a8766695278eb8ff0c0781894d47e238169974e0a978e4f1141ea2148687e4c213cbcc1558b7f5b4b6e0d1634c300729a2d1f11a34d040f7486d4d7668b6337112f7e02aa2c0ae77bb49d57acf4d7686c48096b5eb1a4807b44e0c6af0a1d92d20e8858030bcc314218e1c70066414473c1c5647e899a4c83405d3cfada37632dc064d0c438acf37c795d76e15094f5742a8e21d735d5be48972955874df273235275ddb6722d18958d3b0c17d8d774d5db6328844b6127456da8c46a3ab59dff33d9faeef39a52f788cf60b57ed5e5a37b6f3e43f6e22b96e64ea375abdaec9a07a5c1c8d4a71db6c378efc3ac34341c86f8bc4090847acd756ae5c86627a3124a46abf33e27d8ff62279bb1f0f12a0faacb072e2c6bd1d74578b8b4fc1c201b9ac25f05afd53a1424262dd32875dca16c6a82f46666290280e51120c0aea4d05125cc4d725e9765e55"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-6",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "8af6936567d457e80f6715f403e20597c2ca58219974c3996a4e4414c3361635",
-    "gamma": "022abfa7670d5051a6a0e212467666abb955faafe7fe63446f50eb710383444c",
-    "beta": "126296afb914aa1225dfdddfe3bfd185b488801810e18034330b1c07409ccdc4f8deccfc30be219cb5186f80a523ae41720031ae39a78f18d3b14df8bb6d8e8a",
-    "blinding": "1f64d22282d00a58d17d4fe4dc6e8b9772109b6091e1684649c6084fc842391b",
-    "proof_pk_com": "89e230c832f5c2ee1072d9d110151a2dafa4577d64b7fb0845855ae3d1c12fec",
-    "proof_r": "e3bd5e3a3f07efb256c989f22fcfe8494219dcd37b35419f5f10da68de09f125",
-    "proof_ok": "3639790d6414b474aa1d53de4e7a896b4e6458c078867acd22200f00f20f280a",
-    "proof_s": "ceff5ef2315be8be839b1f3c0314b72d976c2e14a2a27c2d1ce8465e90c98607",
-    "proof_sb": "0ea7abf79fc1bdebc8b9009cc5744358071c12e82a31565d35a8f91069b55c1b",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac294fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "9436b3535d5dcffd6f15628fb028095f5c0733d067222f8893bb106f2fdac0f63dfcf69a5715522c7318b9b311264ee5a2b499057db5d1211e6b9f4633ad433d22dce5f20a95b8a8618b99539bb697791e02b1afcf6e2de8240d067396196b8392e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "95501ee7e32a906f7b762464a1356ef9d36c587afe6312d270470f9dd8f4689d36ce483b894e3569cdb4b6d8ec985ea39107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdda29b3d7b4d76c59124c0bc27120ff3837ad5fa5051d97def76c97c78d50e390a987de851c2ab1b9183bcceed7c0a4b1b84ada28ee30bcf943bc55dcd9b95a5afa12827796faa82093a9e51f9b9f29a6cde2efe3c5f75ae33fdec528f1790dbb860c1bd3e27fd0da2defd8844d06d016f1f8640e270476d6ad43f36140cc2671cb828572c38a6ef2237f506fd5494d38faae68f0d0701d1481d9fadd704d3fc137d9c8aad271510099ff73f3a55bf533fe853b3be7de62994679d3f3a5b414e3ea7c938ec732e73f78bd9c9bdc798261b703f332bd117e7dd7efe9f44de9b6b3a769293cf053ab9aa7824b4bfa40152da3e5e87f3c948351afa243f691caa721d98de1e2e0f7f75912b41ec929f801bda6bfa8fd9edf8e58ac9f0626d5ed75c18e704e8817749c3da97acf9bd969a6a94925c3059c5a3a40d049d4235abcef24db11221bba1670737cfb8fad46b36d7114ca1df31ea0caaf7d32cf432e0724874763b735e844daf44eec6b749f42ff590401382316692eda816f9045291472548304b8f3380adb932bd84d02f3762ef5b9597cae6f37cb7e1d33fa7121fdda6a3118a6edb3f80407f77e8c2c6bbffadfe35a50918152116f908e7d65cbc8c33d0860a1489b48965fa552a193496d0fb7fd9aa93079afbb96b092cc8b19dbc1cbc8be00ef292d1fcf08edf9b8839a27298"
-  },
-  {
-    "comment": "Bandersnatch_SHA-512_ELL2 - vector-7",
-    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
-    "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "69dec7fe79f816d095b04cead45e856ff6c7e798f513e09291958e35a5590443",
-    "gamma": "9adeacd15eacdc651e4db1ea4c0917973eac2000479edf6132f3774601cc6902",
-    "beta": "ff5f6324ea18bbb4df92f7d6304bf27a0a44fa80fd40b985de8d43963a7e02c6ef6f0947911604155c6fe40f68cc91c96ffd358275b58960554274498a70f144",
-    "blinding": "ea1f922fce5e359d92e0fdcda53a1d2e6b791c7e7a8ffad915f3535c6175f115",
-    "proof_pk_com": "f674ad5f72661aa0c2bc5ca83aee9794c8b8bbc4017abcc00a11a23a0b558e68",
-    "proof_r": "f77eaec55fe36b06f1d1f7eef7db24fdcce74c83fde19b1c322aca288e39948f",
-    "proof_ok": "b846dfbceb2a74fe102b3aec94e7b8460f5adcb609c407839ab6cb06d1e3bd38",
-    "proof_s": "35a41d1cb4d22b5c162d319b206db940b6fcef71bbe0c13a6376a89788292519",
-    "proof_sb": "c04b177f954d17e7c129ce8d55cb7f148b3957078c96e7229100dc50b7d62b02",
-    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d6234fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
-    "ring_pks_com": "b8d97722ccfc97a5cf2cc77aa0bbf5a146dca7762b98e2b6bf4b8e34e04e214b28d838eb642749b18ec6b8a0d79d54a3acd644b13615f791f33d648026ed6e169bd516e3413b47ea35c9a8879bc1290d9fea32db7f127ecb33185d102875de5092e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "b50032ef74eae19e39279294c38e0aabf6c7654f026e92cb58a787dfdf46d4964f27399d75af2a76c4b4881f702719b79107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdda02eb84e2e3365aa08b5ee65318cd91957386007948a4c8c02b350e8774e59b5609f7bbf1f577503943d4327fe93383d955f51fefdd5b09177aecf3de41d5ec377371669f230da335d90c5f039e6e17a3767b7f46cd04794051766fa3fa0a442667a210cf68df39ee5fe6628d231347fa35043f0cf7c31cc2915e4815ab2b3450dddfa6c62eed920126b7fc7a44482bfbe11bfbe50ae8fbf42bd53a715aa30475a37b58ede7ba9703e5e4c9ef1bbf5c3c4823bfa843a82eb34664636cc55736a12ff702d19888913285dcfd6d0c54e1edf3592ef1648334531a325e52e5baf14af54b745f71291d2607ecd6827267e94b18a94baa4d4e8e7dcfb2233d87e8a4c0aedac1b41d8789f0c37abde0fbb4f3d91d5adff0d662dec1f5af02c4590062a6c83f534b9b16f5006267ba4e2ca165b1417b31d13b0e5e8f34bca62e0d17048b3dd6c938bfdd7c9abbb565f97e46380eccdb487ce25f0aa6970c881aa7bd90f6b64e5740e968f35ae91d872bc7af96885b4f1cf45067cf606fe78a2aa9ef3cb36e92861b5c22339b1f11802fa72534c943a14a9ea9a996b54b9b9016fd3707dd47f643e64be8eaba5f0cb2212b4a2abf626ededb4ab38f351d8bfbb06c3becfb4e7002ecf4828ce0374fbb421d52acbaedc7680b07f4f8845c8c062d1dd95605f266084fb8504d436c2fbfff9f6daa1"
-  }
-]
\ No newline at end of file
diff --git a/data/bandersnatch_sw_sha512_tai_ietf_vectors.json b/data/bandersnatch_sw_sha512_tai_ietf_vectors.json
deleted file mode 100644
index a8ebcfb..0000000
--- a/data/bandersnatch_sw_sha512_tai_ietf_vectors.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-1",
-    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
-    "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
-    "alpha": "",
-    "ad": "",
-    "h": "8d57b4429fe0634284109950f71bfcf5aa44df39a2945a73d2101693962f974880",
-    "gamma": "12c6dbe75cfd299ab9c779b1a672dc94ba7c29df2c16bdd0b0d11cf622c7cf5d00",
-    "beta": "062651ca286b16ad24029fa900e50071d7a55ef897965b66b43b753f62bff6e84d63e9402982b058f44e4fdb6e242af33195d9f078670a75327a8b592f573ea0",
-    "proof_c": "b6e3890a68dc2843e69acb2f7094c8813eebdd63e10b6482e914a5709b91460e",
-    "proof_s": "aa302644912f1703a779be1cbeb54cca03ce9eef3b12d148b3ed80c47530f013"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-2",
-    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
-    "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
-    "alpha": "0a",
-    "ad": "",
-    "h": "57b75ca092f54aa6789b1e0ffd73dffa8dcb3281ddf28de713829a3c5a61213780",
-    "gamma": "c51ea125fd52dbcef599fe65913a0fab4d9381837252b6e2ce80b28c9d4f925380",
-    "beta": "a1c52b5286e2169069c56ddfc7b748fc9fafac1c761407bb8fdb95365d74eb1b6d4439518340ec08f4316ffae3ac7b45aefcbc94af96bce3b9df37fc62bf625c",
-    "proof_c": "1c7edd762f7a32eb7cda89aa5612620a2b486f7444d8715f8642bd2b7208671c",
-    "proof_s": "e649c67ac6114ac994292999b6c86de3559e1e688372f9be6a97dae54436541b"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-3",
-    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
-    "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "73366813edd2b2b55627f6b09f4ac0042001835532f8226c5868c2e8b468af1f80",
-    "gamma": "d00e55457f0f2c0e5ee0e6fb3647b1e07c25b3798eec707a26a63755dd03526e00",
-    "beta": "0bf0d62a49047260a821582a13d050dcd702f3b67eb7839839b70c07b9c24197d6286b1d4667228b8ddcbfe8e024327551b4d78f9b8f6a5a7aa820ed5a79d58d",
-    "proof_c": "04a94c04afcd7f6fa07dcf5a4023fe459fca75d4eb4c24b3db1eefc9bb04c317",
-    "proof_s": "1f3eaf9916daf57b90777c98da6bad3c82201b951539d414e4673f7661da9706"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-4",
-    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
-    "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "2332dfac3969513b9ff5591ac0ee41fdf75072506e8d1af46d17dcc47436af6880",
-    "gamma": "d4e5ba74dc2c2bb92b99dca063601e07a9ace5f80b9ec295c8384c99b42dc75c80",
-    "beta": "ae953cf4b1101ee665106cc9a70a4eee06dc2ad6ad918230cd9cf56d94a17ec30863174b87507b80a5ee820e4fee8399047a23ad1c5d43e570d97ac95cfca421",
-    "proof_c": "bc82c4dfd3e0897fede71be5e25e3ce5fbc663c84deb95393edb680de8f3e518",
-    "proof_s": "a966cecba43fe06b9154e75837d8f69dcf0b31c6cd661017bcede793bd19b909"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-5",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "dc4276ab164a69cc584b2b8fd3da54531649e075ca2e26688eece1ca9fdc230680",
-    "gamma": "aacbf066133024064dd8923da69ae3fc52b2fb8b2b1a2508621472392e99e00b80",
-    "beta": "a67a122a8423aabb806342b4b3f8f652de250acf964339d8975f07052015ca993b97a96cfc07ed2f07bc8b596eb88f561724d376f25846337af88edf5c86f602",
-    "proof_c": "6fafa4cc7b887dc81e8c190bf87be719b8f8b1de85649d9fd91986cf4a886b10",
-    "proof_s": "99d59a6987476379a577c56faeb0e9278cd5811a7c59ef7588a7c332bad8e002"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-6",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "dc4276ab164a69cc584b2b8fd3da54531649e075ca2e26688eece1ca9fdc230680",
-    "gamma": "aacbf066133024064dd8923da69ae3fc52b2fb8b2b1a2508621472392e99e00b80",
-    "beta": "a67a122a8423aabb806342b4b3f8f652de250acf964339d8975f07052015ca993b97a96cfc07ed2f07bc8b596eb88f561724d376f25846337af88edf5c86f602",
-    "proof_c": "9e7a5f541fedeaa062045dffcaeb23708fafc158d7172ae91dbaad482a66ba14",
-    "proof_s": "8711f489f6ee83a4ce3ebb9455bcf9df307704e916c328194d49c6f811b4730f"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-7",
-    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
-    "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "19dabe58c814c1fda846486816d25c20c5c8e5e8436faeb868be4faa72a2075300",
-    "gamma": "22579292eb93fe045c54c19abb0a7e0fd50c87b33c3f70f1b4a2e4be3d603b1980",
-    "beta": "d10d879d35a898ba56ad092812be75a4ea272480cd9adceb4886806d31672b543b91adaeba27769917a024de221446a793ce84f1f628a091236c0b02a3be8585",
-    "proof_c": "d700a2a158651bbebd3329771c93358f2e64ad62bec42332f36fa22a9a27010e",
-    "proof_s": "fd15d73b873c16e955f7db719b4cfb487dfe1a712bb00e67ff5392e9943fd108"
-  }
-]
\ No newline at end of file
diff --git a/data/bandersnatch_sw_sha512_tai_pedersen_vectors.json b/data/bandersnatch_sw_sha512_tai_pedersen_vectors.json
deleted file mode 100644
index 2d2108e..0000000
--- a/data/bandersnatch_sw_sha512_tai_pedersen_vectors.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-1",
-    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
-    "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
-    "alpha": "",
-    "ad": "",
-    "h": "8d57b4429fe0634284109950f71bfcf5aa44df39a2945a73d2101693962f974880",
-    "gamma": "12c6dbe75cfd299ab9c779b1a672dc94ba7c29df2c16bdd0b0d11cf622c7cf5d00",
-    "beta": "062651ca286b16ad24029fa900e50071d7a55ef897965b66b43b753f62bff6e84d63e9402982b058f44e4fdb6e242af33195d9f078670a75327a8b592f573ea0",
-    "blinding": "e4af0d20cb3061c235600830d70813dcaac0b342b48894831f56dcfdf31e4302",
-    "proof_pk_com": "6575119febbaa478ed86313e7dd9de54d500676e6f21d89fa09f9313bb65fb5b80",
-    "proof_r": "04dbc4b1f78dcb5b415bfe0180a4e325658e1221cc18887bebc9c418229cb95380",
-    "proof_ok": "b095103542abc9ec78ab52ee908f8af6971ae8f264c9a50c56c6f91541ec150980",
-    "proof_s": "72eb2b6da195bc66d18aa2fa07c904933de2c49ee6ac7a982f40350c33a4c602",
-    "proof_sb": "252169cda6f2ca3c652268c93d7e560b748cf2b7f71d30b718bea655e6b10015"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-2",
-    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
-    "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
-    "alpha": "0a",
-    "ad": "",
-    "h": "57b75ca092f54aa6789b1e0ffd73dffa8dcb3281ddf28de713829a3c5a61213780",
-    "gamma": "c51ea125fd52dbcef599fe65913a0fab4d9381837252b6e2ce80b28c9d4f925380",
-    "beta": "a1c52b5286e2169069c56ddfc7b748fc9fafac1c761407bb8fdb95365d74eb1b6d4439518340ec08f4316ffae3ac7b45aefcbc94af96bce3b9df37fc62bf625c",
-    "blinding": "8bc508970435e47c3b612c59594eac65aa3ca320e21fa9707f5138cddcf80f18",
-    "proof_pk_com": "0a6dba773d323e4f57f4ce13608f896da228d5c00666bad495ec160c06df624180",
-    "proof_r": "8134587e9fd6d94ed234da33b37e80b08dd902a91b105f1aa05f58a0cb07a22300",
-    "proof_ok": "d3773503ac5557f7551930f6c14fd9f4d81eb8cc64a87271cd9860cc99a0db6380",
-    "proof_s": "d919a080bb03a8c957e1a89e557c8a40728403b0ba8e7f0abff1cbf6efdffa1a",
-    "proof_sb": "e8f8a9b06e85ad20bdc476d8cc1b42a1f15914262b26516935e69976c88a7a0f"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-3",
-    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
-    "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "73366813edd2b2b55627f6b09f4ac0042001835532f8226c5868c2e8b468af1f80",
-    "gamma": "d00e55457f0f2c0e5ee0e6fb3647b1e07c25b3798eec707a26a63755dd03526e00",
-    "beta": "0bf0d62a49047260a821582a13d050dcd702f3b67eb7839839b70c07b9c24197d6286b1d4667228b8ddcbfe8e024327551b4d78f9b8f6a5a7aa820ed5a79d58d",
-    "blinding": "c88ff20265da7ae2bf13db39947cd750d74b9d10cd5ba6970832e30e20b4521a",
-    "proof_pk_com": "aebda2fc5a43dd5dc2ea0525255306d7493267f0a00f78ec7be3a6ff0a7de15e80",
-    "proof_r": "50e64d4ab8ebced6f254652b8597d55375b0b9ee1b19d0c2c1bf071c6bbf2e7000",
-    "proof_ok": "a0265bef71e318e27e293810a403053f4f3d322a58d406964d71f72a6b52e32600",
-    "proof_s": "b526a963c85eefe4aa307523315a3058e783fe48ceed79c39200be4547045402",
-    "proof_sb": "8c974ae0ac13a0aa5d3997f8de01767e8dbe8526177b51249299fbac58041805"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-4",
-    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
-    "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "2332dfac3969513b9ff5591ac0ee41fdf75072506e8d1af46d17dcc47436af6880",
-    "gamma": "d4e5ba74dc2c2bb92b99dca063601e07a9ace5f80b9ec295c8384c99b42dc75c80",
-    "beta": "ae953cf4b1101ee665106cc9a70a4eee06dc2ad6ad918230cd9cf56d94a17ec30863174b87507b80a5ee820e4fee8399047a23ad1c5d43e570d97ac95cfca421",
-    "blinding": "b84ed72987524cbfe62ad0d947f53c880b25c539b70a440e1052373edecd3d02",
-    "proof_pk_com": "e1c0a6e682f7ad51531e9580cac967584580be2c0a7e3372cfcb662ca6589f5680",
-    "proof_r": "bf335b71f9f7a413e0099c2ca13def7bec1dfee856b05cb9b5d798d4560d0c0300",
-    "proof_ok": "082084d4130c2c573ce2aa2832da054bba21b484daac99d59b91a92d29f0680100",
-    "proof_s": "44b51bf45f139424fbc6495a9e525acfef101f69fa117c5b48cfce623c216d02",
-    "proof_sb": "f903d8bce02fad42ebffb56dde18946a7c224be969fcb72df8471fedefd3e301"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-5",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "dc4276ab164a69cc584b2b8fd3da54531649e075ca2e26688eece1ca9fdc230680",
-    "gamma": "aacbf066133024064dd8923da69ae3fc52b2fb8b2b1a2508621472392e99e00b80",
-    "beta": "a67a122a8423aabb806342b4b3f8f652de250acf964339d8975f07052015ca993b97a96cfc07ed2f07bc8b596eb88f561724d376f25846337af88edf5c86f602",
-    "blinding": "cc3476cb311c1d8531ec3dee7c9e566a71f126d248ff0d85dd9b3d53f51ff60a",
-    "proof_pk_com": "a537be3ea6c6ab278fbeed05e98a5bb72c56871f131b1fb7c74aaf3f39efad2180",
-    "proof_r": "4a292faeaf1a86c1bdbbda245a30b0f72b31ff768c1e4b20ca179a81f40f6a5380",
-    "proof_ok": "6d63a2b05cc3a230a6a02b89c63c2a4daa13cccbd73e82960813d65a2d0d5b0580",
-    "proof_s": "5fa9915f00babffe7d83088aa4dfc47cec93be8fc4f91fa8da2dd60be72be10f",
-    "proof_sb": "247524bdf28b781e8426ac75a3a29264a140a41ca140e310b85acf8da30a3d1a"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-6",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "dc4276ab164a69cc584b2b8fd3da54531649e075ca2e26688eece1ca9fdc230680",
-    "gamma": "aacbf066133024064dd8923da69ae3fc52b2fb8b2b1a2508621472392e99e00b80",
-    "beta": "a67a122a8423aabb806342b4b3f8f652de250acf964339d8975f07052015ca993b97a96cfc07ed2f07bc8b596eb88f561724d376f25846337af88edf5c86f602",
-    "blinding": "706597a0fef30155b91cb85fa7c3c1e383daabc4f44ef4f1d5e3e54248eefe15",
-    "proof_pk_com": "c0a28885a95dc3976580cea2a2d4e0130f0cb4bf4ba3da9734fb14d3d5fdc52300",
-    "proof_r": "12704ac7faf2078429644aa68434b6f21409cfe33933abf96bca6cb6f0998c2380",
-    "proof_ok": "6d63a2b05cc3a230a6a02b89c63c2a4daa13cccbd73e82960813d65a2d0d5b0580",
-    "proof_s": "bba4b5ad18f8c7a939d4c2c52b5b4244f1415f4c62db5e89dcd99d978befe911",
-    "proof_sb": "70a6e2bda45d4bbd11e40aae0d26a40bf04080db68dd766583f57ee992630d06"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-7",
-    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
-    "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "19dabe58c814c1fda846486816d25c20c5c8e5e8436faeb868be4faa72a2075300",
-    "gamma": "22579292eb93fe045c54c19abb0a7e0fd50c87b33c3f70f1b4a2e4be3d603b1980",
-    "beta": "d10d879d35a898ba56ad092812be75a4ea272480cd9adceb4886806d31672b543b91adaeba27769917a024de221446a793ce84f1f628a091236c0b02a3be8585",
-    "blinding": "5dca678c065db3959801e1dd0c9588d044956ad961f7440eeb16e1d91ba32d0f",
-    "proof_pk_com": "c1da787eb3bd39d165fc7ce1a3303841651825d7bfd5ba38926e5a0cba312f2a00",
-    "proof_r": "cf9d46fc085c0660d145b9d0d1e3eb8ab1fb739586222c72afb7a3d6cfbd6a4000",
-    "proof_ok": "26c0818e2e3fdc5b7d70aa0c8c17c521423cf82e805fed9f760c253d2d55d64a80",
-    "proof_s": "e8b73fdec9ac95e3fd91becbb1a312a10abbf9a9f2215a8aefdc6bf83486830b",
-    "proof_sb": "2c578df5e5e710ed1ec3c9a35151f171ac6257ee814f58f3a03767a8f3983c0f"
-  }
-]
\ No newline at end of file
diff --git a/data/bandersnatch_sw_sha512_tai_ring_vectors.json b/data/bandersnatch_sw_sha512_tai_ring_vectors.json
deleted file mode 100644
index e8c6053..0000000
--- a/data/bandersnatch_sw_sha512_tai_ring_vectors.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-1",
-    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
-    "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
-    "alpha": "",
-    "ad": "",
-    "h": "8d57b4429fe0634284109950f71bfcf5aa44df39a2945a73d2101693962f974880",
-    "gamma": "12c6dbe75cfd299ab9c779b1a672dc94ba7c29df2c16bdd0b0d11cf622c7cf5d00",
-    "beta": "062651ca286b16ad24029fa900e50071d7a55ef897965b66b43b753f62bff6e84d63e9402982b058f44e4fdb6e242af33195d9f078670a75327a8b592f573ea0",
-    "blinding": "e4af0d20cb3061c235600830d70813dcaac0b342b48894831f56dcfdf31e4302",
-    "proof_pk_com": "6575119febbaa478ed86313e7dd9de54d500676e6f21d89fa09f9313bb65fb5b80",
-    "proof_r": "04dbc4b1f78dcb5b415bfe0180a4e325658e1221cc18887bebc9c418229cb95380",
-    "proof_ok": "b095103542abc9ec78ab52ee908f8af6971ae8f264c9a50c56c6f91541ec150980",
-    "proof_s": "72eb2b6da195bc66d18aa2fa07c904933de2c49ee6ac7a982f40350c33a4c602",
-    "proof_sb": "252169cda6f2ca3c652268c93d7e560b748cf2b7f71d30b718bea655e6b10015",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "aa8c95ce69477054192546bbc5f3dcf39a3748920d88ab90689c6247a3207095375a279f18be6de223e010d170b4146484288fe0af65c803159cb2dcf0231c8f8660569f4c177dc54d7cf98a315a8b6b70920b2a01e7e4300cf0302503b39fbf92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "8c8e87bbfc82d483bb4732ca9370c9860a53c1a9755718f68d86b82d8bf3063a437a7d1b4f44bd6d1584aefdd55fa5fa9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb92e124a5ca06f0325ec7504343a68dbf61f96aa7a37b946602b4286038f7731f484246bbb0025548db5c0f98933fa72935d9eb91a3c19463b3ecedee771a1fbaf5413918d059387b978eb1df01d3e1c26a4675b530568a11e91304634dddcf6c97a5e181f4ee6d4b8e3762a8ce2a2d4197f03d3679da7656281f95a2e4ff90b31e656c1237c5888c129b85c21b59613ad565bd96e74479e55cf0a7922306b5c03c8b05c04793c0fa1164c1db3a4147d64404e8c6736d6ea62bf1979d48b60574b2fc3d669389bf9140f3ff5778c4b973aeb736c5a6750636ea290bbb7eece15fac0022cebe84c74b85c6fdfb947712686bb6a98b22bd6eefda0d587f947c506e7c5e762f890090d1be75173efc8b50b2ff3205bf5c2b324ce907d489a27ed18bc63f2653bad9aeec0080ce317f0612c41f92b7dff9a5fbb36af8f40735e36188fa35b4b1b6816d21f49711e0421298739ba7088fa133f666beb1147f705e1a06a032108075758424c428bf3e7e5f1df1f57a2c69b2ddb351f416caa41d700e033037a96aa4a65203995892f8218b00c92864763f796e7aac299e24e2292b03aea32b23f76db44cc53dcd0e645975d382245c72c5961bbab58d88bda453ce2d1b0152e77959d2fb70367728257b4c1ef761f4e0cc98f64fe3ea141810d9ab73a4d198ababf526524b2b843f5a3a0976d"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-2",
-    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
-    "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
-    "alpha": "0a",
-    "ad": "",
-    "h": "57b75ca092f54aa6789b1e0ffd73dffa8dcb3281ddf28de713829a3c5a61213780",
-    "gamma": "c51ea125fd52dbcef599fe65913a0fab4d9381837252b6e2ce80b28c9d4f925380",
-    "beta": "a1c52b5286e2169069c56ddfc7b748fc9fafac1c761407bb8fdb95365d74eb1b6d4439518340ec08f4316ffae3ac7b45aefcbc94af96bce3b9df37fc62bf625c",
-    "blinding": "8bc508970435e47c3b612c59594eac65aa3ca320e21fa9707f5138cddcf80f18",
-    "proof_pk_com": "0a6dba773d323e4f57f4ce13608f896da228d5c00666bad495ec160c06df624180",
-    "proof_r": "8134587e9fd6d94ed234da33b37e80b08dd902a91b105f1aa05f58a0cb07a22300",
-    "proof_ok": "d3773503ac5557f7551930f6c14fd9f4d81eb8cc64a87271cd9860cc99a0db6380",
-    "proof_s": "d919a080bb03a8c957e1a89e557c8a40728403b0ba8e7f0abff1cbf6efdffa1a",
-    "proof_sb": "e8f8a9b06e85ad20bdc476d8cc1b42a1f15914262b26516935e69976c88a7a0f",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "95af28596d8f33bd524f7c210a4a343db36dd2676b1b36dab291c7e2f528f6d60f224fcdec7536461e9d8b5e6c7d47f5ad66efa978d41b2169a36fc4ee76d0d1d10c4b4ac24f96c717c30cc2468cde7017addb51c9ad42642ebcc4c7c7380d2292e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "a493f98edeb4bece39ece682c952004dab0004b056eb6518b33793c9fc3ffff4045451775800abf8a39362de4d81f0939107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdda45dee4d684f1108d33235c53930131d24f9ced9a43e4e5ec087f75accc542f3dc5e9fb2273aab44d53365481389eacab652cea7a48034d4d02fafa1d0ac1c41937f8c855df11cd85761e2e57f30f68fe448282a988431336db2db8dd59ff755129b92e8af732877d02c0cf23f0f1a25e60f28cf18b741b57b85d69f0b5d9828165b81a85fb2ec796aae1dea9bb59035c55c115591b26790d03b57f35bf6712663294135af929a7a09f8aaeb6566ce99b3a5666880e46aa7fa5155785f1c2f5cd869de8d001f661d1a7853c39837e0a9ca0a9cc892e5d86c5885b03da56cd36aec8d5d7f0fbf2953afd5130165d4534684c6e4df0d5c4044e4047186bc8011224cf80fa8444de5fc3bf2b147b707ca2fff04b5f63296bec5986b159e91d4542e4fc0f2b39bf7832e4f7464f76f690148e61a4367cf414372458cbe6d41d88f0089b5816ddf6e61a04ca5499db1f4de5b96a0957a9301954767f11daa74e94cd36e524450ee97e43a0967c4dabd75972c5a457100e8f5e4ca3896fb0554996c45f5de2b8f999dff83fc81e1466da8581fa81a66e597723d5745d906cf40df1d6bfc66b7096a364376b728f6210ebd9a65067704f8ec938d734e5a0a4c900a02c9addff9f0d7ab4c109dbfe5c413d74afced6e48f0f26b7fe2cf570ec941c6831036062e2a9cf671a0104c672d8ed5fd8b"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-3",
-    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
-    "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "73366813edd2b2b55627f6b09f4ac0042001835532f8226c5868c2e8b468af1f80",
-    "gamma": "d00e55457f0f2c0e5ee0e6fb3647b1e07c25b3798eec707a26a63755dd03526e00",
-    "beta": "0bf0d62a49047260a821582a13d050dcd702f3b67eb7839839b70c07b9c24197d6286b1d4667228b8ddcbfe8e024327551b4d78f9b8f6a5a7aa820ed5a79d58d",
-    "blinding": "c88ff20265da7ae2bf13db39947cd750d74b9d10cd5ba6970832e30e20b4521a",
-    "proof_pk_com": "aebda2fc5a43dd5dc2ea0525255306d7493267f0a00f78ec7be3a6ff0a7de15e80",
-    "proof_r": "50e64d4ab8ebced6f254652b8597d55375b0b9ee1b19d0c2c1bf071c6bbf2e7000",
-    "proof_ok": "a0265bef71e318e27e293810a403053f4f3d322a58d406964d71f72a6b52e32600",
-    "proof_s": "b526a963c85eefe4aa307523315a3058e783fe48ceed79c39200be4547045402",
-    "proof_sb": "8c974ae0ac13a0aa5d3997f8de01767e8dbe8526177b51249299fbac58041805",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd07950361002a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "a660ecbd7dd1f12ca87f8d23437f583741e3be93618459ad82e9e9d5b70130db70c92d272a7467ac3afa1a623d266bef8aa25b62dec13912cacd50404dc40a5612d9e0dce06f43faa8897185882c43cd4e24104641be52784b0267b2d6baf32192e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "b66fbd9fedb318181d95ba6af39c1b1635381f15e648a62830469dec2bce8424a68161d76fab78088f9dbeb2d730d2d59107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdda54d7438c2a2bd38353fa419d6ffff9d896aade5faa1ec692025bbf46f1c41dc863d6cffd4c35d9acee2247ea3a515d3a17c473d408289f3116152159a832341c2615cd542f0b6c168966356581bf69f0dbda113d9412955f1e732471f5b6cdb12e4a17a2191ec61339677fefd8501ba536e88e9db297a4bb885e86d31f27324aa480a9baba250c64b99df54a03bf0402835c88b48651d727f4fcb608557580f2a887faf632c9d4804b034c07215509a79ca5bc67d02e7dbac1f00bc53929e56e663a612012b3a55feba2bf398bb8c8a9b35cee94b33b2693eb7d05e3afc0e4dad99548c83ddbd668b2458800fa1b7edddb72124618a6e7d52c06cda6c4ea14a1390b593524d7b94cf32329c15ec72f63438c425762654f2784c01dd5debe15c9ddc49e0f6a5da9c7fac0beb8349ac828cedc358bf942580b37a7e98e1b6a416ae4be06a2e2150a8fdc889a17c420b8cc581b2f4e91759522db932e670521bba8cdf31eef7cb189895addcc0c455cd434bff395de94fff79e0c8fd3772362794ed6d583a2e3f8ba3769da49f33c2211aae74f79b79d6f8e34cb044540a2a83147a3843786890fa89bdc2af1d7ccff52302bd38b2d241f4bc5aa05b5007704b9c94ba1d5c4e0112b490f026c5545f1c8c66b9de37ac4589a38b3594b3b1ef3f7792bccf7c36cb388651fa4f1152de503d"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-4",
-    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
-    "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "2332dfac3969513b9ff5591ac0ee41fdf75072506e8d1af46d17dcc47436af6880",
-    "gamma": "d4e5ba74dc2c2bb92b99dca063601e07a9ace5f80b9ec295c8384c99b42dc75c80",
-    "beta": "ae953cf4b1101ee665106cc9a70a4eee06dc2ad6ad918230cd9cf56d94a17ec30863174b87507b80a5ee820e4fee8399047a23ad1c5d43e570d97ac95cfca421",
-    "blinding": "b84ed72987524cbfe62ad0d947f53c880b25c539b70a440e1052373edecd3d02",
-    "proof_pk_com": "e1c0a6e682f7ad51531e9580cac967584580be2c0a7e3372cfcb662ca6589f5680",
-    "proof_r": "bf335b71f9f7a413e0099c2ca13def7bec1dfee856b05cb9b5d798d4560d0c0300",
-    "proof_ok": "082084d4130c2c573ce2aa2832da054bba21b484daac99d59b91a92d29f0680100",
-    "proof_s": "44b51bf45f139424fbc6495a9e525acfef101f69fa117c5b48cfce623c216d02",
-    "proof_sb": "f903d8bce02fad42ebffb56dde18946a7c224be969fcb72df8471fedefd3e301",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd07950361004f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "97a870c4184f6672d78dd536b6f0db56031345e1a42c059f94cd9280ea7e390fad8c3e7b7cb52e6c8962146300f85efb84a82d8be9b7c73f77b235a7147c869bfd7eeba47ac65a8f849f6d891619457e9dedac354f59390b1aec8f2974a8071292e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "a196cad42298b241837feffec1e7326732e303a296c520da93aa5d710ca456f0d491ac2efef5e21a30b25f1037b704899107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd8bc5d5e165e44259166f06055f1bfe0250123d72b5fa3c84571c9ad6d595cf2c91e9b55e14583446d380e050684af17689018357096634fbf29f300318ac5e79fb8898daaab7f7d7178de4b0ca0b13af4e04865eb47a1bbea9181a4c292f3fdaeada31f180192f3b54016a235666370059879a75b8457f8e97d25c68817aac302594c218aeef4a16d9d39669c6968db0465e98194c4cae4de9477d8b3d85cc298e95c7f133018eec31f536e66a21df84a7b177dddd198fd0319ea8ce84e13e21bd479c5fb6fa207b87078c9df6a5943918015066c9bc4f6a452e186d00c2a941806dc3f730bea502282f01d209bbe76520e435233b14b1fc3a41b250b175f239483d2cfd3242fd7582e9c81176d55265d25643dfaf6c8e69a42293a63d5b48601cb824616fe0726932da6d2d696caef5ec1e48dc0bcba000c1e5dc3cf0179158b111b2848dd6b9b2debe985a2ec9d2b6f424117b85a21dce3d08867e31fa619ba3503c012a5c2327c1c851fcc1eadf7e97f25963127c3643d115aeb43de2c340610288feb37b17b6f06d5b4686b8fe2899604d9e2a88e2295e7389b65078b9cd68a863c700278945f2bdf806593060c9316c659b8fc50278afe878e698c79fca94f853d8289d2de5b97613c585d619c33993a577c4eadf216cac7c5dce457115a06d07701391789b1479792e435ab0c0"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-5",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "dc4276ab164a69cc584b2b8fd3da54531649e075ca2e26688eece1ca9fdc230680",
-    "gamma": "aacbf066133024064dd8923da69ae3fc52b2fb8b2b1a2508621472392e99e00b80",
-    "beta": "a67a122a8423aabb806342b4b3f8f652de250acf964339d8975f07052015ca993b97a96cfc07ed2f07bc8b596eb88f561724d376f25846337af88edf5c86f602",
-    "blinding": "cc3476cb311c1d8531ec3dee7c9e566a71f126d248ff0d85dd9b3d53f51ff60a",
-    "proof_pk_com": "a537be3ea6c6ab278fbeed05e98a5bb72c56871f131b1fb7c74aaf3f39efad2180",
-    "proof_r": "4a292faeaf1a86c1bdbbda245a30b0f72b31ff768c1e4b20ca179a81f40f6a5380",
-    "proof_ok": "6d63a2b05cc3a230a6a02b89c63c2a4daa13cccbd73e82960813d65a2d0d5b0580",
-    "proof_s": "5fa9915f00babffe7d83088aa4dfc47cec93be8fc4f91fa8da2dd60be72be10f",
-    "proof_sb": "247524bdf28b781e8426ac75a3a29264a140a41ca140e310b85acf8da30a3d1a",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "8f842eab67cb128e69482239c6335fefe91d759a0690421657dc155dabdccc21e75eb25c44dcc8def5f8c07c0cce387ea376f7eba816250c3dec261668ad5f4236b4cadbd2f0b439cd1f5e4f95019eb55fced7e1e13cfcbb1235783f33f85e4992e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "a01f3c5dda3469b6e9eb66f35e53bce5bea6ef0add5a7a6e60a3b452147dcf48b7dff60e11265c2528fd99ed47e2a9bf9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd90dbff316dbfa2536513e6cd61a03b1ef34ea52a3609e1744855fddcb8addcc4a8a64a541d4988c7439d47e93c758b1c8b02e364ca49a80e776bf5f6b1a27bd739fbff43bf3ca4db287178907acc1a0b4ce4c7ede3c22b8fa0cb164f49db65977632d7bbb06fd0c6b5ad661c923fcbcdc6fdc6f85b7798b2ee42b07cefc66c3089aa825acee46a779dd95deee80bd8e7d2807bd2bfdc79d864ba049fb7916141e442082c3ad9b04ef126313eea5db31abdae0c77f30b1543c6f555614530262158ba60e1d7e1bd2276b10bebd0f0ac8351ad9abfddfe49c241990ca1d0e87c566af8b19f0088f963035de507c01911ceb1d4143edce39afcc84be2b8202d5638628295e9fd21b6844f686410ad98eabf01fc03b6026dc53411959c1d14ad1d1cfdb4579c1ad06705c2e493bba56ba95b51f1f0ac7264dd8ddb6765fe02b40201b5ee12ef83ae6087e9256fc1bc5929812ad02e905c14b521eb94abef431ea43e859d123ec61f86510bab1391c0424f135c9d90052deaabbfd44c0d089011ab3b8334027d6e0cd4ca8190f377af395311929b592f755f5ff91883cb18df5b14a0c71ce1ac0413775ed1843bdd57f51067bd382598171fc60677977e6d4ebc5ba2a8d3404daa0ac90a04fec089632e9e89c078bdb1ff57dfe931a13679ae9b6beb8a9c9e8428267141e8ead75afbe9a803"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-6",
-    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
-    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "dc4276ab164a69cc584b2b8fd3da54531649e075ca2e26688eece1ca9fdc230680",
-    "gamma": "aacbf066133024064dd8923da69ae3fc52b2fb8b2b1a2508621472392e99e00b80",
-    "beta": "a67a122a8423aabb806342b4b3f8f652de250acf964339d8975f07052015ca993b97a96cfc07ed2f07bc8b596eb88f561724d376f25846337af88edf5c86f602",
-    "blinding": "706597a0fef30155b91cb85fa7c3c1e383daabc4f44ef4f1d5e3e54248eefe15",
-    "proof_pk_com": "c0a28885a95dc3976580cea2a2d4e0130f0cb4bf4ba3da9734fb14d3d5fdc52300",
-    "proof_r": "12704ac7faf2078429644aa68434b6f21409cfe33933abf96bca6cb6f0998c2380",
-    "proof_ok": "6d63a2b05cc3a230a6a02b89c63c2a4daa13cccbd73e82960813d65a2d0d5b0580",
-    "proof_s": "bba4b5ad18f8c7a939d4c2c52b5b4244f1415f4c62db5e89dcd99d978befe911",
-    "proof_sb": "70a6e2bda45d4bbd11e40aae0d26a40bf04080db68dd766583f57ee992630d06",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "8f842eab67cb128e69482239c6335fefe91d759a0690421657dc155dabdccc21e75eb25c44dcc8def5f8c07c0cce387ea376f7eba816250c3dec261668ad5f4236b4cadbd2f0b439cd1f5e4f95019eb55fced7e1e13cfcbb1235783f33f85e4992e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "8f98b0114660f09d7d63b8dd6145524fd6b2f051fd8476862f020cd146fc6081ec33f1b5d90393bd6ddde723562657089107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd81f9b3181b1e9dd4666eb31f96440f453fbde0e49ef38dcffe008a558169f83a2beba00f27be414cb91ae709a200d156874bf002c6fa3f1df573f9d284f73c98b341d8dc43235dd0915a6ddab1842893f4a5fde6038243ebb1a47aac9720c09616d1c77fee4833314204ea259f21fc7e7529d3814d6b4988a8b32b590fcbca5ce3a796a962601f52296bc5968afd9a45f0372b7b50c0093faf6ed7a75a9fd8225b7dbb73c98e6ba49d9db8d6af0ee668f0ff1ebc4b1c1b7eef692211c3dd2266307be92b80769b98e79883e6e163987a9de0fed3869366b839f91f082d8f6f59bccbba746f2cf5213bbcbf6520522a487d14f7369bdefecedfd32866ec7d371fb60c2134a7f2a188049fb3423ccd411fba19a5e917c9af077fb91373af81394db2766df2ef78e4f1bf8bb1e6ff8f21feacee7033cd04dcfac9cbf3e86524d559a7ecbd99f6210aeddd5bb3277465bfcbba1e7c2caf018f5595f3895d29f5be59e62b4636c80846211ac609880118d5e0dfa15f43ba84a1e2c16097085f48e0c33ab4f225c3fdfbb53c3d175808736317894f41de9c90627079ebf3ea682941ae0ef0ddcc958af06b3bdbf9cc5e371d77a4c71578e7c5ba245230bdfedf672d959935c3b383cb0c4440270a8b596254e5774e6be5f8713946e51d8a88d1e6573369ff7a729d698d2f280d4c8f89ec8913"
-  },
-  {
-    "comment": "Bandersnatch_SW_SHA-512_TAI - vector-7",
-    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
-    "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "19dabe58c814c1fda846486816d25c20c5c8e5e8436faeb868be4faa72a2075300",
-    "gamma": "22579292eb93fe045c54c19abb0a7e0fd50c87b33c3f70f1b4a2e4be3d603b1980",
-    "beta": "d10d879d35a898ba56ad092812be75a4ea272480cd9adceb4886806d31672b543b91adaeba27769917a024de221446a793ce84f1f628a091236c0b02a3be8585",
-    "blinding": "5dca678c065db3959801e1dd0c9588d044956ad961f7440eeb16e1d91ba32d0f",
-    "proof_pk_com": "c1da787eb3bd39d165fc7ce1a3303841651825d7bfd5ba38926e5a0cba312f2a00",
-    "proof_r": "cf9d46fc085c0660d145b9d0d1e3eb8ab1fb739586222c72afb7a3d6cfbd6a4000",
-    "proof_ok": "26c0818e2e3fdc5b7d70aa0c8c17c521423cf82e805fed9f760c253d2d55d64a80",
-    "proof_s": "e8b73fdec9ac95e3fd91becbb1a312a10abbf9a9f2215a8aefdc6bf83486830b",
-    "proof_sb": "2c578df5e5e710ed1ec3c9a35151f171ac6257ee814f58f3a03767a8f3983c0f",
-    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd07950361007cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
-    "ring_pks_com": "afe4574dc960760ef76743063b5058794bce29c132874a38cb656111179f63a5e64386fee78db668806e3c5b62b458b4af50466b03018fc84f1f47dab65e241574004264ef879bbbe459f95f479580452a1c1d4fd772545a99d2d6e9915c466992e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
-    "ring_proof": "8cf088d24eac8e6ab8de2d8526357fe5a86b3a28111582c504c55c0b80545bbec5fc9c3a4c501e699727973ce44d56149107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd994797dfbcf02bd1f04cfeed715dc8d4267e6e485ed200289725b2d99d88dfc6a69a9fa4e33538cd6db03b82df261d5bb8ef85dbad5bc7d98d6d66c992e718ee9c9385d7ec92f2533ce8e694ca9d724e0bec094accf4264de162cd866b64c73404fbe1ca804f2fc18e8a9494aa12d0b07d71ac39c6d81fdf2ee61a0b13e6352b0c9cae2b159ba8e425912e6b5781efd2a7e059f4e1fcbcc9e206f26d0d5e37039f264751f51556a5d7566d8df9113e00fe9eed6199b9d4993270735ca9c89d2952413d128c0c8fff19ad83b0c6b23adfe13cc0ab92e64b26c549fd6e5e6d996856fe43281d6fb2735366b1d2972bc75c0ec911ab7868dddd8c87ea98e8813e319470a207b137934e7adc7c4bd0c5d83ccb1bad00de40e4383c89078fba55451661d4509cafc8914b3df6a4ff2108a211b6cd6ab17b79f3065ba252d663b9922882c6a9e27166f521ef48812fc684a9955cd6bc1cc559d07f473bb65711d8f18fb146b7929782518c2c1700f8aaa3fb57658e5ea4c6475df5b67dc0f21905d54049997cd8245b0268ee3a09763215190f831acccfe0654ba51d02499d7f8942d366cae0edecf5b46fd9d55feedc3af8ca9c30a4946ad53cf7f9694042c5299100b49a95ee2fcccc4e90fa5f0fc88eabfa13355dc3b48e0119f07498851a191a5d1e7075afdf58c462e7c181259b555bb1"
-  }
-]
\ No newline at end of file
diff --git a/data/ed25519_sha512_tai_ietf_vectors.json b/data/ed25519_sha512_tai_ietf_vectors.json
deleted file mode 100644
index 6b730d3..0000000
--- a/data/ed25519_sha512_tai_ietf_vectors.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-1",
-    "sk": "fc4722b3efeadcfa8b437f6e34f71c50a240bd2e66b958c5c17519cc9d936906",
-    "pk": "bf512469e7f9b766bf5c75e47e84fda3ec887bd24d79b9165c19e01a88fe5ff2",
-    "alpha": "",
-    "ad": "",
-    "h": "bd0eb63f8c2de52d16871890d28ec5e6bdfb2bbac24f8c523522c7738eb5bac6",
-    "gamma": "ec8b2d5571cd0d55985165c17ae73c6ebc0324464a3518a274aa18884570542a",
-    "beta": "95b690dc0f1cc3dd99129c92c4147a011c0d6a205945920fabcc2e57548ff6985cf5ae18b13b1fb9397da01093ce4eae7646735ed5cd691959a4155fe3854ee8",
-    "proof_c": "4c23b741895542cc9642ac1e2ecff785",
-    "proof_s": "8ea178a4f6d0806826c88d64313f58dbad8ebfc94a4e90c8dae6ee4ea5611400"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-2",
-    "sk": "3ed3f4d0fadb42cb77d42a7ea57def2bad464bd1ae0c896dd077c04358415c04",
-    "pk": "a9a4b61b52db164253147e0c5bd20852d7ab4763e996d0117febccbc7a1abbd6",
-    "alpha": "0a",
-    "ad": "",
-    "h": "4c1e5af1026d6d903fb3f8daea2ab896b0c53d51f8c1adae82450e3b33cb8e6b",
-    "gamma": "bb786e4d98ee669185bef781eb18ff85279730df78c9b52df8309b74def08de9",
-    "beta": "0cd73e79c3aa8ccb3c2d4b7724bf8e178405d61aa0a620c535fcd4b77595eaf68405cc58593f49d38c29af5aaaba6ff274a6b6cce5f2fc0ef23121e41a5a35ca",
-    "proof_c": "08ad9e6f364dd9ee82f532d724e5b42e",
-    "proof_s": "6be4898a9dcc386a8b25f03dac9e43f12429c0bed13239ce0a316ba85317b20a"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-3",
-    "sk": "a665fa5af45ab71a60a6b667bc995423d5ee43197a5fd93b16f761cf0bdf0407",
-    "pk": "0b33325148327641856fde36d56aaf2cb1e4959824bb0916517160d402973bc5",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "d759bf177d1c7f58c184973e7e82903e33db3d4510a2f04f88d48ae9ee30cd54",
-    "gamma": "c97e866e8d440a96eb9029478c0116df937e67915bd386c9d9fc5225407bb997",
-    "beta": "f92b21084e6b604b540e5ab8d63c1cb30fae5fcce8e6a5666c6058cca6bb800716d411aa242a231257e2bea1e844a883b66a7eb429e886f44a328356b22710b6",
-    "proof_c": "8d0870aa756d3dd7de07ce72406496f6",
-    "proof_s": "f3c6644aed20047e35630e4d71cb9bf931731926565f44a42d6f0b476fb97504"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-4",
-    "sk": "9a150e5caf622cc949d95af8980d458b551ab394d52ba49759433b4d04d9f703",
-    "pk": "cf2d35428c1e329dfbd5ce3a6aafd8cffe31c6a0685471f59f5cddec0725483a",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "c4ff0e17d0fcf2f98c57c01d1095d5beeed2da007ca91d608f8c0674e51f5058",
-    "gamma": "bfab3b751e4bfa1fa0f82a582010e147a2801ad32e9a2f0d727562aeea3b4e61",
-    "beta": "1a70a66d95eb43ee4e068c96c96806b2f7adc6d7959089f7981e8e5ca346bce69dd5c64daefd64463cc03c848897a67614cead01dbef3729bf8da98ead9d6b07",
-    "proof_c": "250e9f4833d1d199506e6bce58b5844c",
-    "proof_s": "2466c199f6f7d597195ea38774494b166a3f613bf4585f6b9a7a1b47943dd40e"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-5",
-    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
-    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "bc89b34d01bda6e9115462584ed1f5554e9035ea4b4b77d27dbd3027c16dfa43",
-    "gamma": "50901ea735820db2198b6b6a8c8b62abdbc7bedde6b88a30e439583f1e387103",
-    "beta": "4dc1285faf82ddd0b0b60f6055051d3f501e0b55b57d5f440467eea15dce84e56b20dca9462c11e57439b558b557f09a5ae8fbafea3f2d477f8f9aad10f19fc3",
-    "proof_c": "cb5a4c458223730be8ce884b88bce347",
-    "proof_s": "84398b8430f7108835079e7f765cf05c534dcbcdc772d443c7dd02aa58d70907"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-6",
-    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
-    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "bc89b34d01bda6e9115462584ed1f5554e9035ea4b4b77d27dbd3027c16dfa43",
-    "gamma": "50901ea735820db2198b6b6a8c8b62abdbc7bedde6b88a30e439583f1e387103",
-    "beta": "4dc1285faf82ddd0b0b60f6055051d3f501e0b55b57d5f440467eea15dce84e56b20dca9462c11e57439b558b557f09a5ae8fbafea3f2d477f8f9aad10f19fc3",
-    "proof_c": "1d4801a267187cd3f44d27c12e30efe0",
-    "proof_s": "3ce259afb7a906dae91d2ef54a56ead385595344e741290341ba60506f049005"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-7",
-    "sk": "0f6ed8b686b6ef0b2552344803cb0f92a84a654fd46f0e98782c6de71f98d40c",
-    "pk": "ea18949e73be86cf0c7de5e688c782689b72c49741baed797ee1a128d7cf1bd7",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "7c25195638eec350e910363a88a0fb98998fa29569c897537687086ea2f795c2",
-    "gamma": "119d3bdf04ad8bd51dbb773a72a48e31e1cf5807f96042fd877b3b1bdfc9001c",
-    "beta": "3196e4d009ed713a90c691c6fe350394e560700a6a35f22d5071331eb0807a92d50458837dfba24f84752e8cb0574f2a53e614c5ec23e2d2388a9566b0ea03d2",
-    "proof_c": "fb63c3ca5db83d5117895bf9496ad550",
-    "proof_s": "4c0b61ed060ae9a8a9abc50cc85818a0fe3a8f31e60d7e7dd701650cfde1a600"
-  }
-]
\ No newline at end of file
diff --git a/data/ed25519_sha512_tai_pedersen_vectors.json b/data/ed25519_sha512_tai_pedersen_vectors.json
deleted file mode 100644
index db86a2c..0000000
--- a/data/ed25519_sha512_tai_pedersen_vectors.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-1",
-    "sk": "fc4722b3efeadcfa8b437f6e34f71c50a240bd2e66b958c5c17519cc9d936906",
-    "pk": "bf512469e7f9b766bf5c75e47e84fda3ec887bd24d79b9165c19e01a88fe5ff2",
-    "alpha": "",
-    "ad": "",
-    "h": "bd0eb63f8c2de52d16871890d28ec5e6bdfb2bbac24f8c523522c7738eb5bac6",
-    "gamma": "ec8b2d5571cd0d55985165c17ae73c6ebc0324464a3518a274aa18884570542a",
-    "beta": "95b690dc0f1cc3dd99129c92c4147a011c0d6a205945920fabcc2e57548ff6985cf5ae18b13b1fb9397da01093ce4eae7646735ed5cd691959a4155fe3854ee8",
-    "blinding": "608271762d04c2146d8c6cf4d139d9fd33f1e3e54e8f6687ce711a90a04c9e0d",
-    "proof_pk_com": "471889192911555c36393dcace714d61e8618d2cdfc7daca22808c4650ea038c",
-    "proof_r": "011cd10661ae0ddda53e9f45fa5472357492e1aba3320b5a72eac8d767bf4b47",
-    "proof_ok": "bc9af17aadd97245d0489bb3ca71b86b1ab8e52aa60e5b1e5f14cb7b4e294f4c",
-    "proof_s": "76f19258f2a08754e0cba8c84c559ea03243316a610348bbc40af304a33cf302",
-    "proof_sb": "11dea59028a41d1fa2372cedb67d78798bbdd548ec46d52711f59762ff58fb0f"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-2",
-    "sk": "3ed3f4d0fadb42cb77d42a7ea57def2bad464bd1ae0c896dd077c04358415c04",
-    "pk": "a9a4b61b52db164253147e0c5bd20852d7ab4763e996d0117febccbc7a1abbd6",
-    "alpha": "0a",
-    "ad": "",
-    "h": "4c1e5af1026d6d903fb3f8daea2ab896b0c53d51f8c1adae82450e3b33cb8e6b",
-    "gamma": "bb786e4d98ee669185bef781eb18ff85279730df78c9b52df8309b74def08de9",
-    "beta": "0cd73e79c3aa8ccb3c2d4b7724bf8e178405d61aa0a620c535fcd4b77595eaf68405cc58593f49d38c29af5aaaba6ff274a6b6cce5f2fc0ef23121e41a5a35ca",
-    "blinding": "f5eb219970aa57e200caab5c70915c9881ef1748033698ccd9628c29079cf90a",
-    "proof_pk_com": "765532d05596d7e468bee1e607bd8d5a1775ab937c0a9de15bb27989898f9542",
-    "proof_r": "7497ae7cf93fd32dab62d3da554096961bb99cadd355f3b6e7ab2783369c11a0",
-    "proof_ok": "42fc67ced86ce09894636b66404f16bfeb1e19bd564c6610a1fa4cca62a8c60e",
-    "proof_s": "bdc78b8e7392fc514d7b16e15508dc98f59313481038618932cc164f7c99e10c",
-    "proof_sb": "7ead6be4a04fcbb678e7044c45bc43ec3305cf88c926ae8fa20a9c1f138ed103"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-3",
-    "sk": "a665fa5af45ab71a60a6b667bc995423d5ee43197a5fd93b16f761cf0bdf0407",
-    "pk": "0b33325148327641856fde36d56aaf2cb1e4959824bb0916517160d402973bc5",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "d759bf177d1c7f58c184973e7e82903e33db3d4510a2f04f88d48ae9ee30cd54",
-    "gamma": "c97e866e8d440a96eb9029478c0116df937e67915bd386c9d9fc5225407bb997",
-    "beta": "f92b21084e6b604b540e5ab8d63c1cb30fae5fcce8e6a5666c6058cca6bb800716d411aa242a231257e2bea1e844a883b66a7eb429e886f44a328356b22710b6",
-    "blinding": "488068f1facb6ccb39e4c29435069b9fda5a7b5748b05304d72d6815feef690f",
-    "proof_pk_com": "4fe47c74a0f77b1b137817b168bf90dd43880e5172f30f4ca4e922abac33d242",
-    "proof_r": "ef28bf23f5778b4c14bf8ffe58b131ac908e1d6be13cf933d37e39aed8074068",
-    "proof_ok": "d58bf360e7cf01bf46d42195d387094be89f69a1c0e8a306fbb6a5a68619531c",
-    "proof_s": "d9ddb085baf115aa7a6de0e5e307d8be88abf581cbd3dcb8deebc4b52bf6a20e",
-    "proof_sb": "8eb55ccd636092a35d4cf53e1361ee18a14adf1f662e3877737a9a3caf9c2e04"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-4",
-    "sk": "9a150e5caf622cc949d95af8980d458b551ab394d52ba49759433b4d04d9f703",
-    "pk": "cf2d35428c1e329dfbd5ce3a6aafd8cffe31c6a0685471f59f5cddec0725483a",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "c4ff0e17d0fcf2f98c57c01d1095d5beeed2da007ca91d608f8c0674e51f5058",
-    "gamma": "bfab3b751e4bfa1fa0f82a582010e147a2801ad32e9a2f0d727562aeea3b4e61",
-    "beta": "1a70a66d95eb43ee4e068c96c96806b2f7adc6d7959089f7981e8e5ca346bce69dd5c64daefd64463cc03c848897a67614cead01dbef3729bf8da98ead9d6b07",
-    "blinding": "981dd9dbab8253857dcd8187b16f2ad41cb4eb5736900f2ead3167c0c23eb008",
-    "proof_pk_com": "16381d66b47cedaa8f889dad744cada7c973ca39e0c138ed25779d24bf932ca5",
-    "proof_r": "c5da54f42e4d09c86e933bbfc37a22b06606088c80386acfac05446c2be3fd1f",
-    "proof_ok": "2f12ef3b6220f61d5ab8bbf3be44f2500d6619b71399c017bbbf00a6fc744d4f",
-    "proof_s": "73cd9f460e16bd2f3615e78ba60416f607a11bc6a4d5517864c3afe97616c706",
-    "proof_sb": "88f36b0ce365744fa7945655d24c42d1c31e1c349b539729e5bc7833bf80a805"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-5",
-    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
-    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "bc89b34d01bda6e9115462584ed1f5554e9035ea4b4b77d27dbd3027c16dfa43",
-    "gamma": "50901ea735820db2198b6b6a8c8b62abdbc7bedde6b88a30e439583f1e387103",
-    "beta": "4dc1285faf82ddd0b0b60f6055051d3f501e0b55b57d5f440467eea15dce84e56b20dca9462c11e57439b558b557f09a5ae8fbafea3f2d477f8f9aad10f19fc3",
-    "blinding": "63422c0dab46f003199b987f7d4d44405da35344ded47cadd057128c6f0aaf06",
-    "proof_pk_com": "1bef766f65b1c16bd2df31b9a9193f4bc2e4bf01e8bc73cee299e21a0c00461f",
-    "proof_r": "36fb67dfe66375cbf1269742219e8620d911b166e84dbcb156e0744d9464c7d6",
-    "proof_ok": "ba09519e25af9a9e054a023340b59facdf0dbd58355f13794012122b573092d7",
-    "proof_s": "f1aab0ea43fc0163c781442130172ba8f77217e750c79fe01e5c630731cb6a0c",
-    "proof_sb": "905e59ad1ef26ba249015dd8ec2ac1d00419226f45501f9f29463c15ecdb3c07"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-6",
-    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
-    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "bc89b34d01bda6e9115462584ed1f5554e9035ea4b4b77d27dbd3027c16dfa43",
-    "gamma": "50901ea735820db2198b6b6a8c8b62abdbc7bedde6b88a30e439583f1e387103",
-    "beta": "4dc1285faf82ddd0b0b60f6055051d3f501e0b55b57d5f440467eea15dce84e56b20dca9462c11e57439b558b557f09a5ae8fbafea3f2d477f8f9aad10f19fc3",
-    "blinding": "1c6f4f01c7946c19c4380157b24fa3916fb22d85b7d09f5ef968d1fa109b7903",
-    "proof_pk_com": "54b4c0fd53922d73283740d758703598419687acfc87ba301f75b753b8aab709",
-    "proof_r": "d219e50d140ced12fb4095d4f4181a2693ac1d2ed4366bdea741037f56b3e8e9",
-    "proof_ok": "ba09519e25af9a9e054a023340b59facdf0dbd58355f13794012122b573092d7",
-    "proof_s": "d86081041c0d63a66b9e193af032525f2f66e3320311e869e3e35476bbfca601",
-    "proof_sb": "796ae141ebd85b6bff37ff64f4d2a6012c543e0f697cb7e7d9141fc015547005"
-  },
-  {
-    "comment": "Ed25519_SHA-512_TAI - vector-7",
-    "sk": "0f6ed8b686b6ef0b2552344803cb0f92a84a654fd46f0e98782c6de71f98d40c",
-    "pk": "ea18949e73be86cf0c7de5e688c782689b72c49741baed797ee1a128d7cf1bd7",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "7c25195638eec350e910363a88a0fb98998fa29569c897537687086ea2f795c2",
-    "gamma": "119d3bdf04ad8bd51dbb773a72a48e31e1cf5807f96042fd877b3b1bdfc9001c",
-    "beta": "3196e4d009ed713a90c691c6fe350394e560700a6a35f22d5071331eb0807a92d50458837dfba24f84752e8cb0574f2a53e614c5ec23e2d2388a9566b0ea03d2",
-    "blinding": "0543f14d5fe04580d01647ef9c21c1c4b1d5cb880f20d5668e75dfa1ac2ea002",
-    "proof_pk_com": "fabaa15711a9a37f49fa47bd3be8997d1b058ef648999ba4e1cecc6c6d39f0b0",
-    "proof_r": "9a6a1f0c72c88b9010cf0ffb9236b59655274545f3cec35d50aaf1df105158de",
-    "proof_ok": "de79df71ce7a78c6bddf89e143abd01e16ca6d78c66348e1d3cd4fb011eaf1fa",
-    "proof_s": "6f3b946dd7c7b5a61b7f28ab7d4ad05fc6233785c88f5803ad4be1120f01fa00",
-    "proof_sb": "a520025876567bbd27ca05e1ba8f1fabca0c73c86ce4870a15937656ed3ea102"
-  }
-]
\ No newline at end of file
diff --git a/data/secp256_sha256_tai_ietf_vectors.json b/data/secp256_sha256_tai_ietf_vectors.json
deleted file mode 100644
index 176722b..0000000
--- a/data/secp256_sha256_tai_ietf_vectors.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-1",
-    "sk": "9a4585773ce2ccd7a585c331d60a60d1e3b7d28cbb2ede3bc55445342f12f54b",
-    "pk": "0218e11f9ef92fa3929aa8f078d2e73b58f0ac7d6f274e222b8515c7b0140138be",
-    "alpha": "",
-    "ad": "",
-    "h": "022f64bc1926dfabc3d166fa765cf377dcf2fe9ce6d52b6b5e0f8e679a017b6fe0",
-    "gamma": "03244077a7c08a8c57e4b2d033f0d6862de6d240bd3cbed4db2e17e906adbc7222",
-    "beta": "c7d9917dccddc4f1be7c8c399f09b08e8de6910bf8eb887f55b53b25d443a39d",
-    "proof_c": "631a7fcf27504b5e9698d6c9ee7dd540",
-    "proof_s": "ac96dc3746ae99d2aa55af248fe4c15ac8bb908bd2887feb8b9bb1a84b80509e"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-2",
-    "sk": "86d9576498ea764b49243efeb05df625010438c6a55d5b578de4ff00c9b4c1db",
-    "pk": "03a47366bc18483e02261117304cdf77cc95f234c16d11a8356dc4514a7adaf120",
-    "alpha": "0a",
-    "ad": "",
-    "h": "021438e95ee11c6f46c744cd3581834ede2430e38ceace70ead4a6983228a4ce4d",
-    "gamma": "02e0e963900adefb20e41671b217ea96c30264b6f17da68e5698eacfe37432ecb5",
-    "beta": "c6cef180ef80f76721df1a2e10d0db7e8c5998f0a1dd3f36ce0e8cec0edb7275",
-    "proof_c": "6b5ba8a58c9f0e00f7885845b40e494c",
-    "proof_s": "757a757b70624654601d3ad4fb15461fd8265717b6a0ae2258de2eff60c8c06e"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-3",
-    "sk": "c529ffad9a5ab61162b11d616b639e00586ba846746a197d4daf78b908ed4f08",
-    "pk": "02d984ff7d61ba3a11d8ade6cea6ba949fba3bbcf841506cf8c3a7b6e1bd67b926",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "0226da46ec190457038ab24dec00e5b766df8d7369bb093fd45dc3de850a656546",
-    "gamma": "03ace33eab6defbc1a5f477dc2df71881def88ee544d3798ad0c97c679c9decdfc",
-    "beta": "ab47ca62aa68f0b8b5baa6e3a89e00c731b432ccacacefc1089e491fdd95f8f4",
-    "proof_c": "911d2e38d4b3799d85c79392a79e20ee",
-    "proof_s": "dfa1dcfd90c0287c3104ca9da257b2f2fe21a68b5658673ef5aedefbf467f2d9"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-4",
-    "sk": "719ec881a39ca062f09262ff75fc8a06d6cb91ad078c4d344723508c509c2de5",
-    "pk": "02c8f77b17ec60330366b9e148dfa565a7c8d6a0768e5737786722e3c85a5ff054",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "025127b0bedf1ce257cf80eaccfb9bd5c732ac3ee28d5851d3016fa7a862d3a8ce",
-    "gamma": "03313161c09ed91b97e1c99f474a6b7dda74faade71b3f463204d12e954fa2d8ab",
-    "beta": "df8b38e9822dc678fd54a93976ece1661e75c7e336469120e7c86b60c0f0944b",
-    "proof_c": "9665ef8a1d0031202857988a229bb97a",
-    "proof_s": "f380c88a13dc8be32cb8a6b58d3374dbd49150129ca78ac50b7c50864b503952"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-5",
-    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
-    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "029d367ea8eaf47bdb453f836c0c6afe9e5540c33adf4b20e1ecdf96c45f07ed1f",
-    "gamma": "0288734131a4dddb3a69e0ff346bd6afa5fcf29a328f1a4f7fa00c512127960e33",
-    "beta": "0a53ce69bc69cf00fc7f42a74717d8271fb6f7124351697e64e006e1e77733ba",
-    "proof_c": "b18cd7a1dc6a6a68976fe36dc5aff103",
-    "proof_s": "0f26cca6ede740b7986aadd8b8c772ef2e80c8b9fa2a60d1e42e86d71a80961d"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-6",
-    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
-    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "029d367ea8eaf47bdb453f836c0c6afe9e5540c33adf4b20e1ecdf96c45f07ed1f",
-    "gamma": "0288734131a4dddb3a69e0ff346bd6afa5fcf29a328f1a4f7fa00c512127960e33",
-    "beta": "0a53ce69bc69cf00fc7f42a74717d8271fb6f7124351697e64e006e1e77733ba",
-    "proof_c": "eca5be1102e6655ff8db00ee1aef24ae",
-    "proof_s": "5fbcec2a2209b745ffc1734dec1c395075312e4477a16decaf0c01015c97df91"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-7",
-    "sk": "f6ecc50886479df8bea823e5b8b939c934efa139c08b96b9a07dd2fa986e5867",
-    "pk": "0224d2dd7a97395b03103acb7ec1ae80743f453ff0711e6ad81bd9d59b7217809a",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "02b0c7060d3817f8f87a04f7b40312a09d7adf1971f716d5c6b36452a6c41e530a",
-    "gamma": "03607649083cd2ed5dedb5b5d3e1d4a3800d5721025ffa994c3df4c1f8dc4d9fe3",
-    "beta": "0e080d288822fce6e5f26558a5f226d986b94860e4f89b5407da9ff49ff0a627",
-    "proof_c": "21ef82669ce963906c20f32b6366e6bd",
-    "proof_s": "5f5e8e0bb29d6d54df61bc0253406cdd7cc271e735634bdf7d8456215f0ad761"
-  }
-]
\ No newline at end of file
diff --git a/data/secp256r1_sha256_tai_pedersen_vectors.json b/data/secp256r1_sha256_tai_pedersen_vectors.json
deleted file mode 100644
index 7b87acc..0000000
--- a/data/secp256r1_sha256_tai_pedersen_vectors.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-1",
-    "sk": "9a4585773ce2ccd7a585c331d60a60d1e3b7d28cbb2ede3bc55445342f12f54b",
-    "pk": "0218e11f9ef92fa3929aa8f078d2e73b58f0ac7d6f274e222b8515c7b0140138be",
-    "alpha": "",
-    "ad": "",
-    "h": "022f64bc1926dfabc3d166fa765cf377dcf2fe9ce6d52b6b5e0f8e679a017b6fe0",
-    "gamma": "03244077a7c08a8c57e4b2d033f0d6862de6d240bd3cbed4db2e17e906adbc7222",
-    "beta": "c7d9917dccddc4f1be7c8c399f09b08e8de6910bf8eb887f55b53b25d443a39d",
-    "blinding": "9559f0a41ea296cdc4b14b4015e9adef9b5d14e3b710b7264bff0ce6ce7654ea",
-    "proof_pk_com": "03fef31a76de61ea0d2e697f28ef97b8370557a05c955d53e417f78ba4087c726e",
-    "proof_r": "038bb64efb09bbe1978e964f164522f38f14cd4028c29d8d2ecd27fcf6448254d7",
-    "proof_ok": "020ee811076101c50e2373d7f5cabffa3b35801356a6ce6449e924d74c892567d0",
-    "proof_s": "3a5dcc57e73a69ed4627563971087ba03640169bf40d8f9e5f1888ac127c3bb5",
-    "proof_sb": "4e8d371c70e056a2b8b623227c70ad6451625537e47ce9d1fadc5e4887e544bb"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-2",
-    "sk": "86d9576498ea764b49243efeb05df625010438c6a55d5b578de4ff00c9b4c1db",
-    "pk": "03a47366bc18483e02261117304cdf77cc95f234c16d11a8356dc4514a7adaf120",
-    "alpha": "0a",
-    "ad": "",
-    "h": "021438e95ee11c6f46c744cd3581834ede2430e38ceace70ead4a6983228a4ce4d",
-    "gamma": "02e0e963900adefb20e41671b217ea96c30264b6f17da68e5698eacfe37432ecb5",
-    "beta": "c6cef180ef80f76721df1a2e10d0db7e8c5998f0a1dd3f36ce0e8cec0edb7275",
-    "blinding": "f5337a9b1224fc5a0bf53472255f93b0c9b68295437622bae66a388abaa69303",
-    "proof_pk_com": "03b142215ed038531f7620405b9aa284159f1cd5ea82615831a5aed4bebb7cea03",
-    "proof_r": "03d3fbfc3fcfaded8b103955cb437fe399716827e760787d9c5007932c77e4b497",
-    "proof_ok": "0273bfbb7f87875ac154a119cdab52baffc4013baff60944202dcba2c67f1e543f",
-    "proof_s": "565ea46f1c52dd8571840cad222962cdfa4b265593123295fdf330290c5a83a1",
-    "proof_sb": "ee5270a60a0c26e936121a3bc31b39a6da0d6e8c90684a4f1d2a4fc2f94f5ece"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-3",
-    "sk": "c529ffad9a5ab61162b11d616b639e00586ba846746a197d4daf78b908ed4f08",
-    "pk": "02d984ff7d61ba3a11d8ade6cea6ba949fba3bbcf841506cf8c3a7b6e1bd67b926",
-    "alpha": "",
-    "ad": "0b8c",
-    "h": "0226da46ec190457038ab24dec00e5b766df8d7369bb093fd45dc3de850a656546",
-    "gamma": "03ace33eab6defbc1a5f477dc2df71881def88ee544d3798ad0c97c679c9decdfc",
-    "beta": "ab47ca62aa68f0b8b5baa6e3a89e00c731b432ccacacefc1089e491fdd95f8f4",
-    "blinding": "0f1d88f43f8be93cd4afa3b726d585ed4a0fb50eeb8891588cc254220ff74a49",
-    "proof_pk_com": "032bb1ad0c7a8488968aaf69e07bd63a1ab1eea3011e41584eee95e10b27201a14",
-    "proof_r": "02b5bee66268c5c9df74ff31ec53d5591b1847e01abb90316678dabcb0b1053159",
-    "proof_ok": "03c0ecdc5f0437f81bea183150dc7dc47a8304a1a7c6ee4605f9fa431f9a116b93",
-    "proof_s": "5990eccc983a0e9849d8badb680d1243b9896d4d06c69b97c2577b362d7fd0ab",
-    "proof_sb": "d1a3649a58f5d506573db4337c05e6f76f90d296fd0384aa274264190022a941"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-4",
-    "sk": "719ec881a39ca062f09262ff75fc8a06d6cb91ad078c4d344723508c509c2de5",
-    "pk": "02c8f77b17ec60330366b9e148dfa565a7c8d6a0768e5737786722e3c85a5ff054",
-    "alpha": "73616d706c65",
-    "ad": "",
-    "h": "025127b0bedf1ce257cf80eaccfb9bd5c732ac3ee28d5851d3016fa7a862d3a8ce",
-    "gamma": "03313161c09ed91b97e1c99f474a6b7dda74faade71b3f463204d12e954fa2d8ab",
-    "beta": "df8b38e9822dc678fd54a93976ece1661e75c7e336469120e7c86b60c0f0944b",
-    "blinding": "205382dd1e69d499dd0410e57cf26728c427fd33a60e2b8b08dc10597e3f545c",
-    "proof_pk_com": "0218fd1fa09e43bce08062df3203e0b7e0fbc3c674c367fcf15f33f78caf711ed9",
-    "proof_r": "03446758e87b1cf4b455eac9bcf2ebdbe66033417368d95e325a26315ef3bfd9b2",
-    "proof_ok": "032a84b7c61777862e4392a7b6555bbe4af9720cf81aa3d2399628273e3d29ef74",
-    "proof_s": "b31f7d075d4c1fbcb357a8976edbb4338ff2e3fda66fd24a6a47f7a96c9905ea",
-    "proof_sb": "0f88075d8fd54bdf631e4639674af59b0612fd35b1462bc40d4781ff756af21f"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-5",
-    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
-    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "",
-    "h": "029d367ea8eaf47bdb453f836c0c6afe9e5540c33adf4b20e1ecdf96c45f07ed1f",
-    "gamma": "0288734131a4dddb3a69e0ff346bd6afa5fcf29a328f1a4f7fa00c512127960e33",
-    "beta": "0a53ce69bc69cf00fc7f42a74717d8271fb6f7124351697e64e006e1e77733ba",
-    "blinding": "93bd5b0495597dd69ab415e525a37d9416e16306cdd1423723bb51bdd7632cd6",
-    "proof_pk_com": "02bc14da19a5532960f96d9df4aa969035235a15c002090909a38c78f023a17376",
-    "proof_r": "02cd1c3c4cbce4774ea57d5d4b9acd3a194f046cdb878705799c728aca9c98b44c",
-    "proof_ok": "0280a50463670b22104f5440d603f2905688e7221ab102891758b800155573560d",
-    "proof_s": "16400ff1984edf03378ccfa4c5e12f803bdadba55fffb0068af424d7ef7b2dc0",
-    "proof_sb": "31ae219645f22db05aef3785135b3b918f181f66bbfb53f187c3d3f91a45decc"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-6",
-    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
-    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "029d367ea8eaf47bdb453f836c0c6afe9e5540c33adf4b20e1ecdf96c45f07ed1f",
-    "gamma": "0288734131a4dddb3a69e0ff346bd6afa5fcf29a328f1a4f7fa00c512127960e33",
-    "beta": "0a53ce69bc69cf00fc7f42a74717d8271fb6f7124351697e64e006e1e77733ba",
-    "blinding": "d88c128d5d40e6cf9098cdb741ca2d9fd11af1c7607b805d32833f430fda0ea4",
-    "proof_pk_com": "03bed1b607f59ba465aa2dc84a2c8a3bb9b11b66e8310b8ed7d8d5d7aed96d6d11",
-    "proof_r": "03a6c42dd7b1425107ccf1c95586ac47273a828febed7b7e567d5013d9c201c01f",
-    "proof_ok": "0280a50463670b22104f5440d603f2905688e7221ab102891758b800155573560d",
-    "proof_s": "c1e30cdc4f35b6c97312e1a024a59ed33f039bd0d89cab1b4ef687d679f9c4d9",
-    "proof_sb": "b911b039673f5c150698d4edd5ee994163ba716e12465d09a25922617b1bf36d"
-  },
-  {
-    "comment": "secp256r1_SHA-256_TAI - vector-7",
-    "sk": "f6ecc50886479df8bea823e5b8b939c934efa139c08b96b9a07dd2fa986e5867",
-    "pk": "0224d2dd7a97395b03103acb7ec1ae80743f453ff0711e6ad81bd9d59b7217809a",
-    "alpha": "42616e646572736e6174636820766563746f72",
-    "ad": "1f42",
-    "h": "02b0c7060d3817f8f87a04f7b40312a09d7adf1971f716d5c6b36452a6c41e530a",
-    "gamma": "03607649083cd2ed5dedb5b5d3e1d4a3800d5721025ffa994c3df4c1f8dc4d9fe3",
-    "beta": "0e080d288822fce6e5f26558a5f226d986b94860e4f89b5407da9ff49ff0a627",
-    "blinding": "333cdcc80cb927eafc27058120098a061e3efa39dc84715648294385bb81a359",
-    "proof_pk_com": "03635cebae8702f1126048e7b7e9a86d492fb0ed493d880a8316602bf439bcd6a5",
-    "proof_r": "02826c0fcd87907bf84c80e4e3818ecdeb044f51beb8cc6b8adfcce540e27327b1",
-    "proof_ok": "0288abf150edfce953e5d8d9b8b2faa8ebf5391bf771accfe0300132205f619ec7",
-    "proof_s": "e524fdd505b30a06f8b70beea01d364af78bc079047b2a1d1209f9c2c918752e",
-    "proof_sb": "81569c48664cdd486bf0d127e3cc56d8399c843661fc889738c9533fcb30b3f8"
-  }
-]
\ No newline at end of file
diff --git a/data/vectors-generate.sh b/data/vectors-generate.sh
index 3df447b..1061e0b 100755
--- a/data/vectors-generate.sh
+++ b/data/vectors-generate.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+cd "$(dirname "$0")"
+mkdir -p vectors
+
 cargo test \
   --release \
   --features full,test-vectors \
diff --git a/data/vectors/bandersnatch_ed_sha512_ell2_ietf.json b/data/vectors/bandersnatch_ed_sha512_ell2_ietf.json
new file mode 100644
index 0000000..b23decd
--- /dev/null
+++ b/data/vectors/bandersnatch_ed_sha512_ell2_ietf.json
@@ -0,0 +1,93 @@
+[
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-1",
+    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
+    "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "c5eaf38334836d4b10e05d2c1021959a917e08eaf4eb46a8c4c8d1bec04e2c00",
+    "gamma": "e7aa5154103450f0a0525a36a441f827296ee489ef30ed8787cff8df1bef223f",
+    "beta": "fdeb377a4ffd7f95ebe48e5b43a88d069ce62188e49493500315ad55ee04d7442b93c4c91d5475370e9380496f4bc0b838c2483bce4e133c6f18b0adbb9e4722",
+    "proof_c": "439fd9495643314fa623f2581f4b3d7d6037394468084f4ad7d8031479d9d101",
+    "proof_s": "828bedd2ad95380b11f67a05ea0a76f0c3fef2bee9f043f4dffdddde09f55c01"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-2",
+    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
+    "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "8c1d1425374f01d86b23bfeab770c60b58d2eeb9afc5900c8b8a918d09a6086b",
+    "gamma": "60f32f5ad3e9694b82ccc0a735edb2f940f757ab333cc5f7b0a41158b80f574f",
+    "beta": "44f3728bc5ad550aeeb89f8db340b2fceffc946be3e2d8c5d99b47c1fce344b3c7fcee223a9b29a64fe4a86a9994784bc165bb0fba03ca0a493f75bee89a0946",
+    "proof_c": "8aa1c755a00a6a25bdecda197ee1b60a01e50787bd10aa976133f4c39179330e",
+    "proof_s": "18c74ffd67e6abc658e2d05ecd3101ddc0c33623823f2395538cf8d39e654f12"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-3",
+    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
+    "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "c5eaf38334836d4b10e05d2c1021959a917e08eaf4eb46a8c4c8d1bec04e2c00",
+    "gamma": "67a348e256d908eb695d15ee0d869efef2bcf9f0fea646e788f967abbc0464dd",
+    "beta": "edde0178045133eb03ef4d1ad8b978a56ee80ec4eab8830d6bc6c080031388416657d3c449d9398cc4385d1c8a2bb19bcf61ff086e5a6c477a0302ce270d1abf",
+    "proof_c": "aec4d1cf308cb4cb400190350e69f4fb309255aa738fff5a6ac4ced7538fce03",
+    "proof_s": "54e5d38a76f309ce63ca82465160abd8d75b78805a0b499e60c26436de4a8e01"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-4",
+    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
+    "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "672e8c7a8e6d3eca67df38f11d50f3d7dbb26fa8e27565a5424e6f8ac4555dcc",
+    "gamma": "4d3e0524fc59374f1fdad8e471c695469b45ecf69c1de85c6c1230e888dd4cbe",
+    "beta": "36127f8aee7c61048984f0a208bf6d334db9dacbeeeef9ff2d17117e812328321462eb3ef602f5911d77ab11f815eb4154ba95c934e414198ef000a61b4de31a",
+    "proof_c": "b72598f235145a377911caa794ba85820173c4c49b7be3b05d847b2c753e0311",
+    "proof_s": "e8e34ad3131388a88eb7f80bd874f3421c378d4ad45911c4bc16e4cdc17b5716"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-5",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "9508104b820469687488d83f729288d9f70fc0523318beff44a47da10d490b3c",
+    "beta": "4ee61f3c000544aa48c565e143e05c6501a623bdbf02a0a408b97433660b4907715f75890cc0e45cdd7116e3da15b15c3c637782e8e05d05c0d5895e5fe583d1",
+    "proof_c": "ad6af59b4b84f18187c694ef374687d13517cb53508ff9dafa37d0c759e9601c",
+    "proof_s": "4c1269d9d161dabd082fc606af979eca7f6c3ab68e78261dc6fb9fbbb98c9704"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-6",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "9508104b820469687488d83f729288d9f70fc0523318beff44a47da10d490b3c",
+    "beta": "4ee61f3c000544aa48c565e143e05c6501a623bdbf02a0a408b97433660b4907715f75890cc0e45cdd7116e3da15b15c3c637782e8e05d05c0d5895e5fe583d1",
+    "proof_c": "4fa53519bd9d17acae4d1021416557d11b84dd4670b563770c14eb98161eaa08",
+    "proof_s": "0f7f9bee9077427f547e69b919cf8d63823c14b20085fd9516768e0f5e3d3f0e"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ietf - vector-7",
+    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
+    "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "6d1dd583bea262323c7dc9e94e57a472e09874e435719010eeafae503c433f16",
+    "beta": "09106f062ac07846f3f841f64765527b333575143483855d633f99ccc2e8e306e6239ff79a1272cff931e8d0ac6c390328486329118ad40a18b85184da1837ff",
+    "proof_c": "6dbeeab9648505fa6a95de52d611acfbb2febacc58cdc7d0ca45abd8c952ef12",
+    "proof_s": "ce7f4a2354a6c3f97aee6cc60c6aa4c4430b12ed0f0ef304b326c776618d7609"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/bandersnatch_ed_sha512_ell2_pedersen.json b/data/vectors/bandersnatch_ed_sha512_ell2_pedersen.json
new file mode 100644
index 0000000..4f1f7ae
--- /dev/null
+++ b/data/vectors/bandersnatch_ed_sha512_ell2_pedersen.json
@@ -0,0 +1,121 @@
+[
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-1",
+    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
+    "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "c5eaf38334836d4b10e05d2c1021959a917e08eaf4eb46a8c4c8d1bec04e2c00",
+    "gamma": "e7aa5154103450f0a0525a36a441f827296ee489ef30ed8787cff8df1bef223f",
+    "beta": "fdeb377a4ffd7f95ebe48e5b43a88d069ce62188e49493500315ad55ee04d7442b93c4c91d5475370e9380496f4bc0b838c2483bce4e133c6f18b0adbb9e4722",
+    "blinding": "01371ac62e04d1faaadbebaa686aaf122143e2cda23aacbaa4796d206779a501",
+    "proof_pk_com": "6eee046021611ccf5c20b9bb92933e2cee742493a6c21ca6b0e475f585f7f8a1",
+    "proof_r": "0f2c41bf0c08aa607b7bf2a7e78ebdfcae48004decfd68439cab4b2d44a26759",
+    "proof_ok": "ac57ce6a53a887fc59b6aa73d8ff0e718b49bd9407a627ae0e9b9e7c5d0d175b",
+    "proof_s": "06b69b0190660bf8220db08f9bf07d0dcd7757f9862f82484f852eed6e8a6410",
+    "proof_sb": "99f87c403f11d997ee5a3c4f6fb51237d1930b6a5de475cffd397bb0adf29809"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-2",
+    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
+    "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "8c1d1425374f01d86b23bfeab770c60b58d2eeb9afc5900c8b8a918d09a6086b",
+    "gamma": "60f32f5ad3e9694b82ccc0a735edb2f940f757ab333cc5f7b0a41158b80f574f",
+    "beta": "44f3728bc5ad550aeeb89f8db340b2fceffc946be3e2d8c5d99b47c1fce344b3c7fcee223a9b29a64fe4a86a9994784bc165bb0fba03ca0a493f75bee89a0946",
+    "blinding": "99ff52abf49d67c4303ac4a8a00984d04c06388f5f836ebd37031f0e76245815",
+    "proof_pk_com": "498c2c76307e680f77e16c482dd7160d145be6cb7d324ab1ab57e192a0562846",
+    "proof_r": "56069eb9f2ee0e72096633cd6f7984b95b6744561e64b51df18e024c351c6f6f",
+    "proof_ok": "fc8770c209212640742d53e2f40e5c30fffae574f90fdc670ff11a1127586c03",
+    "proof_s": "862229fc3909b8a54ea8b9a3523f8b6adf76a8152eff8cd541ae8d3beef18317",
+    "proof_sb": "8e4cc0ed30b278983ee484e0e9e725c2db9864a709e38d558e77c02e0045c208"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-3",
+    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
+    "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "c5eaf38334836d4b10e05d2c1021959a917e08eaf4eb46a8c4c8d1bec04e2c00",
+    "gamma": "67a348e256d908eb695d15ee0d869efef2bcf9f0fea646e788f967abbc0464dd",
+    "beta": "edde0178045133eb03ef4d1ad8b978a56ee80ec4eab8830d6bc6c080031388416657d3c449d9398cc4385d1c8a2bb19bcf61ff086e5a6c477a0302ce270d1abf",
+    "blinding": "e22ec3e4a2a4132237eb8a62bcc5ed864593cfde08e53b1632ecd3245761c808",
+    "proof_pk_com": "5f8e88a84a1437b1fd0a490969af239eca559f6b60763ab7914ae742ee742288",
+    "proof_r": "39f7de93a7a3542a12aa74c959dc35cb225eafe01ff357234ba0d5f053dbaf73",
+    "proof_ok": "35f8dc0f744d1850513c46b6b4640716cbb4643da26cfe67f8c701486e0b4cae",
+    "proof_s": "f9f753c59bbdd44f8b7c13f8711caffe36ebf41d4bf9478896318522f783631c",
+    "proof_sb": "9eaa98e4c670a61a70ed4e8a9d3670aeebac82d99a241687d676e235d86e370e"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-4",
+    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
+    "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "672e8c7a8e6d3eca67df38f11d50f3d7dbb26fa8e27565a5424e6f8ac4555dcc",
+    "gamma": "4d3e0524fc59374f1fdad8e471c695469b45ecf69c1de85c6c1230e888dd4cbe",
+    "beta": "36127f8aee7c61048984f0a208bf6d334db9dacbeeeef9ff2d17117e812328321462eb3ef602f5911d77ab11f815eb4154ba95c934e414198ef000a61b4de31a",
+    "blinding": "755610da34cc224fbe60ce5e42add2ea6b272ef466aef18c13497363116d1c03",
+    "proof_pk_com": "a2d7505a6ebd7675245a7807f3fe64c1bdc3b3e1cd96762e5cd195f5bf5abc8b",
+    "proof_r": "839cad088f50ede00b337fd6dcf95816820e876c05b4ab3a5940f6d190813f9c",
+    "proof_ok": "b9fa51c75d278d95f2ccace9609b28ec137b244c8b7d1523b16ed07c8e24b8e4",
+    "proof_s": "9dbc7517707f65c2651f4e7026654d2220333196dfc83460233d6bbfd331c804",
+    "proof_sb": "38902aa4247539fbd8dffc217123d2057eab3a1cbc9a05e17bf2da773f147405"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-5",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "9508104b820469687488d83f729288d9f70fc0523318beff44a47da10d490b3c",
+    "beta": "4ee61f3c000544aa48c565e143e05c6501a623bdbf02a0a408b97433660b4907715f75890cc0e45cdd7116e3da15b15c3c637782e8e05d05c0d5895e5fe583d1",
+    "blinding": "fb0123dd6317dbd379afccded247f75b3c1c2e32b86eaa9d6c9d0eb5bef07919",
+    "proof_pk_com": "c1283a6a033aad24a0cd502308e48b3e2f862609cbaa6e353af0bfd3df3313e5",
+    "proof_r": "eb71022b4258201b8c226720d7b0c46395190eea8339284414cdb9dde8063096",
+    "proof_ok": "311f94e886825c80a30fd44535be37218501bd072afcbc1298f8fba6c3e3c96d",
+    "proof_s": "7800bda659bc57d8b4f01ac86c6a5819edb29b48d00ab01b83f5cbcd16064b06",
+    "proof_sb": "14e82ee7b96487ebe7a57db04eac22512a138e4bcb55b9d1186f859dab37ed11"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-6",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "9508104b820469687488d83f729288d9f70fc0523318beff44a47da10d490b3c",
+    "beta": "4ee61f3c000544aa48c565e143e05c6501a623bdbf02a0a408b97433660b4907715f75890cc0e45cdd7116e3da15b15c3c637782e8e05d05c0d5895e5fe583d1",
+    "blinding": "0752c5b639dffedf9a66ac111a765d3e9c4cfac9c8b26cc5af6d524967afdf0a",
+    "proof_pk_com": "3f1cad632b9d0dae9486ceeb8712c596f6b8ec37d05d2bd22a40abefff1aab08",
+    "proof_r": "5e6f3111c0937721235aacef3a2378c8b8441aab953cf2c6b5bc892b26eb9507",
+    "proof_ok": "311f94e886825c80a30fd44535be37218501bd072afcbc1298f8fba6c3e3c96d",
+    "proof_s": "7451da70df2a6788fc3ef50dd6c5f142c5e561dd7d431c36859e4e87616cd31b",
+    "proof_sb": "2e531e6fda5a65120809f3ef98e10c70abf17f3380449c7b3ff20cbe6a22e107"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_pedersen - vector-7",
+    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
+    "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "6d1dd583bea262323c7dc9e94e57a472e09874e435719010eeafae503c433f16",
+    "beta": "09106f062ac07846f3f841f64765527b333575143483855d633f99ccc2e8e306e6239ff79a1272cff931e8d0ac6c390328486329118ad40a18b85184da1837ff",
+    "blinding": "462ae9ad651e5caf11247b989fecb5f2b1729479c33b9133388d14fa35dbbd0c",
+    "proof_pk_com": "0286ffd0277e29a9231bea18e4a553db73d4d4aafc2864e639080734c39f2314",
+    "proof_r": "207967dcefefd52af68b66d0a56ab6461e95fcef4bb1c55077b0380aac5f3fbf",
+    "proof_ok": "5a02419120b814a5c81d67096aac728ee9bda5ddf9451cf554d871462a04831a",
+    "proof_s": "94554c2c21c0767d9336d05529b48dff2edb1bc90f1f911fca69203451d8fe1b",
+    "proof_sb": "55ac5b72232a476a907e98ade0c45ad1dc2dfcc67947308959c0b8417947c215"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/bandersnatch_ed_sha512_ell2_ring.json b/data/vectors/bandersnatch_ed_sha512_ell2_ring.json
new file mode 100644
index 0000000..bb1fb5f
--- /dev/null
+++ b/data/vectors/bandersnatch_ed_sha512_ell2_ring.json
@@ -0,0 +1,142 @@
+[
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-1",
+    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
+    "pk": "a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "c5eaf38334836d4b10e05d2c1021959a917e08eaf4eb46a8c4c8d1bec04e2c00",
+    "gamma": "e7aa5154103450f0a0525a36a441f827296ee489ef30ed8787cff8df1bef223f",
+    "beta": "fdeb377a4ffd7f95ebe48e5b43a88d069ce62188e49493500315ad55ee04d7442b93c4c91d5475370e9380496f4bc0b838c2483bce4e133c6f18b0adbb9e4722",
+    "blinding": "01371ac62e04d1faaadbebaa686aaf122143e2cda23aacbaa4796d206779a501",
+    "proof_pk_com": "6eee046021611ccf5c20b9bb92933e2cee742493a6c21ca6b0e475f585f7f8a1",
+    "proof_r": "0f2c41bf0c08aa607b7bf2a7e78ebdfcae48004decfd68439cab4b2d44a26759",
+    "proof_ok": "ac57ce6a53a887fc59b6aa73d8ff0e718b49bd9407a627ae0e9b9e7c5d0d175b",
+    "proof_s": "06b69b0190660bf8220db08f9bf07d0dcd7757f9862f82484f852eed6e8a6410",
+    "proof_sb": "99f87c403f11d997ee5a3c4f6fb51237d1930b6a5de475cffd397bb0adf29809",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5a1b1da71cc4682e159b7da23050d8b6261eb11a3247c89b07ef56ccd002fd38b4fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "89e2e79b6178c12684ac3a6bf9437af3a69dcc529f0021ec40bb006506837ae182bf4b908e46733d3a23507791169fda8ea11b18665fe894ee9f0754c0c3fec70c6b8d1444d9b604ce949cbf130642d89f72b6cb1f08e32a18cdbb00aadfdf1b92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "98bc465cdf55ee0799bc25a80724d02bb2471cd7d065d9bd53a3a7e3416051f6e3686f7c6464c364b9f2b0f15750426a9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd95d4ffeef4d92464a597880dae011841f8dd457ca5c3bcfb6b98146f0679dd890be8c0c68ef4f543dcba04d86904c883886826b4d57636231717262449efd1c838b0bd4bf0e704a56c46af3f7fbe3539ea3d5a7b312e56edb7e58c22eed5dae28cb1a98736cd9eb9ddf9911ae959f6c121b4c22da91b544f440129fa0e69d41f3b0bdc74b8f9632223c98af1d1b5f2b1cd76cc9db5a8202e03ab580023e4480be1226eeac7daaea5aaa44d59032584f8a0558dacce60137e93b9511feac124321446b8964cd43098cc64e2400ce39e120827609f2c2fcc3a950c1b1e06dba12a20c51ab3659f652237162ede332187e4e797b67248d010c97fb5f7ddc00956579fdeb8d8ca56e9dff1635e35510c8471c124d843c896af2ce50a67d1c73351595589424a93da98a48fd6dd83a25bab9a6669172807ac38a778325a82c96c6630a75d14cb817b410b02dcc0ce7eecf53dbfa864065e1f1830b50bb1c08499c54ba52a1fec66a6a30b1fa233e415f4e6ca91026f6a00b07d488777e7d1d6903743b413a0ad6c0fe6fc30dcde885533fb26a16e2a0d5d980e99c900ca64a8a39db989b37543a37a2c084c0e1660fcdae609467bd87a8d046175e0c5f902b4ddc8bb8e41d1c5293fb0ff9de8a797f55951f9bc77947a6fc5187be4f86709a8025527897fa08aa8cfd0dd8e6e5d4b3bd7453b"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-2",
+    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
+    "pk": "5ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf3",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "8c1d1425374f01d86b23bfeab770c60b58d2eeb9afc5900c8b8a918d09a6086b",
+    "gamma": "60f32f5ad3e9694b82ccc0a735edb2f940f757ab333cc5f7b0a41158b80f574f",
+    "beta": "44f3728bc5ad550aeeb89f8db340b2fceffc946be3e2d8c5d99b47c1fce344b3c7fcee223a9b29a64fe4a86a9994784bc165bb0fba03ca0a493f75bee89a0946",
+    "blinding": "99ff52abf49d67c4303ac4a8a00984d04c06388f5f836ebd37031f0e76245815",
+    "proof_pk_com": "498c2c76307e680f77e16c482dd7160d145be6cb7d324ab1ab57e192a0562846",
+    "proof_r": "56069eb9f2ee0e72096633cd6f7984b95b6744561e64b51df18e024c351c6f6f",
+    "proof_ok": "fc8770c209212640742d53e2f40e5c30fffae574f90fdc670ff11a1127586c03",
+    "proof_s": "862229fc3909b8a54ea8b9a3523f8b6adf76a8152eff8cd541ae8d3beef18317",
+    "proof_sb": "8e4cc0ed30b278983ee484e0e9e725c2db9864a709e38d558e77c02e0045c208",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c55ebfe047f421e1a3e1d9bbb163839812657bbb3e4ffe9856a725b2b405844cf34fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "894fd4149cce66e5f39f11c0de38825da7d07c52de1d8e74ed170c6b1a2feec7bc158b35068bbcfa9455fd76f699c15cb5e9dfaba7a93cb264c07d9228e8c64273e2d5febe689b4b6279f21b1b0b26ec956f6d6d3fd5650edc1e4f7bf8d1663b92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "a57818b60d8fc54695a66b49a627b158a2f4141c696f0ac41b16831021e0ce5604aaa76fab504c106e4a50621adcbeeb9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb3ac929b4351e8b57201dfc7b92e3faebdd2c25ee3781f11cc7869ebb0c2fb5feb1a23744b298a2fa66c42b04adaa24497ea10324ba0722baa56f1952ec44249a2156ebecf694c69ec16ffd47abc540ef0c4c759c4fb9c1f8004192df5a61997ce62b2f29181d2ea74c5b51225f093e3224b0eb58f06bec3b3fc1134d377cc4b2f117cc57147337b517c1f7d7b57379130d4bf28e23fab66620b09646ad3435e6bdec1a6e7a20c23d0047b0b0f3f4ef8c4063294db9c41c533d66189be0108522d697569e0744c2f595fdfbda1171362a26caaa4c2cd97aae40dc7d48ca93a4023e58e57517e6837c192f1ff620f973b59b06aff3c26a167462b73f5af680d713a0c407b6cca98021352008fa679acbaf02a940c3c7f487ef63dbbbe383cff21a192d0c88d5ad39805fbc089d51abc8b7376c4d1af86b5f0600a470b7b4e6451aca5d6ca74e23085d0cbb8890791b4a2b7194dadd60c623718289521e993aa85f3fa716275d783bca5ab215f654c0991fdbd8d73175a169b82815ad1fb305e88816c64231d54a4582ac35d687e447754872b08f0e9089f32f0ae743298bfc3ff6307a6fbca2fe45a51ce0f3876361429ce0eb59a26ba1133022bc7fab6483f95a73e140feb1776cf62df4cb594fa24ae103f35d8e6a9bf3e0b6d146c8f9892ed76f4639de3ac847b671c426aa1a73553"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-3",
+    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
+    "pk": "9d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca49506",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "c5eaf38334836d4b10e05d2c1021959a917e08eaf4eb46a8c4c8d1bec04e2c00",
+    "gamma": "67a348e256d908eb695d15ee0d869efef2bcf9f0fea646e788f967abbc0464dd",
+    "beta": "edde0178045133eb03ef4d1ad8b978a56ee80ec4eab8830d6bc6c080031388416657d3c449d9398cc4385d1c8a2bb19bcf61ff086e5a6c477a0302ce270d1abf",
+    "blinding": "e22ec3e4a2a4132237eb8a62bcc5ed864593cfde08e53b1632ecd3245761c808",
+    "proof_pk_com": "5f8e88a84a1437b1fd0a490969af239eca559f6b60763ab7914ae742ee742288",
+    "proof_r": "39f7de93a7a3542a12aa74c959dc35cb225eafe01ff357234ba0d5f053dbaf73",
+    "proof_ok": "35f8dc0f744d1850513c46b6b4640716cbb4643da26cfe67f8c701486e0b4cae",
+    "proof_s": "f9f753c59bbdd44f8b7c13f8711caffe36ebf41d4bf9478896318522f783631c",
+    "proof_sb": "9eaa98e4c670a61a70ed4e8a9d3670aeebac82d99a241687d676e235d86e370e",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c59d97151298a5339866ddd3539d16696e19e6b68ac731562c807fe63a1ca495064fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "a90130fa47aaf758299818bd119e7fecdddb62674541f78c5fa5371b9db62d0f8afd73d28225fb1ae60e8959c5f0e929b861ba122a1c8fa45fc9d2b8fb66666ef55fdcdfdae22addff823236613fb08b49a694b9f1ec38b72fc0a021857d302692e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "a28c6420603f4cd2efd457092ef74585f78eeae389e2ffabf58b9f9dd14ec4db9ffe14be02b7376f6ae7959e11ce1e559107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb721a7367774ca632be13edcf0513bb1bfdb72a0dcdcecab2d1d2411bec12c7d11d6160b7f266dbc54703dcd66efaf99955f08dc523dcbbf9b00767e6f18ab921299d842d793e89865973514968113c2d6558540c5398fa67f7ba4bbcceea615303eaad28b9aa033cc960ad80903393a175239332852bda1e7862068caae9217cb918255bcec373e86f0ba5f076268993ecb8c4f67c337d225955107dc4b6a43b7c0b0512ba33cbe998c4b83d66f3138a9fef98e65eec1daeca268b2ede9164fade86a320583963bd32caf94d77fc4749bccde6536af05ae159fd4c54a8f651f361e6411ff0640c2f9049949a5786444cbc04cc1d7b69a8feb6bfe46f97f65187b2c3a283186a20f3d3ca0ddc34e4c76025ca3ad2f6d3c2da379e70b92ad3a07198c358ab7dfc6a4e9f1a6e9bf44dacb75a48dc8dfef0ba4797cc30af1f02f1d8c3bc4a6de89ad8f7fb4019a19fb2d79fc08eb6c30bca737bb9fc8ec8477efd6f0dc7a7bc681de9a90327a960d43f1118f90393b84ae90d7ae78099c8467d534537594211df2cd7ba5305aad2a7a746ca8c1bd660565ad23beeb1baf8addd3531203217f4c99d453a08de292deb42bf2ca59df067afff00d03533395e472cb58a276bc4a343e39daec726be02506cfa9f255f0ebabcfbdcf5912eca4a6aa92b6632177231b518fde776c6ee1629e35c9"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-4",
+    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
+    "pk": "dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d99",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "672e8c7a8e6d3eca67df38f11d50f3d7dbb26fa8e27565a5424e6f8ac4555dcc",
+    "gamma": "4d3e0524fc59374f1fdad8e471c695469b45ecf69c1de85c6c1230e888dd4cbe",
+    "beta": "36127f8aee7c61048984f0a208bf6d334db9dacbeeeef9ff2d17117e812328321462eb3ef602f5911d77ab11f815eb4154ba95c934e414198ef000a61b4de31a",
+    "blinding": "755610da34cc224fbe60ce5e42add2ea6b272ef466aef18c13497363116d1c03",
+    "proof_pk_com": "a2d7505a6ebd7675245a7807f3fe64c1bdc3b3e1cd96762e5cd195f5bf5abc8b",
+    "proof_r": "839cad088f50ede00b337fd6dcf95816820e876c05b4ab3a5940f6d190813f9c",
+    "proof_ok": "b9fa51c75d278d95f2ccace9609b28ec137b244c8b7d1523b16ed07c8e24b8e4",
+    "proof_s": "9dbc7517707f65c2651f4e7026654d2220333196dfc83460233d6bbfd331c804",
+    "proof_sb": "38902aa4247539fbd8dffc217123d2057eab3a1cbc9a05e17bf2da773f147405",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5dc2de7312c2850a9f6c103289c64fbd76e2ebd2fa8b5734708eb2c76c0fb2d994fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "b62f3bf3e83646318894151bb51bb535a2539581773a01956f1874cb64e7a952809d40be330de7d34bf01162adb2675e94c21ba7db9087beeb87d536cce326fb20a5b816654432c73a772ede266d0d3bbae3f6aa0bcb31b5de62d33863a0098a92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "84c37dff677bda19d7ce202500196edeabb794b0e0970b52a76061d9fc9c396f5d6671db8da091886f4f894775b49a549107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd82e07ea55ee440e81149b38337a6117602874efb0da263aeee9575422ce07cbdd756fa6d9e85d948343468a74f6ed0fd84a67f10c31b6322d8b95442c75abc4c45391bdb9d8d5a61d371931c66ae1e6cc823e217155fbc2eecf27069ed7237e37690f2ddd7cda41df0a6853a2c3ac03da5393792c1b8e04f22bc23b9fa92a30e55ad209307508ba2f74633767ee63e6421689de896eab97be1570e636b0b4e0a93f4ae4d0c89899f68e1904c8a2ce4036066ed17944b3932d17c41089b4e7b2dea8d9c5884c17637150e7837def2a8bfe4b96fd76b40613bf1e7158b0d602722692796fce33c1e937ba562c4715816bd27436477ae63d63519d02fed79b81e0613f91d549a384355750e8b2c133423e923dc12113025087122d3a37378274c234da1e6e9934e21522c5ad9e5425f40e44cdf71bd2bf285e30c06038f19652713b3379b0786202ad6192d543e8e8e597b67eb8536154ae1c38119fdf412c1630a9cfe4d8c4434666c4180df5be5aa5790b1bfcbbb96e55e008c46c784aac8bc366fa2cc672ad966dad3743e6ef99c1a5286ddd9c9809a838b600a715b632bee3465339f4dfc4b0ff23b6bf5c30eec9aa91bd3e6b320d832a383fd4cc68abb11f6b9d19783c103b1be6bddea873abffebc256fd00b9d6da74681d4ffb0aa4f4fe9375210cb6baee3adbd692bc5b7057939"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-5",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "9508104b820469687488d83f729288d9f70fc0523318beff44a47da10d490b3c",
+    "beta": "4ee61f3c000544aa48c565e143e05c6501a623bdbf02a0a408b97433660b4907715f75890cc0e45cdd7116e3da15b15c3c637782e8e05d05c0d5895e5fe583d1",
+    "blinding": "fb0123dd6317dbd379afccded247f75b3c1c2e32b86eaa9d6c9d0eb5bef07919",
+    "proof_pk_com": "c1283a6a033aad24a0cd502308e48b3e2f862609cbaa6e353af0bfd3df3313e5",
+    "proof_r": "eb71022b4258201b8c226720d7b0c46395190eea8339284414cdb9dde8063096",
+    "proof_ok": "311f94e886825c80a30fd44535be37218501bd072afcbc1298f8fba6c3e3c96d",
+    "proof_s": "7800bda659bc57d8b4f01ac86c6a5819edb29b48d00ab01b83f5cbcd16064b06",
+    "proof_sb": "14e82ee7b96487ebe7a57db04eac22512a138e4bcb55b9d1186f859dab37ed11",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac294fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "9436b3535d5dcffd6f15628fb028095f5c0733d067222f8893bb106f2fdac0f63dfcf69a5715522c7318b9b311264ee5a2b499057db5d1211e6b9f4633ad433d22dce5f20a95b8a8618b99539bb697791e02b1afcf6e2de8240d067396196b8392e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "a7185a7a63812926137b53a4776569fe2323e84689e9e2523e03d3c61beb04277bde2c4a2a5e6acecbbfe1c09f16f9899107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb3da35441995afd9ae72767c55776e6e14ff73128a304d7e39b697a2f4a7ec40311c0fa4989b38bae24e1b3c4d8e3162a7c935e743e17d250f0c0f28753c3872decf21ce9bc39d69b53e9e2f62023cc5b201ab16072bf5f137129bfd82b7247463bf34c0ddf644f97c9d7d92bc8357efc16ff36bdae58c675af3364bcc1afc4404733d02d8ccd857a639308a743c9a6cc50dde7da1f2f87590bcebf5a459fa0469af990101e6af73ab99fe3050e536c5b1328bb4b1b57b60f76001f04b8a4c17ea847e828e01c94987c2170ca48160752ac679e2ffdacfd534719a820e71135bd4b1ea5248f90a6648945da5e23030f2ac2d51a61fa5d0f6c53d9dadb63e772a3071d4ea1e2de986c1be5b2ebc0ce377f05c9fc9a7b28c04c1c1a55b4b208b22db6012a4c95d7601f919be0cb2c8e576fbd23bd1b4846641a70f7d11444c1506aa380d402f6479fe90ce25f509180633595d5c3cedf5bde823d9e3f682f220a0d9a7b35429a3e6d95e4c063b11fa608acfda814595b75496a2c723c063baf397515b9d3082e0271d181bc01a4fc3fb128cebc0415eb73507a1a24a0054378f8e334076106fbfed4c64f3794333eb65198e1cac75f9a065df19daa508fc93eb2caaa70fa35c57b021c81b5d50a3d2093523f793c0bc2210ec209e24683a4ddfc600500daac0c864aed2b04ef72e40dea1"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-6",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac29",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "9508104b820469687488d83f729288d9f70fc0523318beff44a47da10d490b3c",
+    "beta": "4ee61f3c000544aa48c565e143e05c6501a623bdbf02a0a408b97433660b4907715f75890cc0e45cdd7116e3da15b15c3c637782e8e05d05c0d5895e5fe583d1",
+    "blinding": "0752c5b639dffedf9a66ac111a765d3e9c4cfac9c8b26cc5af6d524967afdf0a",
+    "proof_pk_com": "3f1cad632b9d0dae9486ceeb8712c596f6b8ec37d05d2bd22a40abefff1aab08",
+    "proof_r": "5e6f3111c0937721235aacef3a2378c8b8441aab953cf2c6b5bc892b26eb9507",
+    "proof_ok": "311f94e886825c80a30fd44535be37218501bd072afcbc1298f8fba6c3e3c96d",
+    "proof_s": "7451da70df2a6788fc3ef50dd6c5f142c5e561dd7d431c36859e4e87616cd31b",
+    "proof_sb": "2e531e6fda5a65120809f3ef98e10c70abf17f3380449c7b3ff20cbe6a22e107",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5decb0151cbeb49f76f10419ab6a96242bdc87baac8a474e5161123de4304ac294fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "9436b3535d5dcffd6f15628fb028095f5c0733d067222f8893bb106f2fdac0f63dfcf69a5715522c7318b9b311264ee5a2b499057db5d1211e6b9f4633ad433d22dce5f20a95b8a8618b99539bb697791e02b1afcf6e2de8240d067396196b8392e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "a8455660f642a887ca7bced683e7c5315c6ebff1d7d047ca43f5b5c7b34c244a3902f6ca62346b638ed58e4aa5b2c1c29107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddaedd504f70182cc453ab97bde517b23b46bb9f103b33d6ec16861808df31fe95363d99654ae24b13c76f86d822293ae19499785ff575aea311869ed993f48f495f4a206bab083a44433d44434f8af0d5b73b50d66f89cc1f70c1e6f3bbb6c7b48d87633025774bda01ca44d62be38a87db4af147959e4ee289f29237eaac674c4b7acc83c191daba160be6f1d5de39d858510f01336c0bda533a0b7e15ae38467b5db7d5dc1803b69d3a8284258b1d9b0a74019043484e5743cf82117c24237048da2b7c661b646b155d73cf9475b94089aea18aa12ffaa9489e45b5950eeb42ec1a9f5ba6440bcf31add7ffdbbaf6603403b1fb4f08171040a38c5c507f16032f013301d9d0a0fe82c0d300cf34e7147be19483f7be4967c876ac92809a14384c6fbbd68599144c9c87d7f9427a8f524a39f2af27e4e4a512974f75f2836528b7f464809288e9d2278f3f92e10e5fd06edd6ac37c2b73ee155ee7b53b5966e010f64d70fd96f07e31c134e1cc554c203fd306b56597003ec176ffd6291b3f67909cfa8021b55bda15810980a3d8ae138e3796940be4b9f768fbb22b2d3b5cadb1426734954948b980be84234362c5e9bfa05aa947a1f862bfc0fd77822b69f1a01aa71052f2d632548a4e3fe049ecbf4d0cf26212c95111a2243e4eceed64faeeb69106baa4127b8606c04f9d176886"
+  },
+  {
+    "comment": "bandersnatch_ed_sha512_ell2_ring - vector-7",
+    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
+    "pk": "b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d623",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "4315192d2ce9e52ceb449a6b4da7f7e6636e53592c7f5e236763e21e9bac24c7",
+    "gamma": "6d1dd583bea262323c7dc9e94e57a472e09874e435719010eeafae503c433f16",
+    "beta": "09106f062ac07846f3f841f64765527b333575143483855d633f99ccc2e8e306e6239ff79a1272cff931e8d0ac6c390328486329118ad40a18b85184da1837ff",
+    "blinding": "462ae9ad651e5caf11247b989fecb5f2b1729479c33b9133388d14fa35dbbd0c",
+    "proof_pk_com": "0286ffd0277e29a9231bea18e4a553db73d4d4aafc2864e639080734c39f2314",
+    "proof_r": "207967dcefefd52af68b66d0a56ab6461e95fcef4bb1c55077b0380aac5f3fbf",
+    "proof_ok": "5a02419120b814a5c81d67096aac728ee9bda5ddf9451cf554d871462a04831a",
+    "proof_s": "94554c2c21c0767d9336d05529b48dff2edb1bc90f1f911fca69203451d8fe1b",
+    "proof_sb": "55ac5b72232a476a907e98ade0c45ad1dc2dfcc67947308959c0b8417947c215",
+    "ring_pks": "7b32d917d5aa771d493c47b0e096886827cd056c82dbdba19e60baa8b2c60313d3b1bdb321123449c6e89d310bc6b7f654315eb471c84778353ce08b951ad471561fdb0dcfb8bd443718b942f82fe717238cbcf8d12b8d22861c8a09a984a3c5b0e1f208f9d6e5b310b92014ea7ef3011e649dab038804759f3766e01029d6234fd11f89c2a1aaefe856bb1c5d4a1fad73f4de5e41804ca2c17ba26d6e10050c86d06ee2c70da6cf2da2a828d8a9d8ef755ad6e580e838359a10accb086ae437ad6fdeda0dde0a57c51d3226b87e3795e6474393772da46101fd597fbd456c1b3f9dc0c4f67f207974123830c2d66988fb3fb44becbbba5a64143f376edc51d9",
+    "ring_pks_com": "b8d97722ccfc97a5cf2cc77aa0bbf5a146dca7762b98e2b6bf4b8e34e04e214b28d838eb642749b18ec6b8a0d79d54a3acd644b13615f791f33d648026ed6e169bd516e3413b47ea35c9a8879bc1290d9fea32db7f127ecb33185d102875de5092e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "88a7fc8a8ae7d295bdd26553b06d298c7d7fdb3f08746aba8e3312d78254a2013d4cd3bea7b62156b5a5b0a42e7e45179107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdda15ad20bdb22a9a44a8920e9b786734da5d21d7eaf7aa0fc61fc1b1cccb27368cee380aab3bc35869ba4859accfebf228da4000ecbbd57909abf6e76b5d48d6522800878807f6f9434ae4067c2b41d490bfb2680a974c880dd377b4b976243b099e55b8697fb20c02c819216d331d8a7164184098a55b51baf13a5360811430f656cd37c09aade74f6fb385666d2a8438d790fa1948be4e5591624d6eb317d19c8e73c14cd76b63407bb49120ef62a81caea336dc0b880f8781a3701b2537a6f0e864dae3598673d27ed24f0d989a3f48c6104c734efe6d705e7db3fb689aa194372a7774bdabeefc34c83478b38ec73bfa2dc37b24f373fe4e7f44cfa12eb0e0d9bf57f72218af5ba1f73d6ca79c3e700dda1301a4d9c3847cc6c2ae360e12f956e9aa1ad08b163b73db32c948097b95b1c7d33e4bda4ab30b33381c7420f41912fa75f7b7c19d8b46ead99292dcdbd105adf111c915fe61a9ab7dc45580f41132e4682f52f9d5a07568d011843347155d50766b243d701057d7466634e79ff204cc2da10e6e817b14dda886fa32b58977e8158b4d51345a33155330395654e72e1ea063662e2ff4b89e5130d91a44d7714269f83e4f14490e29f304fa26d0b82261cfbb6854cde2bff08ae07c09d4c91cb2d938449f6b49305662dc5af69b38068cb6cda437490ba8fe111725cc590"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/bandersnatch_sw_sha512_tai_ietf.json b/data/vectors/bandersnatch_sw_sha512_tai_ietf.json
new file mode 100644
index 0000000..ddb1cf1
--- /dev/null
+++ b/data/vectors/bandersnatch_sw_sha512_tai_ietf.json
@@ -0,0 +1,93 @@
+[
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-1",
+    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
+    "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "89824ba3aa7eefbb79cd5734a659adca078ed6851e067e2c7f5c378de142dc2600",
+    "gamma": "8bf194739010d89b8557bd03cd4b4e8196034d036ae90804bd6cd29e3c3d066000",
+    "beta": "a2100f37b8970e5908ef9b75dd28cc99a2155e1a5f0f5502eadf808dd0efe300df84402a976682b29dca5356846fe6fc93924877d802adeba148bd5c0aeca445",
+    "proof_c": "d3148c20dce454d99b11f59095d58a5fa45af94957f51177d5934ae1df12ce05",
+    "proof_s": "5598a73c1298f425177eb560fa3cdccf80c54257c232164e07dac45c32df6003"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-2",
+    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
+    "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "4238eeb9ea60bbd22d149b155d734660d1198ab7f00635abc7538b23bc17144e80",
+    "gamma": "1cad4ef9a7079c17504a3b91431dd8cb338f361f3bdbe7afaf9d4425448b822d80",
+    "beta": "00b8fe7ec85b7a6ce40423a025dd2be167251a6a5b59b6d621be5dafc7792891692b6b8de2c6dab85833fb513eb00b62ccef81d903ef331001ee12c48b92ed55",
+    "proof_c": "970ffb1b0f5cc29c444c1fec1b60f9928f1813987a485c0d6a08aff2998c1201",
+    "proof_s": "d35b8fb512fd5d2964c7f60d73127790f17f538f480c717b2ce93cd8c7b0cf11"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-3",
+    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
+    "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "89824ba3aa7eefbb79cd5734a659adca078ed6851e067e2c7f5c378de142dc2600",
+    "gamma": "4bd4b20f72a6ac4074dab2da20bbcb518da52ce10abcd98552c192b9ebf3012b80",
+    "beta": "157ba81d5f3fc0732d4638919ffe4a66257b6b9701bc8ce39095c25bf819dd42f2fcd504b3bf04262c8d8b7b22c6c5bcec1e482a5092356cd54c1055622e4332",
+    "proof_c": "969d905ed35dd38c1b6c760c5b6de535e48277323c7c6f1233abba64550dd412",
+    "proof_s": "aad3e78c8a6b5eeb5daf6bb4656988e6d37f94a8bad9f7860eacafe914ddc801"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-4",
+    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
+    "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "f4f63b975b725bc090b7d741597be3d03fea7e4cba3f6a95a177fd63bdc2060280",
+    "gamma": "537086b351db10424ee65f6e30c3b35ef8207ec050e48eefc0113fb6df56552880",
+    "beta": "332892f4150b85ef1da2766d0461c8ac391f5f1fc03e888a8222c567a8f19be3b090e852d3cb25a51788c1e502cfe7944def39d6253bab9604a2b6817caef023",
+    "proof_c": "bc9a0efa4c36da697f1b22085441443d7b1c913b97ca435727566e559a51ac17",
+    "proof_s": "ad2e2a03a59302ff93e2e5da4f23e0bc4b930fb886a990a026a16e50a097df10"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-5",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "4af5381d91e64fd514a4efe23acb3beae6a87d549cf12fc7c51d27e63dadb17380",
+    "beta": "ca0b4e8537f33e28ae8c4ac2b53ce5784e3abe846ad4aeb3fa330a5836e483da3d8903e5f227679e228e6ae2949748b2b7c5cbbec44ea06157f613767ee2c09f",
+    "proof_c": "f6cadcdbd2f6d3a971719154ec1bf06b700df71667377e420830343dc7b5a50e",
+    "proof_s": "c50ba9c3fcce329970c73fad17d4fce0d81f44838bedafb9f7406ee4f712de1b"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-6",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "4af5381d91e64fd514a4efe23acb3beae6a87d549cf12fc7c51d27e63dadb17380",
+    "beta": "ca0b4e8537f33e28ae8c4ac2b53ce5784e3abe846ad4aeb3fa330a5836e483da3d8903e5f227679e228e6ae2949748b2b7c5cbbec44ea06157f613767ee2c09f",
+    "proof_c": "65870dfdc489ce27a92afb455d23e9b43e1300811d1dad9f55c6def39906461a",
+    "proof_s": "42cc993aedb2f7f0de1f769759ff5905763c8c73dd841b4ba6c67ca15bb0fb09"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ietf - vector-7",
+    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
+    "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "6896518ab25de4c4985ee693210a9d2cf1cef60cc792f5e0eef408c3db11b02000",
+    "beta": "dd0ba3c69fc9842563a7b84bfca12a5c403b1771bc660e8d0012897f1dac2f8e72e501b861ead231372ea6ab2723f47f9997ac00b215c80e383b5482c579060d",
+    "proof_c": "721e0ba6fcc4cded30efaa9e1bcc65fd2589505308eb526e1ecdbe1411543510",
+    "proof_s": "5b82bdfddf3fe1d704f8c788a43cbbeb1a86da36d0bf1d1e304831409e53a317"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/bandersnatch_sw_sha512_tai_pedersen.json b/data/vectors/bandersnatch_sw_sha512_tai_pedersen.json
new file mode 100644
index 0000000..b573a36
--- /dev/null
+++ b/data/vectors/bandersnatch_sw_sha512_tai_pedersen.json
@@ -0,0 +1,121 @@
+[
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-1",
+    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
+    "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "89824ba3aa7eefbb79cd5734a659adca078ed6851e067e2c7f5c378de142dc2600",
+    "gamma": "8bf194739010d89b8557bd03cd4b4e8196034d036ae90804bd6cd29e3c3d066000",
+    "beta": "a2100f37b8970e5908ef9b75dd28cc99a2155e1a5f0f5502eadf808dd0efe300df84402a976682b29dca5356846fe6fc93924877d802adeba148bd5c0aeca445",
+    "blinding": "55f71122f86a3e731bb762514308811c3f590d931428df71cb3b37097025fa06",
+    "proof_pk_com": "354044431127e09f84a39dace6586c2c4cee89a1b347c86a8751a50882f9fc1780",
+    "proof_r": "17ae73175d3d7295f72fc73b4876d0cfcaa2377d8807e07bc865fcf654d7dc6500",
+    "proof_ok": "3aef7094d9223853d76322eaea721f9130577a33aaaa5fda1570b8df7509052e00",
+    "proof_s": "a2dcbdc20785729fa4b57d254229fecde61f86d2f04750f27f192d88ae545615",
+    "proof_sb": "7811620463228a4d43764fefd1ff40d92bf80ccef6d2f3302e8f3e4c4055e00e"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-2",
+    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
+    "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "4238eeb9ea60bbd22d149b155d734660d1198ab7f00635abc7538b23bc17144e80",
+    "gamma": "1cad4ef9a7079c17504a3b91431dd8cb338f361f3bdbe7afaf9d4425448b822d80",
+    "beta": "00b8fe7ec85b7a6ce40423a025dd2be167251a6a5b59b6d621be5dafc7792891692b6b8de2c6dab85833fb513eb00b62ccef81d903ef331001ee12c48b92ed55",
+    "blinding": "0ce2977115916538f4cf6c75b7c90a9ea76898f0f704e573bdc4834505ef0907",
+    "proof_pk_com": "7166e9b4e5091eeff96c2b7403d44c41bb351684fc2ff498ea4c8805e3245d5300",
+    "proof_r": "1058bc1103da806740a5686ee3ddbfe322a979a2233673918fef53a9df46ac3f80",
+    "proof_ok": "fa262ba3fe3784dc99afdd38ecd24f232eb6e2b08a8d45d15936cab9ff878a6d00",
+    "proof_s": "ec624487c189f1125cfabc2bc8ef6d2902663cd99a348da19bae7d4317afee0d",
+    "proof_sb": "743d24f00b386e49090bc970778a030d75061d6c67c8bc030efab8f02c609f00"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-3",
+    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
+    "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "89824ba3aa7eefbb79cd5734a659adca078ed6851e067e2c7f5c378de142dc2600",
+    "gamma": "4bd4b20f72a6ac4074dab2da20bbcb518da52ce10abcd98552c192b9ebf3012b80",
+    "beta": "157ba81d5f3fc0732d4638919ffe4a66257b6b9701bc8ce39095c25bf819dd42f2fcd504b3bf04262c8d8b7b22c6c5bcec1e482a5092356cd54c1055622e4332",
+    "blinding": "2b21be394a108c03a0b86142e6460119b8968eb54d763b49ebe0aa35a05d441b",
+    "proof_pk_com": "0172099bf3456b60020b05006a4e41f99a86c0a85a64a864e611de51bfa4660c00",
+    "proof_r": "59e4c08abf15b1b07b51a4a9c6ca53127cac94f2a55717ba4eabb035c190423f00",
+    "proof_ok": "410f22934442e290d8158d296f6db464d7c5cff5f63f86abed5a0c24b725331400",
+    "proof_s": "65414b49234ff97907c3c2d888588df955166fdf9e06a5fea88894e99d11eb05",
+    "proof_sb": "cbd729b414c65be509641a53ae18267fff50d1ac2fe6e777613973fd11068e10"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-4",
+    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
+    "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "f4f63b975b725bc090b7d741597be3d03fea7e4cba3f6a95a177fd63bdc2060280",
+    "gamma": "537086b351db10424ee65f6e30c3b35ef8207ec050e48eefc0113fb6df56552880",
+    "beta": "332892f4150b85ef1da2766d0461c8ac391f5f1fc03e888a8222c567a8f19be3b090e852d3cb25a51788c1e502cfe7944def39d6253bab9604a2b6817caef023",
+    "blinding": "535bf70009cdb7d543a87870e614b10eebfbcf88831235bdb73f715bb4b1ca14",
+    "proof_pk_com": "8b882d9e87fcbc3c7af7593cce8c5690401483467bfc8895a5aba7d07f765d5080",
+    "proof_r": "f155e1e7524191eef5edd74659adaab05301e00408abd18331188f9121bd754e80",
+    "proof_ok": "14811d17183dec2e0cd18b0847944502f6b749462bd2d7807284f3f9ec39f46b00",
+    "proof_s": "a146ecf8af43f02b174b768052d48c7106ad7433c7b3437f4e1ab2af730c511c",
+    "proof_sb": "bb9d2b63e1541beeaf74a45fdabf5e21c881cf3336b7df5d763b9cb45d839a17"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-5",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "4af5381d91e64fd514a4efe23acb3beae6a87d549cf12fc7c51d27e63dadb17380",
+    "beta": "ca0b4e8537f33e28ae8c4ac2b53ce5784e3abe846ad4aeb3fa330a5836e483da3d8903e5f227679e228e6ae2949748b2b7c5cbbec44ea06157f613767ee2c09f",
+    "blinding": "11019f4bc50575d8fa851b6a507b15cdd9e95a8f68e0dfe87114cf7df8a3751b",
+    "proof_pk_com": "fadc0f97d133296bdcdc21ae726ad96b7f7a44dbf93931c93404c231585e3f5580",
+    "proof_r": "ffe1f522365f8a38a0dc8eae0bce89287b6da2fc5b98362db7e4f528b564ab1180",
+    "proof_ok": "df425b123de0be0eceb2f3bb4165d53764cfb1d76089d7983b1caead2b251b3880",
+    "proof_s": "437d26458b589e085833a2d920be3ae168c657e385ff899fc7fd5af74a893b0a",
+    "proof_sb": "eda29f841d6b10bf022e8d3ab8fda97c5896940b5a3eaff42ea75cea411ece19"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-6",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "4af5381d91e64fd514a4efe23acb3beae6a87d549cf12fc7c51d27e63dadb17380",
+    "beta": "ca0b4e8537f33e28ae8c4ac2b53ce5784e3abe846ad4aeb3fa330a5836e483da3d8903e5f227679e228e6ae2949748b2b7c5cbbec44ea06157f613767ee2c09f",
+    "blinding": "bd91ce4bc2029413d70d3cf1a7df866fb63a922060cc57c34a1f565bababef0d",
+    "proof_pk_com": "98be131aa43e4045a9e64940a93cd1e6dee35434f121667e58aee59d1a68825d80",
+    "proof_r": "183042e8b5cde07497e4922c49d271e6a8a4f92bff67856dc13d7a48bec5ea5b00",
+    "proof_ok": "df425b123de0be0eceb2f3bb4165d53764cfb1d76089d7983b1caead2b251b3880",
+    "proof_s": "f10e9bf7a1d38050f5bcd1bcd3137193532ae0e2620af210bd0e5db8cdd6090f",
+    "proof_sb": "8fd5408fa35ad60f55141bf9fa0bd2ad0c9d9bd18fd8468e1457749d5ef1c311"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_pedersen - vector-7",
+    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
+    "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "6896518ab25de4c4985ee693210a9d2cf1cef60cc792f5e0eef408c3db11b02000",
+    "beta": "dd0ba3c69fc9842563a7b84bfca12a5c403b1771bc660e8d0012897f1dac2f8e72e501b861ead231372ea6ab2723f47f9997ac00b215c80e383b5482c579060d",
+    "blinding": "8df74965c9d0b35a62f3e7a6a6e6cb2f21d8979ff9818d44f7881e2e819d680b",
+    "proof_pk_com": "d7a89ae94e61283da37e48f9c0e34b3da7babb109574f91de25d41db68c4da6300",
+    "proof_r": "1a990e0b87243fde6f06c5af0b9f871d0943b3464ed74f435fc033eb5577573580",
+    "proof_ok": "65d53e3baacfce0c81fe8cb644f882713659941feb708158bd86e3374fa6144500",
+    "proof_s": "0fdb1037f25e7de8b1bdb69acc5c725e407d1045b11ae2ca41fe47c42df95209",
+    "proof_sb": "e0a30f38cce6eca6a1bd31b4ab323d18c700eebfc374d0cb997497a5ad03b80f"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/bandersnatch_sw_sha512_tai_ring.json b/data/vectors/bandersnatch_sw_sha512_tai_ring.json
new file mode 100644
index 0000000..9696748
--- /dev/null
+++ b/data/vectors/bandersnatch_sw_sha512_tai_ring.json
@@ -0,0 +1,142 @@
+[
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-1",
+    "sk": "3d6406500d4009fdf2604546093665911e753f2213570a29521fd88bc30ede18",
+    "pk": "fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "89824ba3aa7eefbb79cd5734a659adca078ed6851e067e2c7f5c378de142dc2600",
+    "gamma": "8bf194739010d89b8557bd03cd4b4e8196034d036ae90804bd6cd29e3c3d066000",
+    "beta": "a2100f37b8970e5908ef9b75dd28cc99a2155e1a5f0f5502eadf808dd0efe300df84402a976682b29dca5356846fe6fc93924877d802adeba148bd5c0aeca445",
+    "blinding": "55f71122f86a3e731bb762514308811c3f590d931428df71cb3b37097025fa06",
+    "proof_pk_com": "354044431127e09f84a39dace6586c2c4cee89a1b347c86a8751a50882f9fc1780",
+    "proof_r": "17ae73175d3d7295f72fc73b4876d0cfcaa2377d8807e07bc865fcf654d7dc6500",
+    "proof_ok": "3aef7094d9223853d76322eaea721f9130577a33aaaa5fda1570b8df7509052e00",
+    "proof_s": "a2dcbdc20785729fa4b57d254229fecde61f86d2f04750f27f192d88ae545615",
+    "proof_sb": "7811620463228a4d43764fefd1ff40d92bf80ccef6d2f3302e8f3e4c4055e00e",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100fd72a90d1eeba6733824e76bb31991b8108d6562756b85f244333e3c7205225200e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "aa8c95ce69477054192546bbc5f3dcf39a3748920d88ab90689c6247a3207095375a279f18be6de223e010d170b4146484288fe0af65c803159cb2dcf0231c8f8660569f4c177dc54d7cf98a315a8b6b70920b2a01e7e4300cf0302503b39fbf92e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "a641807aad87d0f6d689e3bcb2f2f6e6b1660e4a95729219a0da69d4a45d173930e7ae3077702e937186f4f1ef33df6e9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd9071a471c7fbd26eab907d5d92f9ab31bfc295b373c36c59c54aa17686d4250aa68407887374ad83f09e3d8662e827e980fc31da0c5d61f68fe634f92997c24cb443f9706b6befdc82b19114c711698c3356acf2d150296fdb889477e66869fbbbba695782a41bd0ac0814a65ef58f5f8a89ab005cf6bba46c44b110f3237431e4a2fe9071ca8bf1fb1a9fc9b0a6c926ec5d8f181900841d07c3008484d95c5b232401f1df8a84be744dc8ebebb6e811934d7721009db424a924eaa7f2523a56ca68fa2a6e4e76c681a5c8e16ab31682c04db1a3e663829926b5d1dd46f3f232000f323a7e3725ec5013eba2af30543491088f7220b2c616a089a0596cab8f141f5f7312aaa8ce9de9ec20c571f383b7a640f053736489b66b6a90c42ffb0c374bca4b2b63b8eed1467d32a12318b47685eb3b69f3f8f7886e86121241fb2d0d82a77b9d97bb2c9bd8d35e9925239fb79fcb0a9c69f85843f70352ad7cf759ad3f58c40eb555fd7186c39b26f3607aa0ad46fb04e25428bdf55569f3f191b15e07d81468002b78c33922b26c86c01972af25906661252c2bb4352179e68f253296bfe63ad6ed9d9c36b07980d75f1c43c1b2ab4e67939df123c483c907772b41a050dec6a10ff268be3366b2e9943b1e7017622c70560d19840f482d79b536d8df6911637ad55a008131a4d3ff07ab6c"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-2",
+    "sk": "8b9063872331dda4c3c282f7d813fb3c13e7339b7dc9635fdc764e32cc57cb15",
+    "pk": "e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "4238eeb9ea60bbd22d149b155d734660d1198ab7f00635abc7538b23bc17144e80",
+    "gamma": "1cad4ef9a7079c17504a3b91431dd8cb338f361f3bdbe7afaf9d4425448b822d80",
+    "beta": "00b8fe7ec85b7a6ce40423a025dd2be167251a6a5b59b6d621be5dafc7792891692b6b8de2c6dab85833fb513eb00b62ccef81d903ef331001ee12c48b92ed55",
+    "blinding": "0ce2977115916538f4cf6c75b7c90a9ea76898f0f704e573bdc4834505ef0907",
+    "proof_pk_com": "7166e9b4e5091eeff96c2b7403d44c41bb351684fc2ff498ea4c8805e3245d5300",
+    "proof_r": "1058bc1103da806740a5686ee3ddbfe322a979a2233673918fef53a9df46ac3f80",
+    "proof_ok": "fa262ba3fe3784dc99afdd38ecd24f232eb6e2b08a8d45d15936cab9ff878a6d00",
+    "proof_s": "ec624487c189f1125cfabc2bc8ef6d2902663cd99a348da19bae7d4317afee0d",
+    "proof_sb": "743d24f00b386e49090bc970778a030d75061d6c67c8bc030efab8f02c609f00",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100e30eae606d21dff460cdaecfc9bfcd2e319628ccc0242f3ca21f2d5c940ba41680e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "95af28596d8f33bd524f7c210a4a343db36dd2676b1b36dab291c7e2f528f6d60f224fcdec7536461e9d8b5e6c7d47f5ad66efa978d41b2169a36fc4ee76d0d1d10c4b4ac24f96c717c30cc2468cde7017addb51c9ad42642ebcc4c7c7380d2292e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "80c642a1a2bc671af70de73c14edc980acd0332f502eb6923e006210d481a01e69cee1b7575b184400c8b15952d59f169107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb1c8628c7bf3642725eb14cf555318a0381e83aefcc93521a070fcd73b7fde1049bec4816d54507adbcaa95fb24a0daeb3d5ec4abb9232ee806406c67cdf3ca2a6bf7dbc76f789f4b13f541827278c8a7c037f75254d8c9137c973c70ba64da3f83a4854e1d59dbd5329f5da022e5aaf3d54f8fc383a78f066fdca9ef3a80c21b3a534afc3fca209e5d8dea5b700598e46ef42f665d8644730b8e565dfc796512341136fb84f55c7a80421e0dbe7e6a8fa20eb4e05b81e2f25d21bae20844b4973edfdaf99a1f9458ff871a3e4481da1dd6b18cbfe56f5de85e6dec8a70d1417f7004164042a8b83b354c98b67c69cc0975cccd1ed4e9b431dd20e9f61dfee68399dc5625a1645a48023c1a56b86c9b02dc6593d9ab3f12469ffe42437e13a6d9f88826569b7140a97fd5052d17602f52836527a00115a9b536420a77296f90281049c9d894cd736b1cfbc447360b11cebb528dce54e0e1cd2886c8e32c4c3da57479965a349707add916515d0ed25e0f1c4d246ed321decbd446d15176bfeda58de757ae7f587274840f32c9eae0020a2511ccc5578c53ad2b5c107dac39b2ff27dbcc88c75726c281f6267ea1d61de6f9841067ecc04c70a5fb09b90ee29b484b61c95ae2da7d1bce39e61bacb234ea7596e052e7457c4e9267dd258bca7974e2ae6edc52a965564e66e443cecf502"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-3",
+    "sk": "6db187202f69e627e432296ae1d0f166ae6ac3c1222585b6ceae80ea07670b14",
+    "pk": "2a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "89824ba3aa7eefbb79cd5734a659adca078ed6851e067e2c7f5c378de142dc2600",
+    "gamma": "4bd4b20f72a6ac4074dab2da20bbcb518da52ce10abcd98552c192b9ebf3012b80",
+    "beta": "157ba81d5f3fc0732d4638919ffe4a66257b6b9701bc8ce39095c25bf819dd42f2fcd504b3bf04262c8d8b7b22c6c5bcec1e482a5092356cd54c1055622e4332",
+    "blinding": "2b21be394a108c03a0b86142e6460119b8968eb54d763b49ebe0aa35a05d441b",
+    "proof_pk_com": "0172099bf3456b60020b05006a4e41f99a86c0a85a64a864e611de51bfa4660c00",
+    "proof_r": "59e4c08abf15b1b07b51a4a9c6ca53127cac94f2a55717ba4eabb035c190423f00",
+    "proof_ok": "410f22934442e290d8158d296f6db464d7c5cff5f63f86abed5a0c24b725331400",
+    "proof_s": "65414b49234ff97907c3c2d888588df955166fdf9e06a5fea88894e99d11eb05",
+    "proof_sb": "cbd729b414c65be509641a53ae18267fff50d1ac2fe6e777613973fd11068e10",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd07950361002a00e5a32e2f097858a1a4a73cf5c2fb4e6d375a4ea4cc3ae3e91660eade850c80e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "a660ecbd7dd1f12ca87f8d23437f583741e3be93618459ad82e9e9d5b70130db70c92d272a7467ac3afa1a623d266bef8aa25b62dec13912cacd50404dc40a5612d9e0dce06f43faa8897185882c43cd4e24104641be52784b0267b2d6baf32192e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "96ff1a58557e371bd7da544b5aeedbfa5754827b14e7072ba83de2208d2873720bb50ba97ed57f62c58ccd4c32757ab59107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcddb2bcf67ff96b55b999302b52dd8cf9e19ab3fb6ce4b3bbb15c0381e0cb1d68acb80e6692a9f94f5647d03a516da82c90a29831d0e0f883faade9512aa952a452f215e29cea0cf0ddebf45bf1a7b93ff33d022c0dc20c48d8756d85c26ed85b1df5720d3abaf8ba75e57aed509a510b463c37260d6278348113cb9ae34cdee84567e538a3b287133b6e88be0a552c0daa3a27c33e9bef4132b9b7cd0d0b407856de1fbc0f8d9843369bcabba9c5c4d4ec8c66239b7a27c5e71953c2d6d54f650cf845ad70f326786d44b767297f02df81ea2659b3e675bc57c9a23b42fe928241869fe79db9f3f48b447addd665b7b2321c63dc012957ec458fe26c8eb4c957017db439378b7037d4daa4709965d4e58fc9779257bb6d862f2f419bbc2f80972e78120ba392d0b20443aaaf1d6a2d723ab8cdeb798e30d0d00fd1a6952ebd2f308a19315776cd9c622a305a91e2ed690e4e5ff078d58ffb243ad55a28a55a0bc662684db198f91833abb7f1828ce28f0076839b12a5de94883cb545062f00cb40bde4f130bdeca6480b6b2ea1d66a1656ac10ff41d2047748f6384504e47658a30b6ad89b9c864c21806f5cb20853e720f596470fff43cdb7be2e7975fbd62bcca21aee42de8678f366b4922315c90ac3e085666a074625265a3e24c18edd1afe9199b325244d854decc7e944847d7ee6"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-4",
+    "sk": "b56cc204f1b6c2323709012cb16c72f3021035ce935fbe69b600a88d842c7407",
+    "pk": "4f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "f4f63b975b725bc090b7d741597be3d03fea7e4cba3f6a95a177fd63bdc2060280",
+    "gamma": "537086b351db10424ee65f6e30c3b35ef8207ec050e48eefc0113fb6df56552880",
+    "beta": "332892f4150b85ef1da2766d0461c8ac391f5f1fc03e888a8222c567a8f19be3b090e852d3cb25a51788c1e502cfe7944def39d6253bab9604a2b6817caef023",
+    "blinding": "535bf70009cdb7d543a87870e614b10eebfbcf88831235bdb73f715bb4b1ca14",
+    "proof_pk_com": "8b882d9e87fcbc3c7af7593cce8c5690401483467bfc8895a5aba7d07f765d5080",
+    "proof_r": "f155e1e7524191eef5edd74659adaab05301e00408abd18331188f9121bd754e80",
+    "proof_ok": "14811d17183dec2e0cd18b0847944502f6b749462bd2d7807284f3f9ec39f46b00",
+    "proof_s": "a146ecf8af43f02b174b768052d48c7106ad7433c7b3437f4e1ab2af730c511c",
+    "proof_sb": "bb9d2b63e1541beeaf74a45fdabf5e21c881cf3336b7df5d763b9cb45d839a17",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd07950361004f29d79a27b9545d7223431eb6a63776949454b16e2ac0b7a959304ce3e52b6a00e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "97a870c4184f6672d78dd536b6f0db56031345e1a42c059f94cd9280ea7e390fad8c3e7b7cb52e6c8962146300f85efb84a82d8be9b7c73f77b235a7147c869bfd7eeba47ac65a8f849f6d891619457e9dedac354f59390b1aec8f2974a8071292e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "8706c5f4c8a67e18dfcdbef13dd19d746c418b98277c3b59aea04e81ea7f5dc8454b09989582ca995d6b287a6c2963279107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd9192c39e55c27b63b7f8dac81dc54f73ac7e2961711eef7c9af17859cae015398a681206f0e11322bb095b460528394b8521d9b731e36aa8631ddb4e91a8df3c44b832359d27cdf9fceacc651d094026fd402984668ac3eaaaeabda585b66173f7bcb25aa205ea0feb9d1b670935c07188f6497f4479cb039498d114dcaf3c734504f8525001a27cd262061105fd33c1ea679d38528d02407845b8af55ff5c5f0a0c761bf9fc25c4df20e70bf83d2b4a0e9fba2c953952845b28ee0f4e5e7672a54e39d45a2957132e0bc915b880673287250a19413f692f58a8a5536362354b2a63e4391bf06916106da2f371961f5219e8e41cf600122b73bed37a60253b44755f49f067a952aa0372e768ea2f4d414ab52a3ee7c3240280b0578c8359e87126a214683823b828a7effa1f5d816862d76d8e994f7905289c50983794f4e76d85ce03e81218f9d0b05b62240445515abe06cec0b089757f0da885ec442adfabd3fe007a939ae374286e738a9ecf076648073161a8445cd9984c993cafa32649fd4632e408cfc1895d3ae94664f8c861ac52583200e4197ae74ae3760197c9500e4c48300afad0870e9849aaffef56cdddb817c7d8cd9ff618fc7e24903d2218882279493c6dbc6df5ac3b235fa304b54f53e18173ae84a88028d1085ab4259c340ce12102e239c230e57b94420f8d6d"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-5",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "4af5381d91e64fd514a4efe23acb3beae6a87d549cf12fc7c51d27e63dadb17380",
+    "beta": "ca0b4e8537f33e28ae8c4ac2b53ce5784e3abe846ad4aeb3fa330a5836e483da3d8903e5f227679e228e6ae2949748b2b7c5cbbec44ea06157f613767ee2c09f",
+    "blinding": "11019f4bc50575d8fa851b6a507b15cdd9e95a8f68e0dfe87114cf7df8a3751b",
+    "proof_pk_com": "fadc0f97d133296bdcdc21ae726ad96b7f7a44dbf93931c93404c231585e3f5580",
+    "proof_r": "ffe1f522365f8a38a0dc8eae0bce89287b6da2fc5b98362db7e4f528b564ab1180",
+    "proof_ok": "df425b123de0be0eceb2f3bb4165d53764cfb1d76089d7983b1caead2b251b3880",
+    "proof_s": "437d26458b589e085833a2d920be3ae168c657e385ff899fc7fd5af74a893b0a",
+    "proof_sb": "eda29f841d6b10bf022e8d3ab8fda97c5896940b5a3eaff42ea75cea411ece19",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "8f842eab67cb128e69482239c6335fefe91d759a0690421657dc155dabdccc21e75eb25c44dcc8def5f8c07c0cce387ea376f7eba816250c3dec261668ad5f4236b4cadbd2f0b439cd1f5e4f95019eb55fced7e1e13cfcbb1235783f33f85e4992e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "85ce565be999865c61c89eab6c443d7a4f5a424e95dc8bc7fa5219d1124ac8387bf4205bc0cac12683287d8289a230dd9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd99f434882e1915f4a05de2341df629b12b434950af00e8993f44f7e626b750662398039ecf28fff1e2af01e38a4a1ef8967cca90a94e123eebb04994ae2640fe05da2230fd900dc2f772f840af9022c5edda744696793ea5b5176d9cef19f04d3a47b715926c6bb06035f8d069fdd0a735439050ccce31a70c0bc3e850b7e43d5734bd0b857afed39e4ffafdb7109a960cce6cbc3c01396a81c5ebf0fc13526dbfcc32aac952a47d06e6311b90307bf91ef2b528568520a56e81fd7240382f03080c9e0f60301077ec41f18e9ec21f44f631362450430de55a79e480f62c5d1dae47d83b793eefb6644d90fcf21a53b559d63f3d7c8eb44739a249fa8904572f520b70c3fe5d93f95f6cfa05de00c36ee6f34918b977a761ab06d55c77750268e603f35fd4edf5f930ef684fe4b6883a544317701b1a9c1004451ec4dc70dc2f8cefd392646ce1a54b21cd5c2ee7e1bd2fe772745e56abeb46f354e15359b4aea1e8f20f89aed95f8a1914fafdb53db5699bc6e67f88d1a0f21b40f3b35022eff95a1be50da75dc19febaf21f3987128961cefca533a54f9ba8472aedfa78dac7a652618521d7608f2b26901c0729d0109b21b0a02dc45a4212841319a2937a3a0b36e8ddfb22118c34781566e0677607644090cf52bcbdd8e3a08e7aba65bce76a5c00feec457a6a95950184308ce6d"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-6",
+    "sk": "da36359bf1bfd1694d3ed359e7340bd02a6a5e54827d94db1384df29f5bdd302",
+    "pk": "e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "4af5381d91e64fd514a4efe23acb3beae6a87d549cf12fc7c51d27e63dadb17380",
+    "beta": "ca0b4e8537f33e28ae8c4ac2b53ce5784e3abe846ad4aeb3fa330a5836e483da3d8903e5f227679e228e6ae2949748b2b7c5cbbec44ea06157f613767ee2c09f",
+    "blinding": "bd91ce4bc2029413d70d3cf1a7df866fb63a922060cc57c34a1f565bababef0d",
+    "proof_pk_com": "98be131aa43e4045a9e64940a93cd1e6dee35434f121667e58aee59d1a68825d80",
+    "proof_r": "183042e8b5cde07497e4922c49d271e6a8a4f92bff67856dc13d7a48bec5ea5b00",
+    "proof_ok": "df425b123de0be0eceb2f3bb4165d53764cfb1d76089d7983b1caead2b251b3880",
+    "proof_s": "f10e9bf7a1d38050f5bcd1bcd3137193532ae0e2620af210bd0e5db8cdd6090f",
+    "proof_sb": "8fd5408fa35ad60f55141bf9fa0bd2ad0c9d9bd18fd8468e1457749d5ef1c311",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd0795036100e58e8ba2e99035fb7ae11fa14e2a609d6d13679278dac63ebee64ca8612ffa1480e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "8f842eab67cb128e69482239c6335fefe91d759a0690421657dc155dabdccc21e75eb25c44dcc8def5f8c07c0cce387ea376f7eba816250c3dec261668ad5f4236b4cadbd2f0b439cd1f5e4f95019eb55fced7e1e13cfcbb1235783f33f85e4992e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "b2ff083e9be8cbb73aa5476ec9fb9c2bea4bd012d92b14bac79755be01c22d09a1819871b64b85c4bf295b774adcf2b09107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd8fe4b6ff4e8e30feaeff3d700b6a375889be79626bfb319abd1de3a73d00ab42c2913e5003a6715a12d509d6b6e43235b0bf81f8c478fee03831211d8eefe1fc29e2082cafa7abcfcad386a2abebf6aec4e8c5e10e1e19146679176aa42bad3b5915ef164af554bd49477e15c5aca28bb441c9b7f7c3c62dca4f6d8cdce975411766f2d6b0cbd198fae4b777ad2f0b390c28bd27949ccc1eaf6542f351847334723bb184b6d46d4bfe1639dee1a3284c1abfde9daaf310dc744ebd39635fdd6eda587f61759f8837d3dd4cc5433c365e18472ceaa24e2a41b38125a8004789723399b3032ef25a19c68be9c8e4f65a86960a93956349d00e46cc84e211bffe2dd09262329a9359319d1a5686bf4f57c9ea1073a83d7157d4c9064fb934d1c745b8be9d091f6ec7be34f437d69ac6fce05945799871edd031bbfe01c95acb4d2686cb78bfb9b015fc79cb0ab38bca136e46e31f1832fbeeabc35f243285ce8b0747c45ee8034a255a28f05b14f5462ec98c6b4c3ac01c381c853396fc95eebe8fe82201242158d7a38defc3a550f04b3db8d060e2f11aca8bf4c262926c4c5ff42e5c4ffe132c9c133473f3b6acc6de5840150526508cc8a1aba0d66b728be0668ffbbdc27052f1b1940a7e3499e4f073be139cf15ac553b930383e114c69f2797cec36ef0dfcf6f0b2c9fb757ef9e5aa"
+  },
+  {
+    "comment": "bandersnatch_sw_sha512_tai_ring - vector-7",
+    "sk": "35b877a25c394512292b82bdf8468e98eaf03c79c7fc9d53546dadc5fb75b500",
+    "pk": "7cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "52ae936f6c5d4f4ddf6dbdf337f9925f2b481be3e6a01af1f62e3996f7a2ce0b80",
+    "gamma": "6896518ab25de4c4985ee693210a9d2cf1cef60cc792f5e0eef408c3db11b02000",
+    "beta": "dd0ba3c69fc9842563a7b84bfca12a5c403b1771bc660e8d0012897f1dac2f8e72e501b861ead231372ea6ab2723f47f9997ac00b215c80e383b5482c579060d",
+    "blinding": "8df74965c9d0b35a62f3e7a6a6e6cb2f21d8979ff9818d44f7881e2e819d680b",
+    "proof_pk_com": "d7a89ae94e61283da37e48f9c0e34b3da7babb109574f91de25d41db68c4da6300",
+    "proof_r": "1a990e0b87243fde6f06c5af0b9f871d0943b3464ed74f435fc033eb5577573580",
+    "proof_ok": "65d53e3baacfce0c81fe8cb644f882713659941feb708158bd86e3374fa6144500",
+    "proof_s": "0fdb1037f25e7de8b1bdb69acc5c725e407d1045b11ae2ca41fe47c42df95209",
+    "proof_sb": "e0a30f38cce6eca6a1bd31b4ab323d18c700eebfc374d0cb997497a5ad03b80f",
+    "ring_pks": "c49043883ab2b5022e6b6050ab32b1b5fac32d8feac60ff5a2a0f300de3b027380df89abf403256d66b848ed97286997396ae4a36b4efb871cee426db00a31a73100361acf81e906a57a1b015afa7d755957597a187ef5b759f07ed49cfd07950361007cba529a807bf602c84625fff28f4d1d836cf40a83f42d95c412f7b62ed9192900e0d311f75e84c5ab6df5752b52be1d445d21f26b82736f1f7eb95a4ee2e3cd1480780fe2fc4cf2ade0c4a8b209ea790a7359bed1903c623d6c5a3e6fa14ef8cd4b00b2c0747a0e2e633055203066476aafee699e60c91500924c13910997f727670980d8bccfa3a9f11d7da69f44f8a50fae932c24172e1cf1cdf331abdf8777932d0400",
+    "ring_pks_com": "afe4574dc960760ef76743063b5058794bce29c132874a38cb656111179f63a5e64386fee78db668806e3c5b62b458b4af50466b03018fc84f1f47dab65e241574004264ef879bbbe459f95f479580452a1c1d4fd772545a99d2d6e9915c466992e630ae2b14e758ab0960e372172203f4c9a41777dadd529971d7ab9d23ab29fe0e9c85ec450505dde7f5ac038274cf",
+    "ring_proof": "9460eb2984e80881222cfdf60501debce963942d1e2ef210f636ee3937037a0bde2e8addf6a99beebfcd0428fc6b473c9107bd20fe94a01157764aab5f300d7e2fcba2178cb80851890a656d89550d0bebf60cca8c23575011d2f37cdc06dcdd90b3d46db4d9979435a57c3275ea4a259131cce20e07954ba9ba7ea34a348a81a2680be0e74207920fef08a6032f0454b211b37b8743a7d565e1f1da8218058d469005808603d0abbc369cd56f6949fcd885ec0be2b42351cb6320a1a510e7849178b1c03c5db02c5eec8c83413a461bc5693eb5dc8e26bafe494cfdff50405745ee7e75a5b418f65f4a31e71796c4550229b6d206bfbb4edabdf2c44a1a7f0fe75294cdad0de4a5b59c2ff82fd2abf6e5118644e0782201451da2b0e8519e3d40761d2b2cdbd50f0c060b278e4daf3135cab042bcaaf27071023500e7a8a90f3b29e20f695f755d1948258ebe5d27b7afa9ff013432082567117a9da5c4d407f99614fac6e99ea273699a4d5d1fc33fde559a75ee0b7c3061fbb87fcab2b6678967145c0b9ac0805261328ab56ea96b3b82b469288e3960b46de42322229569b1202942718e4f03495cb56b752a7f381d4f29b265937a31208bf5f1424ce1e20e7000a1005d6a47507cd65d2265ed1ed6bb73affb8956c7d6a44a08d6cfe9c2c1a767c6bfc9555b8a878d4d09eefd09b9af83c67a8d6a7792cfafafa08fad40e4cee0a3513702e0bd67d67bfd1a5a9cb6825eaba25563e23412953bc925bbc9b63fe5dca002252743873efe0a890682629ad80b51e8e90dd4e9ddb6427bd2366fe55b39165ab61e9a530331d49fe8c1"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/ed25519_sha512_tai_ietf.json b/data/vectors/ed25519_sha512_tai_ietf.json
new file mode 100644
index 0000000..3cd9a7e
--- /dev/null
+++ b/data/vectors/ed25519_sha512_tai_ietf.json
@@ -0,0 +1,93 @@
+[
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-1",
+    "sk": "fc4722b3efeadcfa8b437f6e34f71c50a240bd2e66b958c5c17519cc9d936906",
+    "pk": "bf512469e7f9b766bf5c75e47e84fda3ec887bd24d79b9165c19e01a88fe5ff2",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "cd2988ed28d9873b80e90ccae0f5767af0ff8cb3b8d22f257f217e3736165ac2",
+    "gamma": "efdbb69c46c055a5a4ab2a0b5961c6c797095844044f1ed71a463c495d4e581a",
+    "beta": "bf4523b08aa50cc3b98f2fea4251d4ce909ac52746105f1377bc6905909966e0dc65aab98243a2b150bd889d267d6edcf6fc0b0268aa9e0bfb3e1ba8a972330c",
+    "proof_c": "7005e08500c28ff5c9cf8881c3667a3c",
+    "proof_s": "f6e5185341262ea10d5d8b2bd8325099e690941c82f8be67d981c3da4ac27a01"
+  },
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-2",
+    "sk": "3ed3f4d0fadb42cb77d42a7ea57def2bad464bd1ae0c896dd077c04358415c04",
+    "pk": "a9a4b61b52db164253147e0c5bd20852d7ab4763e996d0117febccbc7a1abbd6",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "97c2415dc230172a09e08966971dde6dfe4a5a5f43a1384bdafaadae3ab867cb",
+    "gamma": "458a601806dca1bfc14767378544a60d3d45a10c461ba266008ff735ff3637cb",
+    "beta": "6321a49e106c673daeab8ca566696fb458bd0303aa6acd9e5435d08a70b7b6dc1a26db26cd65d357aca67741dad61ec04cf742df80d3bb0141f093aff3682091",
+    "proof_c": "6c5d557034da6f3550f4ed348b7b9281",
+    "proof_s": "6861d92d783add90383ee376a32550facc645fcf5af8b6c1986f86eaa3d7d806"
+  },
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-3",
+    "sk": "a665fa5af45ab71a60a6b667bc995423d5ee43197a5fd93b16f761cf0bdf0407",
+    "pk": "0b33325148327641856fde36d56aaf2cb1e4959824bb0916517160d402973bc5",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "cd2988ed28d9873b80e90ccae0f5767af0ff8cb3b8d22f257f217e3736165ac2",
+    "gamma": "7e56c17639f1b58b3d19326ce82a5b0f8da4ebd29241913251d238dab5e5b416",
+    "beta": "478b9e54561d15f82e1ba6cee6c015039b65f377b8f5350de7bb1fef65392aadc06c439e8fa0b0139094f1c67235f7946fb65c109483ff266860a4f4b02ea1f8",
+    "proof_c": "2735f77d8c7162cef499314b69baec44",
+    "proof_s": "af2ffa762dd13e7519d4a0b06145099a83a2ad163457eda34c189b3e4aa40805"
+  },
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-4",
+    "sk": "9a150e5caf622cc949d95af8980d458b551ab394d52ba49759433b4d04d9f703",
+    "pk": "cf2d35428c1e329dfbd5ce3a6aafd8cffe31c6a0685471f59f5cddec0725483a",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "12e502cc03e6f887e4ea8eb284bed41d8d5a2e9460db785a92e06431d6e1b533",
+    "gamma": "c6bf46adff3376d9c74d764af3daf4a0edaed8c0fcaa848e46f2c41d94b0e938",
+    "beta": "243445998cf25977db99fc5a5c22a79f143bf1a0ecb89b59632a2161cfbf90cd183191bcc943e34b32dc81e96e7b66f2ef9f60dac1877bdd3cc416231e9f617e",
+    "proof_c": "873339ea94ef5065bc4cc487ee59a190",
+    "proof_s": "9c90820cc75ce12d26ea07eb8b9d9207cc72976056f96c2bf6cac3756818060e"
+  },
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-5",
+    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
+    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "865bf48f6abf5b36c287f4d1ea6f9f13019892e6f1ea13e4ea85af4c850dc628",
+    "gamma": "1b6dbb2e1ea7f31f0674df9a9086d1eeda4cdfc32a0c8855836866dc30b80f04",
+    "beta": "2e7b21d022916e75e16e17dd806199849f6ebe5d257398593bd477d491750d4d17fff734395c28c6c98e1f623c21b780e7eac32723f895f3feab0ba07b6d7923",
+    "proof_c": "bd961d3d952a794e43df0e605a8060b9",
+    "proof_s": "34c96762240d57b5e81e1f3be085c3076de91b12f4489a5fb22c3a56cda20006"
+  },
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-6",
+    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
+    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "865bf48f6abf5b36c287f4d1ea6f9f13019892e6f1ea13e4ea85af4c850dc628",
+    "gamma": "1b6dbb2e1ea7f31f0674df9a9086d1eeda4cdfc32a0c8855836866dc30b80f04",
+    "beta": "2e7b21d022916e75e16e17dd806199849f6ebe5d257398593bd477d491750d4d17fff734395c28c6c98e1f623c21b780e7eac32723f895f3feab0ba07b6d7923",
+    "proof_c": "f6f65a2f0b8733dfa7f21acc70fbf27a",
+    "proof_s": "da87b9116b84d5678fceeefb252337fd8a8dbd23edfc3d5e9971842463cd9302"
+  },
+  {
+    "comment": "ed25519_sha512_tai_ietf - vector-7",
+    "sk": "0f6ed8b686b6ef0b2552344803cb0f92a84a654fd46f0e98782c6de71f98d40c",
+    "pk": "ea18949e73be86cf0c7de5e688c782689b72c49741baed797ee1a128d7cf1bd7",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "865bf48f6abf5b36c287f4d1ea6f9f13019892e6f1ea13e4ea85af4c850dc628",
+    "gamma": "d7e4fb52f1edce33ba45ee2c1f526891c23a961017e55cc77434a70d6958bfbd",
+    "beta": "6441894c8ed2517a0a5765163994c761672d4d69f735bedec1f4ed2a62922564fc5522a3571b5d2b1611a35cfdb153d3eb78336d0533a31d55dcc1e5a63949be",
+    "proof_c": "bb49291cf5ac7bcd6686736a7f0c7df3",
+    "proof_s": "b020a87fa08b4333b16a1abf81d752a10c5191b4f239ac8a90aa65a4526b4c04"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/ed25519_sha512_tai_pedersen.json b/data/vectors/ed25519_sha512_tai_pedersen.json
new file mode 100644
index 0000000..d0d6b2b
--- /dev/null
+++ b/data/vectors/ed25519_sha512_tai_pedersen.json
@@ -0,0 +1,121 @@
+[
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-1",
+    "sk": "fc4722b3efeadcfa8b437f6e34f71c50a240bd2e66b958c5c17519cc9d936906",
+    "pk": "bf512469e7f9b766bf5c75e47e84fda3ec887bd24d79b9165c19e01a88fe5ff2",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "cd2988ed28d9873b80e90ccae0f5767af0ff8cb3b8d22f257f217e3736165ac2",
+    "gamma": "efdbb69c46c055a5a4ab2a0b5961c6c797095844044f1ed71a463c495d4e581a",
+    "beta": "bf4523b08aa50cc3b98f2fea4251d4ce909ac52746105f1377bc6905909966e0dc65aab98243a2b150bd889d267d6edcf6fc0b0268aa9e0bfb3e1ba8a972330c",
+    "blinding": "491b2129f9bc2a1ac10f3c817e69fa5e6f476b79f0deb3981008e9f79486ea08",
+    "proof_pk_com": "dff7e7a631e9ba85b96e3572b29f7d01685285a7e87b664c28bbfb920c21f4a8",
+    "proof_r": "e977e74abe28a4c99b0e0b0155a89a1eb71cb2e2673fe78c6b951f8a652a56c6",
+    "proof_ok": "33843c5f4d2e1dd5e5dfdbb8b9d9ff26452fe7523507320ce3158158bf1966d5",
+    "proof_s": "9f7e1e08f1987beb021d0ae2c556eb7d7371ae87614d16d3df3fab1b14adae03",
+    "proof_sb": "664f8fe78b0690bb286fa207ff4489cb65c95067d18cd1226695671ecfdb570c"
+  },
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-2",
+    "sk": "3ed3f4d0fadb42cb77d42a7ea57def2bad464bd1ae0c896dd077c04358415c04",
+    "pk": "a9a4b61b52db164253147e0c5bd20852d7ab4763e996d0117febccbc7a1abbd6",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "97c2415dc230172a09e08966971dde6dfe4a5a5f43a1384bdafaadae3ab867cb",
+    "gamma": "458a601806dca1bfc14767378544a60d3d45a10c461ba266008ff735ff3637cb",
+    "beta": "6321a49e106c673daeab8ca566696fb458bd0303aa6acd9e5435d08a70b7b6dc1a26db26cd65d357aca67741dad61ec04cf742df80d3bb0141f093aff3682091",
+    "blinding": "719d0ed9f57dbacfb3fd5eea07432f00e1d60ff7000720d5f0ea494d0109350a",
+    "proof_pk_com": "b850ab5eff40ac05b6361b283b2eca7b36396356238dd6eaf324db4edc03a9bb",
+    "proof_r": "3a5070153b0d100c6a7e5d6c5d78b701c41b63dea93d818e24372fbf91c08c98",
+    "proof_ok": "211fe27e1f2e951fb2f6293cf7b488571e545af9758b9a207e92d1669c6c813b",
+    "proof_s": "d85eefd3c5362f1b2438e3620b4cfc8eebf508b9878e1d489773ed52b85fd208",
+    "proof_sb": "99dea8a87b03c39f1f3d7e014bb20f2922602bbaa727306b5637ae35113e000a"
+  },
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-3",
+    "sk": "a665fa5af45ab71a60a6b667bc995423d5ee43197a5fd93b16f761cf0bdf0407",
+    "pk": "0b33325148327641856fde36d56aaf2cb1e4959824bb0916517160d402973bc5",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "cd2988ed28d9873b80e90ccae0f5767af0ff8cb3b8d22f257f217e3736165ac2",
+    "gamma": "7e56c17639f1b58b3d19326ce82a5b0f8da4ebd29241913251d238dab5e5b416",
+    "beta": "478b9e54561d15f82e1ba6cee6c015039b65f377b8f5350de7bb1fef65392aadc06c439e8fa0b0139094f1c67235f7946fb65c109483ff266860a4f4b02ea1f8",
+    "blinding": "d7df2e4ca69d04bb804d76c03b08d58b1864e29ebc4518649933325380fa760c",
+    "proof_pk_com": "ff3b86a57386d82151df7552fe22157c93ef1a57fe769136ca47f71bf6aff968",
+    "proof_r": "aab46799f3df345cd7f7691fd9bc0d388ca38b008d2fca15e8a736cb0f4b37a5",
+    "proof_ok": "a925817d8f5adc4febfa5fe50beab0945fa98b5bd21bb4c38b95394f96a44fe4",
+    "proof_s": "93a217670ab86612448e50489ca62ea64f02b6dfe6008a34977a2e36f50c2800",
+    "proof_sb": "eb67fc2427b74292104e5b879e3f8bdcd8a496c4a3780b469c05d71ea0d0c10f"
+  },
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-4",
+    "sk": "9a150e5caf622cc949d95af8980d458b551ab394d52ba49759433b4d04d9f703",
+    "pk": "cf2d35428c1e329dfbd5ce3a6aafd8cffe31c6a0685471f59f5cddec0725483a",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "12e502cc03e6f887e4ea8eb284bed41d8d5a2e9460db785a92e06431d6e1b533",
+    "gamma": "c6bf46adff3376d9c74d764af3daf4a0edaed8c0fcaa848e46f2c41d94b0e938",
+    "beta": "243445998cf25977db99fc5a5c22a79f143bf1a0ecb89b59632a2161cfbf90cd183191bcc943e34b32dc81e96e7b66f2ef9f60dac1877bdd3cc416231e9f617e",
+    "blinding": "bc45e7904e6002177e7b7a3b5b5288cf135a472c02b8fd7cad120400858bdb02",
+    "proof_pk_com": "1d52ec0f280c085b83f568e3d2b1e753c5c27e4374f793f35eadf3f202439b1c",
+    "proof_r": "d71095d6a1d950ebc012d2de57d5267a24f732fe08fb505b62630a54969c49f6",
+    "proof_ok": "aa23de5cbfb36559c064a97839ef76dd7065e6f8f78bbd71be93e8678c7cd066",
+    "proof_s": "e12507170298adefd1a4c673a820218a40d009c408e2a24f4671b25d934c5f07",
+    "proof_sb": "bb8386be8878dde1dddb24067aee275ce47537d14c7ac7c42c1f69811ce9810f"
+  },
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-5",
+    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
+    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "865bf48f6abf5b36c287f4d1ea6f9f13019892e6f1ea13e4ea85af4c850dc628",
+    "gamma": "1b6dbb2e1ea7f31f0674df9a9086d1eeda4cdfc32a0c8855836866dc30b80f04",
+    "beta": "2e7b21d022916e75e16e17dd806199849f6ebe5d257398593bd477d491750d4d17fff734395c28c6c98e1f623c21b780e7eac32723f895f3feab0ba07b6d7923",
+    "blinding": "d0e5bd829b5b463263bd741f1aded24663383621ae64b86cea035ee5d30e390b",
+    "proof_pk_com": "e267ffae00d85dd876e54a6320b21791fa56c3b383871cc324e202787d220942",
+    "proof_r": "f0450bceba5406902bc1955a058ec699e80b18ed5ec7856e20167ff092bf6d38",
+    "proof_ok": "114483fd610de396594280a3ff6d870370ed552618da7267f52afe3f7a6a42a4",
+    "proof_s": "b9cf4c2a72c67870c7efe9b64bcc498138b7c01d72da7a34a75f58db9daeea05",
+    "proof_sb": "3f93d063b8beb51148776d243727aca320b59fcf6d424b0976cabc741f39700e"
+  },
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-6",
+    "sk": "03cb98147455ef9db48d9f1ca758d8047f43ed4320909800d849522444b52502",
+    "pk": "465a022ab19f37d3586489ae08808b23d39844fd321735d6573c089b12202d1a",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "865bf48f6abf5b36c287f4d1ea6f9f13019892e6f1ea13e4ea85af4c850dc628",
+    "gamma": "1b6dbb2e1ea7f31f0674df9a9086d1eeda4cdfc32a0c8855836866dc30b80f04",
+    "beta": "2e7b21d022916e75e16e17dd806199849f6ebe5d257398593bd477d491750d4d17fff734395c28c6c98e1f623c21b780e7eac32723f895f3feab0ba07b6d7923",
+    "blinding": "6df36c2d2e9ecfb0bb0cac264fe82fa4c2734e8e98e476bcca9a3ed25f693103",
+    "proof_pk_com": "0edbdfb9473ae4c5ad8361517ff61dff3a445ed0bbd144a1763d4c7a6b15a361",
+    "proof_r": "629cb97c1d40b966a3997a03125cff0ddc313060bfe05c4163f6eccae477c6c1",
+    "proof_ok": "114483fd610de396594280a3ff6d870370ed552618da7267f52afe3f7a6a42a4",
+    "proof_s": "bf5da20e59512889e600c9778c9f3f7f2fbbc19b8cbb42097d3f917f919f7b0a",
+    "proof_sb": "b547f9b6803ac9c1cfd069ee0feaa22143a025b98095669b6e6fd598b62a7806"
+  },
+  {
+    "comment": "ed25519_sha512_tai_pedersen - vector-7",
+    "sk": "0f6ed8b686b6ef0b2552344803cb0f92a84a654fd46f0e98782c6de71f98d40c",
+    "pk": "ea18949e73be86cf0c7de5e688c782689b72c49741baed797ee1a128d7cf1bd7",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "865bf48f6abf5b36c287f4d1ea6f9f13019892e6f1ea13e4ea85af4c850dc628",
+    "gamma": "d7e4fb52f1edce33ba45ee2c1f526891c23a961017e55cc77434a70d6958bfbd",
+    "beta": "6441894c8ed2517a0a5765163994c761672d4d69f735bedec1f4ed2a62922564fc5522a3571b5d2b1611a35cfdb153d3eb78336d0533a31d55dcc1e5a63949be",
+    "blinding": "3434f642c32d6195c07e81ac2b6a27ad4248265519413d051497edb8c29ac304",
+    "proof_pk_com": "5fa05be63facb8264f19236cf098e5606fa6a3f08488417bb5d2b8173ad4f565",
+    "proof_r": "8b8b37f42f65707d1c991730a2ce7f4fedd4e6451413bc63506127e77ec1397a",
+    "proof_ok": "d7e96d7bf54d0767611fab3e06e45c8aadd76042dc72951ef27acad5dbddb31c",
+    "proof_s": "794bd0230dd9398975bc4270ff4b398f8bc3cb7bc6cc222176ed12bdd6a55809",
+    "proof_sb": "7e3179bebef375d37c63befc88533010a67a4821e2c1aafada0ab35e7b74860e"
+  }
+]
\ No newline at end of file
diff --git a/data/vectors/secp256_sha256_tai_ietf.json b/data/vectors/secp256_sha256_tai_ietf.json
new file mode 100644
index 0000000..88b329a
--- /dev/null
+++ b/data/vectors/secp256_sha256_tai_ietf.json
@@ -0,0 +1,93 @@
+[
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-1",
+    "sk": "9a4585773ce2ccd7a585c331d60a60d1e3b7d28cbb2ede3bc55445342f12f54b",
+    "pk": "0218e11f9ef92fa3929aa8f078d2e73b58f0ac7d6f274e222b8515c7b0140138be",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "02efe91dd6237dda2cd6f1b9cc31f1a69161366b9e5fe14d697d4a3a6841a92634",
+    "gamma": "034edfe3670c4121b5c49b7baf4f849a2de30850af2901fa4b0c33d3ed127d4fdc",
+    "beta": "32fba2fe215602128cf8fa898ff2da6d117111ecae65d2d30716ffe98cd49dfe",
+    "proof_c": "5f27b05aad38af700f881819816111ee",
+    "proof_s": "18da92d89d92aae8f418ed54eaa7495f5e04cc8835bcfff2210ae6c1b9bf753e"
+  },
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-2",
+    "sk": "86d9576498ea764b49243efeb05df625010438c6a55d5b578de4ff00c9b4c1db",
+    "pk": "03a47366bc18483e02261117304cdf77cc95f234c16d11a8356dc4514a7adaf120",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "02f5e3aaae0155c8211f9d0a08ebc2e7ea915813083ee44c797ea22dab60515f47",
+    "gamma": "03e69a44ea08d63f03277a9aa53999481a8ff473211210a7099c2b713ee16863f1",
+    "beta": "ce206ce1edc7dc23bc8db515aeb6a8fbbfd3045536ea7d7b1254ac0f9bbc5685",
+    "proof_c": "ede1e24bbab7a3b05d3ca65e2da161a3",
+    "proof_s": "3060920a0e67c660f459e0bab6f3f71e865aae07296eb114434072f95210bdc4"
+  },
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-3",
+    "sk": "c529ffad9a5ab61162b11d616b639e00586ba846746a197d4daf78b908ed4f08",
+    "pk": "02d984ff7d61ba3a11d8ade6cea6ba949fba3bbcf841506cf8c3a7b6e1bd67b926",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "02efe91dd6237dda2cd6f1b9cc31f1a69161366b9e5fe14d697d4a3a6841a92634",
+    "gamma": "03cc4c70e3e4a787e14b841a819ade3de908211d9a42de5817f080d023b6408805",
+    "beta": "58016dcca4640763bf1914ceaeb5bf8394efe6c0e00b654b9b10491e7d65abc8",
+    "proof_c": "4a88aca885ddf35b93255bdc59911c8f",
+    "proof_s": "3f9e45b6a85f0e77fd57697c1eb92d00088d84226bc717945e2fb9e45f86da84"
+  },
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-4",
+    "sk": "719ec881a39ca062f09262ff75fc8a06d6cb91ad078c4d344723508c509c2de5",
+    "pk": "02c8f77b17ec60330366b9e148dfa565a7c8d6a0768e5737786722e3c85a5ff054",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "0245156290599051538dda121499cc4db77ef1c967cd1684a2090393442e7748b3",
+    "gamma": "038960a1861a4bcaa84f10c168ce34ed9f6ca08a31fdfe2e10c164b185eafb1e9d",
+    "beta": "10afc31299c3b70c45fd39459517e9ddcd597a9af1907807c72ee2f054107283",
+    "proof_c": "337a0e2d9813aa677cadc1babff29dd5",
+    "proof_s": "77cdda834d27790d337f1fc6ff81d794fb399ed3bd98ab5b28f10d9a8383d568"
+  },
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-5",
+    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
+    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "02fee01f6fc82a668e037ae128a1075ac507888676eb50c5f1da3e6b6b91cba6c9",
+    "gamma": "027e94a9c67159fc1fe9bdc7e0e85ea2eeced075486e12705db94580901d997de8",
+    "beta": "95c290716823f0d5f49c7b3ae4efe29d4c0acdba1373c8b8193fc66f39920555",
+    "proof_c": "780f0e7f60e35fbf23bcf7622a7c87f3",
+    "proof_s": "fe9838493a71efff78d4f1d406fccb3e874eeb39b4e901b773ddfcab85050f94"
+  },
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-6",
+    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
+    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "02fee01f6fc82a668e037ae128a1075ac507888676eb50c5f1da3e6b6b91cba6c9",
+    "gamma": "027e94a9c67159fc1fe9bdc7e0e85ea2eeced075486e12705db94580901d997de8",
+    "beta": "95c290716823f0d5f49c7b3ae4efe29d4c0acdba1373c8b8193fc66f39920555",
+    "proof_c": "1b49441781d0230908eebbd6672d8da6",
+    "proof_s": "098191c8fe8b2c814fc83e9570b1811916492312e7488b5d1cdac6d5f5c8b781"
+  },
+  {
+    "comment": "secp256_sha256_tai_ietf - vector-7",
+    "sk": "f6ecc50886479df8bea823e5b8b939c934efa139c08b96b9a07dd2fa986e5867",
+    "pk": "0224d2dd7a97395b03103acb7ec1ae80743f453ff0711e6ad81bd9d59b7217809a",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "02fee01f6fc82a668e037ae128a1075ac507888676eb50c5f1da3e6b6b91cba6c9",
+    "gamma": "038e34a8ece8200f2f10ffca34aaa0fef748a9fbe9e24c149b5f8328a66f80c4b0",
+    "beta": "de55cf8d4a266aa0ca69f00a223d52bdbcb96cb3b8d0d2830159c81494f72f4c",
+    "proof_c": "77bfd3c3c15720c9d2b55f79cb560481",
+    "proof_s": "f534dcbb6395a343bb3e49247619f693c2acfec0421ab5e0b155b57d2f9d8a2e"
+  }
+]
\ No newline at end of file
diff --git a/data/secp256_sha256_tai_ietf_vectors_rfc_9381.json b/data/vectors/secp256_sha256_tai_ietf_rfc_9381.json
similarity index 89%
rename from data/secp256_sha256_tai_ietf_vectors_rfc_9381.json
rename to data/vectors/secp256_sha256_tai_ietf_rfc_9381.json
index 6279098..7ac45c5 100644
--- a/data/secp256_sha256_tai_ietf_vectors_rfc_9381.json
+++ b/data/vectors/secp256_sha256_tai_ietf_rfc_9381.json
@@ -5,6 +5,7 @@
     "sk": "c9afa9d845ba75166b5c215767b1d6934e50c3db36e89b127b8a622b120f6721",
     "pk": "0360fed4ba255a9d31c961eb74c6356d68c049b8923b61fa6ce669622e60f29fb6",
     "alpha": "73616D706C65",
+    "salt": "0360fed4ba255a9d31c961eb74c6356d68c049b8923b61fa6ce669622e60f29fb6",
     "ad": "",
     "h": "0272a877532e9ac193aff4401234266f59900a4a9e3fc3cfc6a4b7e467a15d06d4",
     "gamma": "035b5c726e8c0e2c488a107c600578ee75cb702343c153cb1eb8dec77f4b5071b4",
@@ -18,6 +19,7 @@
     "sk": "c9afa9d845ba75166b5c215767b1d6934e50c3db36e89b127b8a622b120f6721",
     "pk": "0360fed4ba255a9d31c961eb74c6356d68c049b8923b61fa6ce669622e60f29fb6",
     "alpha": "74657374",
+    "salt": "0360fed4ba255a9d31c961eb74c6356d68c049b8923b61fa6ce669622e60f29fb6",
     "ad": "",
     "h": "02173119b4fff5e6f8afed4868a29fe8920f1b54c2cf89cc7b301d0d473de6b974",
     "gamma": "034dac60aba508ba0c01aa9be80377ebd7562c4a52d74722e0abae7dc3080ddb56",
@@ -31,6 +33,7 @@
     "sk": "2ca1411a41b17b24cc8c3b089cfd033f1920202a6c0de8abb97df1498d50d2c8",
     "pk": "03596375e6ce57e0f20294fc46bdfcfd19a39f8161b58695b3ec5b3d16427c274d",
     "alpha": "4578616D706C65207573696E67204543445341206B65792066726F6D20417070656E646978204C2E342E32206F6620414E53492E58392D36322D32303035",
+    "salt": "03596375e6ce57e0f20294fc46bdfcfd19a39f8161b58695b3ec5b3d16427c274d",
     "ad": "",
     "h": "0258055c26c4b01d01c00fb57567955f7d39cd6f6e85fd37c58f696cc6b7aa761d",
     "gamma": "03d03398bf53aa23831d7d1b2937e005fb0062cbefa06796579f2a1fc7e7b8c667",
diff --git a/data/vectors/secp256r1_sha256_tai_pedersen.json b/data/vectors/secp256r1_sha256_tai_pedersen.json
new file mode 100644
index 0000000..7bf9f49
--- /dev/null
+++ b/data/vectors/secp256r1_sha256_tai_pedersen.json
@@ -0,0 +1,121 @@
+[
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-1",
+    "sk": "9a4585773ce2ccd7a585c331d60a60d1e3b7d28cbb2ede3bc55445342f12f54b",
+    "pk": "0218e11f9ef92fa3929aa8f078d2e73b58f0ac7d6f274e222b8515c7b0140138be",
+    "alpha": "",
+    "salt": "",
+    "ad": "",
+    "h": "02efe91dd6237dda2cd6f1b9cc31f1a69161366b9e5fe14d697d4a3a6841a92634",
+    "gamma": "034edfe3670c4121b5c49b7baf4f849a2de30850af2901fa4b0c33d3ed127d4fdc",
+    "beta": "32fba2fe215602128cf8fa898ff2da6d117111ecae65d2d30716ffe98cd49dfe",
+    "blinding": "49c359ddec3eb3b3ba1c3ddc6407711b1d7f0e593dbfe1b7c0b71a59202b8d2a",
+    "proof_pk_com": "02e647fc850f16d2d89e26b204334a8e4a45cb97972e2cbdd3fbb18841791913ef",
+    "proof_r": "021af389daa6bc26ac1aa508afffae7e8627fb33372c7cc8e331801dfd41c5786e",
+    "proof_ok": "024062eafb0510001c4f06cd331c75a2c657821dd7551e24ddf2c4d40cc52364b5",
+    "proof_s": "d6b2b009a05a197aba97126195d6f8e8644b7a897cbffc7c2b5ef5b21a4453b5",
+    "proof_sb": "23c6eff5cf3689b0b8b7147e5a13de16dbd7f1acaff04032a35e44c52ea023dc"
+  },
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-2",
+    "sk": "86d9576498ea764b49243efeb05df625010438c6a55d5b578de4ff00c9b4c1db",
+    "pk": "03a47366bc18483e02261117304cdf77cc95f234c16d11a8356dc4514a7adaf120",
+    "alpha": "0a",
+    "salt": "",
+    "ad": "",
+    "h": "02f5e3aaae0155c8211f9d0a08ebc2e7ea915813083ee44c797ea22dab60515f47",
+    "gamma": "03e69a44ea08d63f03277a9aa53999481a8ff473211210a7099c2b713ee16863f1",
+    "beta": "ce206ce1edc7dc23bc8db515aeb6a8fbbfd3045536ea7d7b1254ac0f9bbc5685",
+    "blinding": "41aee80966787a715d9b0c793a8f1b595dd153273fdf8f88a32aa2fa85ebbc9f",
+    "proof_pk_com": "033bff5f592a0c96307ec01076da5d0be25f727857ef98f0c6c677a1e90cd64c1b",
+    "proof_r": "0304dc94b2d926da6617cff11940455072fa15717e3c20d082228e35e474f76330",
+    "proof_ok": "030ecafabe459b7ba212efa9af54cf0d4b81a68a1b8d1e3581ed13ebdf221da766",
+    "proof_s": "6b03d4fd5ddf3ef84e93aba0dd8054fb477b00fbf58a71c6ee2952679d42d5a5",
+    "proof_sb": "2f1c27c991510bb11ebaddb3a65ec3294ea32af26fce184fa5561cbb1e9b5f48"
+  },
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-3",
+    "sk": "c529ffad9a5ab61162b11d616b639e00586ba846746a197d4daf78b908ed4f08",
+    "pk": "02d984ff7d61ba3a11d8ade6cea6ba949fba3bbcf841506cf8c3a7b6e1bd67b926",
+    "alpha": "",
+    "salt": "",
+    "ad": "0b8c",
+    "h": "02efe91dd6237dda2cd6f1b9cc31f1a69161366b9e5fe14d697d4a3a6841a92634",
+    "gamma": "03cc4c70e3e4a787e14b841a819ade3de908211d9a42de5817f080d023b6408805",
+    "beta": "58016dcca4640763bf1914ceaeb5bf8394efe6c0e00b654b9b10491e7d65abc8",
+    "blinding": "1270ded4474f2a6a55e5989a00fa9abd7509a886278ce3d04ceabaff691ed7e7",
+    "proof_pk_com": "0216a2f96f9f60dcc13b7a35b7071febdfdbf584cbcf82c2ccc8dc5f67db27fecd",
+    "proof_r": "030524e1bd8870dd7bdaef80a26387014ef0d15365ac119e20cbb7f76d25a81933",
+    "proof_ok": "03d969d5150672b88c99c86e81aa0ee22a59cd1059e1bbeb7db43b529f5b2afd96",
+    "proof_s": "96edced47e6c95f19ca8f54ba3e7841f4e730971ce70cab600d5ba86305cb9a4",
+    "proof_sb": "1610b08673f5a1bcaeb74c81481b36edb8af018fb450437bf2dc11a0492c4f0f"
+  },
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-4",
+    "sk": "719ec881a39ca062f09262ff75fc8a06d6cb91ad078c4d344723508c509c2de5",
+    "pk": "02c8f77b17ec60330366b9e148dfa565a7c8d6a0768e5737786722e3c85a5ff054",
+    "alpha": "73616d706c65",
+    "salt": "",
+    "ad": "",
+    "h": "0245156290599051538dda121499cc4db77ef1c967cd1684a2090393442e7748b3",
+    "gamma": "038960a1861a4bcaa84f10c168ce34ed9f6ca08a31fdfe2e10c164b185eafb1e9d",
+    "beta": "10afc31299c3b70c45fd39459517e9ddcd597a9af1907807c72ee2f054107283",
+    "blinding": "4df12778c4356ffc13d457a16852f82341dbc81f03716bd5b667902c299d02ce",
+    "proof_pk_com": "0364a9677d8757e3ba80b0aab76d8e1585077e9167de692861fd8f4848e33b1dd7",
+    "proof_r": "038267115a85bf1dfebaca476d06b7f8e575b97b9514231d9fb04b3d2609755681",
+    "proof_ok": "03ba4a59bfd54fdbc2b422bed7ba0e6eef059dee8044b717f35b5de871a08e3fff",
+    "proof_s": "bcf6c0f2fb3cef8222d9a613dbd0c8fb9c9e67c919bf0bc39503b8e37932cc2a",
+    "proof_sb": "1c02800a1f2b370e2938d9e240e9a4a786246db117d442a52ff03e81bcdd1c14"
+  },
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-5",
+    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
+    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "",
+    "h": "02fee01f6fc82a668e037ae128a1075ac507888676eb50c5f1da3e6b6b91cba6c9",
+    "gamma": "027e94a9c67159fc1fe9bdc7e0e85ea2eeced075486e12705db94580901d997de8",
+    "beta": "95c290716823f0d5f49c7b3ae4efe29d4c0acdba1373c8b8193fc66f39920555",
+    "blinding": "03ccde8db52a23a05622cb3de3b28fe163bea752f995ac76f27b1b4dd12c85c3",
+    "proof_pk_com": "02409eb2925580326d4aadcbc79d2d2130be87ad1a5b0ce1cb7677ada2ecebcb8b",
+    "proof_r": "02cd3275ed5aa8801b9f47aee61f7b39ed8eb59ffcf294d784851c8da9ec32a114",
+    "proof_ok": "029ecdc5545f5638369f56e6438ca256e402ad5b1c3aecbeddd8687ed40e8b8222",
+    "proof_s": "a213d961a3debb0a52db283d293e0a9e7900b1e2b9bfe41d3aa3e5690cc75828",
+    "proof_sb": "5c0df912869933c5b9be4e32c326f8b048bd3333f8e4f8cf8ff0d2a73d47e3b3"
+  },
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-6",
+    "sk": "db43b75a9c05eb89ae926b7b1d5081e79def64a210f5b6bd0d0be3e99a9a7be7",
+    "pk": "03c443ab7bbb42585044551b7efac1d9c3c8f007bdf0c325d35fde5417bbb8e11d",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "02fee01f6fc82a668e037ae128a1075ac507888676eb50c5f1da3e6b6b91cba6c9",
+    "gamma": "027e94a9c67159fc1fe9bdc7e0e85ea2eeced075486e12705db94580901d997de8",
+    "beta": "95c290716823f0d5f49c7b3ae4efe29d4c0acdba1373c8b8193fc66f39920555",
+    "blinding": "3a8ddc7ff9fb95a4f749095bffd35f87296edf52138c62574f8978b0acd8ec5e",
+    "proof_pk_com": "03a36f363898efd915dff5652938eee66001d9aab4de94d24d55525664b3caf202",
+    "proof_r": "03f76877b6474c286c5d84fd38084f1814f402ab475fcaac8ade28211447f93549",
+    "proof_ok": "029ecdc5545f5638369f56e6438ca256e402ad5b1c3aecbeddd8687ed40e8b8222",
+    "proof_s": "f6871971219cce8591f6f0bda549ebb8d592b222d42b922ab55df329f0364a75",
+    "proof_sb": "bc122a64fbaebe574bf370ae8debb155ef97bc7999af84af1c8014b209c22552"
+  },
+  {
+    "comment": "secp256r1_sha256_tai_pedersen - vector-7",
+    "sk": "f6ecc50886479df8bea823e5b8b939c934efa139c08b96b9a07dd2fa986e5867",
+    "pk": "0224d2dd7a97395b03103acb7ec1ae80743f453ff0711e6ad81bd9d59b7217809a",
+    "alpha": "42616e646572736e6174636820766563746f72",
+    "salt": "",
+    "ad": "1f42",
+    "h": "02fee01f6fc82a668e037ae128a1075ac507888676eb50c5f1da3e6b6b91cba6c9",
+    "gamma": "038e34a8ece8200f2f10ffca34aaa0fef748a9fbe9e24c149b5f8328a66f80c4b0",
+    "beta": "de55cf8d4a266aa0ca69f00a223d52bdbcb96cb3b8d0d2830159c81494f72f4c",
+    "blinding": "92c4396187b806a6670fb020b68d0706fa649fd2f9713058b332c3b394e38cd5",
+    "proof_pk_com": "02f3b2a5c9e238b0b62093a988624c9200b81601d50386c9fa90154271a86ba9dc",
+    "proof_r": "02df65b42b8a6c7783f4a4a50aee592689efc6527994ad5140483fea886435bf41",
+    "proof_ok": "0387862be1ef0ed5d72090c1bfcc80b822980ae04973281a8aee011908e818e138",
+    "proof_s": "94e0b4960646581db8f3ad051def579e1a3bc5ca98cfd621b5d0c60c1f7bd7f9",
+    "proof_sb": "bf174fd5911b0b3dabfa3a6409fd53edda33128b1b3e32d06b9a6d79ee76179f"
+  }
+]
\ No newline at end of file
diff --git a/src/ietf.rs b/src/ietf.rs
index 04771a2..bf3419f 100644
--- a/src/ietf.rs
+++ b/src/ietf.rs
@@ -178,7 +178,7 @@ pub mod testing {
     }
 
     impl<S: IetfSuite + std::fmt::Debug> common::TestVectorTrait for TestVector<S> {
-        fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: Option<&[u8]>, ad: &[u8]) -> Self {
+        fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: &[u8], ad: &[u8]) -> Self {
             use super::Prover;
             let base = common::TestVector::new(comment, seed, alpha, salt, ad);
             // TODO: store constructed types in the vectors
diff --git a/src/lib.rs b/src/lib.rs
index da70439..02116db 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -135,6 +135,9 @@ pub trait Suite: Copy {
     /// Hash data to a curve point.
     ///
     /// By default uses "try and increment" method described by RFC 9381.
+    ///
+    /// The input `data` is assumed to be `[salt||]alpha` according to the RFC 9381.
+    /// In other words, salt is not applied by this function.
     #[inline(always)]
     fn data_to_point(data: &[u8]) -> Option<AffinePoint<Self>> {
         utils::hash_to_curve_tai_rfc_9381::<Self>(data)
diff --git a/src/pedersen.rs b/src/pedersen.rs
index b76ffcb..9e06355 100644
--- a/src/pedersen.rs
+++ b/src/pedersen.rs
@@ -193,7 +193,7 @@ pub(crate) mod testing {
     }
 
     impl<S: PedersenSuite + std::fmt::Debug> common::TestVectorTrait for TestVector<S> {
-        fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: Option<&[u8]>, ad: &[u8]) -> Self {
+        fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: &[u8], ad: &[u8]) -> Self {
             use super::Prover;
             let base = common::TestVector::new(comment, seed, alpha, salt, ad);
             let input = Input::<S>::from(base.h);
diff --git a/src/ring.rs b/src/ring.rs
index d1e2f8e..0f6e11e 100644
--- a/src/ring.rs
+++ b/src/ring.rs
@@ -419,7 +419,7 @@ pub(crate) mod testing {
         CurveConfig<S>: SWCurveConfig + Clone,
         AffinePoint<S>: SWMapping<CurveConfig<S>>,
     {
-        fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: Option<&[u8]>, ad: &[u8]) -> Self {
+        fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: &[u8], ad: &[u8]) -> Self {
             use super::Prover;
             let pedersen = pedersen::testing::TestVector::new(comment, seed, alpha, salt, ad);
 
diff --git a/src/suites/bandersnatch.rs b/src/suites/bandersnatch.rs
index 85b3724..8e7ff32 100644
--- a/src/suites/bandersnatch.rs
+++ b/src/suites/bandersnatch.rs
@@ -20,8 +20,6 @@
 //!   key scalar and `G` the group generator. In this ciphersuite, the secret
 //!   scalar x is equal to the secret key scalar sk.
 //!
-//! * encode_to_curve_salt = PS_string (point_to_string(PK)).
-//!
 //! * The ECVRF_nonce_generation function is as specified in Section 5.4.2.2
 //!   of RFC-9381.
 //!
@@ -259,21 +257,17 @@ mod test_vectors_ietf_ed {
     use crate::testing;
 
     type V = crate::ietf::testing::TestVector<BandersnatchSha512Ell2>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/bandersnatch_ed_sha512_ell2_ietf_vectors.json"
-    );
+    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_ietf";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Bandersnatch_SHA-512_ELL2");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
 
@@ -283,21 +277,17 @@ mod test_vectors_pedersen_ed {
     use crate::testing;
 
     type V = crate::pedersen::testing::TestVector<BandersnatchSha512Ell2>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/bandersnatch_ed_sha512_ell2_pedersen_vectors.json"
-    );
+    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Bandersnatch_SHA-512_ELL2");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
 
@@ -307,11 +297,7 @@ mod test_vectors_ring_ed {
     use crate::testing;
 
     type V = crate::ring::testing::TestVector<BandersnatchSha512Ell2>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/bandersnatch_ed_sha512_ell2_ring_vectors.json"
-    );
+    const VECTOR_ID: &str = "bandersnatch_ed_sha512_ell2_ring";
 
     impl crate::ring::testing::RingSuiteExt for BandersnatchSha512Ell2 {
         fn ring_context() -> &'static RingContext {
@@ -333,12 +319,12 @@ mod test_vectors_ring_ed {
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Bandersnatch_SHA-512_ELL2");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
 
@@ -348,21 +334,17 @@ mod test_vectors_ietf_sw {
     use crate::testing;
 
     type V = crate::ietf::testing::TestVector<BandersnatchSha512Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/bandersnatch_sw_sha512_tai_ietf_vectors.json"
-    );
+    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_ietf";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Bandersnatch_SW_SHA-512_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
 
@@ -372,21 +354,17 @@ mod test_vectors_pedersen_sw {
     use crate::testing;
 
     type V = crate::pedersen::testing::TestVector<BandersnatchSha512Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/bandersnatch_sw_sha512_tai_pedersen_vectors.json"
-    );
+    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Bandersnatch_SW_SHA-512_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
 
@@ -396,11 +374,7 @@ mod test_vectors_ring_sw {
     use crate::testing;
 
     type V = crate::ring::testing::TestVector<BandersnatchSha512Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/bandersnatch_sw_sha512_tai_ring_vectors.json"
-    );
+    const VECTOR_ID: &str = "bandersnatch_sw_sha512_tai_ring";
 
     impl crate::ring::testing::RingSuiteExt for BandersnatchSha512Tai {
         fn ring_context() -> &'static RingContext {
@@ -422,11 +396,11 @@ mod test_vectors_ring_sw {
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Bandersnatch_SW_SHA-512_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
diff --git a/src/suites/ed25519.rs b/src/suites/ed25519.rs
index 635cad4..1416528 100644
--- a/src/suites/ed25519.rs
+++ b/src/suites/ed25519.rs
@@ -15,8 +15,6 @@
 //! *  The secret key and generation of the secret scalar and the public
 //!    key are specified in Section 5.1.5 of [RFC8032].
 //!
-//! *  encode_to_curve_salt = PK_string.
-//!
 //! *  The ECVRF_nonce_generation function is as specified in
 //!    Section 5.4.2.2.
 //!
@@ -84,21 +82,17 @@ mod test_vectors_ietf {
     use super::*;
 
     type V = crate::ietf::testing::TestVector<Ed25519Sha512Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/ed25519_sha512_tai_ietf_vectors.json"
-    );
+    const VECTOR_ID: &str = "ed25519_sha512_tai_ietf";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Ed25519_SHA-512_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
 
@@ -107,20 +101,16 @@ mod test_vectors_pedersen {
     use super::*;
 
     type V = crate::pedersen::testing::TestVector<Ed25519Sha512Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/ed25519_sha512_tai_pedersen_vectors.json"
-    );
+    const VECTOR_ID: &str = "ed25519_sha512_tai_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "Ed25519_SHA-512_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
diff --git a/src/suites/secp256.rs b/src/suites/secp256.rs
index 8ce1963..5e53040 100644
--- a/src/suites/secp256.rs
+++ b/src/suites/secp256.rs
@@ -16,8 +16,6 @@
 //!    and Q in Section 3.2.1 of [SECG1]).  In this ciphersuite, the
 //!    secret scalar x is equal to the secret key SK.
 //!
-//! *  encode_to_curve_salt = PK_string.
-//!
 //! *  The ECVRF_nonce_generation function is as specified in
 //!    Section 5.4.2.1.
 //!
@@ -93,32 +91,24 @@ mod test_vectors_ietf {
     use super::*;
 
     type V = crate::ietf::testing::TestVector<P256Sha256Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/secp256_sha256_tai_ietf_vectors.json"
-    );
-
+    const VECTOR_ID: &str = "secp256_sha256_tai_ietf";
     // Vectors from RFC-9381
-    const TEST_VECTORS_FILE_RFC_9381: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/secp256_sha256_tai_ietf_vectors_rfc_9381.json"
-    );
+    const VECTOR_ID_RFC_9381: &str = "secp256_sha256_tai_ietf_rfc_9381";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "secp256r1_SHA-256_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process_rfc_9381() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE_RFC_9381);
+        testing::test_vectors_process::<V>(VECTOR_ID_RFC_9381);
     }
 }
 
@@ -127,20 +117,16 @@ mod test_vectors_pedersen {
     use super::*;
 
     type V = crate::pedersen::testing::TestVector<P256Sha256Tai>;
-
-    const TEST_VECTORS_FILE: &str = concat!(
-        env!("CARGO_MANIFEST_DIR"),
-        "/data/secp256r1_sha256_tai_pedersen_vectors.json"
-    );
+    const VECTOR_ID: &str = "secp256r1_sha256_tai_pedersen";
 
     #[test]
     #[ignore = "test vectors generator"]
     fn generate() {
-        testing::test_vectors_generate::<V>(TEST_VECTORS_FILE, "secp256r1_SHA-256_TAI");
+        testing::test_vectors_generate::<V>(VECTOR_ID);
     }
 
     #[test]
     fn process() {
-        testing::test_vectors_process::<V>(TEST_VECTORS_FILE);
+        testing::test_vectors_process::<V>(VECTOR_ID);
     }
 }
diff --git a/src/testing.rs b/src/testing.rs
index 85707cb..18c9f9b 100644
--- a/src/testing.rs
+++ b/src/testing.rs
@@ -13,6 +13,9 @@ pub const PCS_SRS_FILE: &str = concat!(
     "/data/zcash-bls12-381-srs-2-11-uncompressed.bin"
 );
 
+// Test vectors folder
+pub const VECTORS_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/data/vectors");
+
 /// Generate a vector of random values.
 pub fn random_vec<T: UniformRand>(n: usize, rng: Option<&mut dyn RngCore>) -> Vec<T> {
     let mut local_rng = ark_std::test_rng();
@@ -64,7 +67,7 @@ impl TestVectorMap {
 }
 
 pub trait TestVectorTrait {
-    fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: Option<&[u8]>, ad: &[u8]) -> Self;
+    fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: &[u8], ad: &[u8]) -> Self;
 
     fn from_map(map: &TestVectorMap) -> Self;
 
@@ -82,6 +85,8 @@ pub struct TestVector<S: Suite> {
     pub pk: AffinePoint<S>,
     /// VRF input raw data.
     pub alpha: Vec<u8>,
+    /// VRF input salt.
+    pub salt: Vec<u8>,
     /// Signature additional raw data.
     pub ad: Vec<u8>,
     /// VRF input point.
@@ -97,6 +102,7 @@ impl<S: Suite> core::fmt::Debug for TestVector<S> {
         let sk = hex::encode(codec::scalar_encode::<S>(&self.sk));
         let pk = hex::encode(codec::point_encode::<S>(&self.pk));
         let alpha = hex::encode(&self.alpha);
+        let salt = hex::encode(&self.salt);
         let ad = hex::encode(&self.ad);
         let h = hex::encode(codec::point_encode::<S>(&self.h));
         let gamma = hex::encode(codec::point_encode::<S>(&self.gamma));
@@ -106,6 +112,7 @@ impl<S: Suite> core::fmt::Debug for TestVector<S> {
             .field("sk", &sk)
             .field("pk", &pk)
             .field("alpha", &alpha)
+            .field("salt", &salt)
             .field("ad", &ad)
             .field("h", &h)
             .field("gamma", &gamma)
@@ -115,15 +122,11 @@ impl<S: Suite> core::fmt::Debug for TestVector<S> {
 }
 
 impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
-    fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: Option<&[u8]>, ad: &[u8]) -> Self {
+    fn new(comment: &str, seed: &[u8], alpha: &[u8], salt: &[u8], ad: &[u8]) -> Self {
         let sk = Secret::<S>::from_seed(seed);
         let pk = sk.public().0;
 
-        let salt = salt
-            .map(|v| v.to_vec())
-            .unwrap_or_else(|| codec::point_encode::<S>(&pk));
-
-        let h2c_data = [&salt[..], alpha].concat();
+        let h2c_data = [salt, alpha].concat();
         let h = <S as Suite>::data_to_point(&h2c_data).unwrap();
         let input = Input::from(h);
 
@@ -137,6 +140,7 @@ impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
             sk: sk.scalar,
             pk,
             alpha,
+            salt: salt.to_vec(),
             ad: ad.to_vec(),
             h,
             gamma,
@@ -150,6 +154,7 @@ impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
         let sk = codec::scalar_decode::<S>(&item_bytes("sk"));
         let pk = codec::point_decode::<S>(&item_bytes("pk")).unwrap();
         let alpha = item_bytes("alpha");
+        let salt = item_bytes("salt");
         let ad = item_bytes("ad");
         let h = codec::point_decode::<S>(&item_bytes("h")).unwrap();
         let gamma = codec::point_decode::<S>(&item_bytes("gamma")).unwrap();
@@ -159,6 +164,7 @@ impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
             sk,
             pk,
             alpha,
+            salt,
             ad,
             h,
             gamma,
@@ -172,6 +178,7 @@ impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
             ("sk", hex::encode(codec::scalar_encode::<S>(&self.sk))),
             ("pk", hex::encode(codec::point_encode::<S>(&self.pk))),
             ("alpha", hex::encode(&self.alpha)),
+            ("salt", hex::encode(&self.salt)),
             ("ad", hex::encode(&self.ad)),
             ("h", hex::encode(codec::point_encode::<S>(&self.h))),
             ("gamma", hex::encode(codec::point_encode::<S>(&self.gamma))),
@@ -190,11 +197,7 @@ impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
         let pk = sk.public();
         assert_eq!(self.pk, pk.0, "public key ('pk') mismatch");
 
-        // Prepare hash_to_curve data = salt || alpha
-        // Salt is defined to be pk (adjust it to make the encoding to match)
-        let pk_bytes = codec::point_encode::<S>(&pk.0);
-        let h2c_data = [&pk_bytes[..], &self.alpha[..]].concat();
-
+        let h2c_data = [&self.salt[..], &self.alpha[..]].concat();
         let h = S::data_to_point(&h2c_data).unwrap();
         assert_eq!(self.h, h, "hash-to-curve ('h') mismatch");
         let input = Input::<S>::from(h);
@@ -207,8 +210,13 @@ impl<S: Suite + std::fmt::Debug> TestVectorTrait for TestVector<S> {
     }
 }
 
-pub fn test_vectors_generate<V: TestVectorTrait + std::fmt::Debug>(file: &str, identifier: &str) {
+fn vector_filename(identifier: &str) -> String {
+    [VECTORS_DIR, "/", identifier, ".json"].concat()
+}
+
+pub fn test_vectors_generate<V: TestVectorTrait + std::fmt::Debug>(identifier: &str) {
     use std::{fs::File, io::Write};
+
     // ("secret_seed", "vrf raw input", "additional data"))
     let var_data: Vec<(u8, &[u8], &[u8])> = vec![
         (1, b"", b""),
@@ -226,21 +234,21 @@ pub fn test_vectors_generate<V: TestVectorTrait + std::fmt::Debug>(file: &str, i
         let alpha = hex::decode(var_data.1).unwrap();
         let ad = hex::decode(var_data.2).unwrap();
         let comment = format!("{} - vector-{}", identifier, i + 1);
-        let vector = V::new(&comment, &[var_data.0], &alpha, None, &ad);
+        let vector = V::new(&comment, &[var_data.0], &alpha, b"", &ad);
         println!("Gen test vector: {}", comment);
         vector.run();
         vector_maps.push(vector.to_map());
     }
 
-    let mut file = File::create(file).unwrap();
+    let mut file = File::create(vector_filename(identifier)).unwrap();
     let json = serde_json::to_string_pretty(&vector_maps).unwrap();
     file.write_all(json.as_bytes()).unwrap();
 }
 
-pub fn test_vectors_process<V: TestVectorTrait>(file: &str) {
+pub fn test_vectors_process<V: TestVectorTrait>(identifier: &str) {
     use std::{fs::File, io::BufReader};
 
-    let file = File::open(file).unwrap();
+    let file = File::open(vector_filename(identifier)).unwrap();
     let reader = BufReader::new(file);
 
     let vector_maps: Vec<TestVectorMap> = serde_json::from_reader(reader).unwrap();
diff --git a/src/utils.rs b/src/utils.rs
index 3756751..37ae214 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -65,8 +65,6 @@ pub(crate) fn hmac<H: Digest + digest::core_api::BlockSizeUser>(sk: &[u8], data:
 /// ciphersuites specified in Section 5.5, this algorithm is expected to
 /// find a valid curve point after approximately two attempts on average.
 ///
-/// The input `data` is defined to be `salt || alpha` according to the RFC 9281.
-///
 /// # Panics
 ///
 /// This function panics if `Suite::Hasher` output is less than AffinePoint base field