From 58ce20a9af293c09d1cdb092b7f0d0161a374850 Mon Sep 17 00:00:00 2001
From: Vivek Arte <vivek@qed-it.com>
Date: Tue, 17 Sep 2024 23:06:57 +0530
Subject: [PATCH] updating the test vector files to reflect the changes to the
 zcash_test_vectors repository

---
 src/test_vectors/asset_base.rs              | 1714 +++++++++----------
 src/test_vectors/keys.rs                    | 1048 ++++++------
 src/test_vectors/note_encryption_vanilla.rs | 1450 ++++++++--------
 src/test_vectors/note_encryption_zsa.rs     |   20 -
 4 files changed, 2101 insertions(+), 2131 deletions(-)

diff --git a/src/test_vectors/asset_base.rs b/src/test_vectors/asset_base.rs
index 4cfaa0207..b054359f2 100644
--- a/src/test_vectors/asset_base.rs
+++ b/src/test_vectors/asset_base.rs
@@ -15,1017 +15,1017 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x51, 0x6d, 0x9f, 0x31,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc2, 0xb9, 0xc3, 0x8b, 0xe1, 0x9a, 0xa4, 0xe1, 0x9b, 0x99, 0xc3, 0xbc, 0xc4, 0xad,
+                0xc3, 0x8d, 0xce, 0x89, 0xc8, 0xa1, 0xc7, 0xb1, 0xc4, 0x9d, 0xc4, 0xa0, 0xc3, 0x99,
+                0xc7, 0x97, 0xc3, 0xac, 0xc3, 0x8c, 0xe1, 0x9b, 0xa2, 0xc4, 0x86, 0xc4, 0x94, 0x3f,
+                0xc7, 0xa6, 0xc4, 0xbb, 0x6a, 0xc2, 0xa6, 0xc7, 0xb4, 0xc6, 0x88, 0xc3, 0x8a, 0xc3,
+                0xba, 0xc9, 0x8c, 0xe2, 0xb1, 0xaa, 0xc5, 0x9b, 0xe1, 0x9b, 0xa9, 0xc4, 0xb4, 0xc8,
+                0x91, 0xc3, 0x8c, 0xc4, 0x92, 0x30, 0xc5, 0xa9, 0xce, 0x84, 0xc5, 0x90, 0x73, 0xe2,
+                0xb1, 0xaa, 0xe2, 0xb1, 0xb8, 0xc5, 0xa3, 0xc3, 0x84, 0xe1, 0x9b, 0x83, 0xc7, 0xb1,
+                0xc3, 0xb1, 0xc4, 0x94, 0xc6, 0xbe, 0x69, 0x44, 0xc7, 0xbd, 0xc8, 0xb9, 0xc7, 0x84,
+                0xc3, 0xa9, 0xc7, 0x88, 0xc5, 0x8d, 0xc7, 0x91, 0xc9, 0x8a, 0xc3, 0xb9, 0xc4, 0xb1,
+                0xc3, 0xb6, 0xc6, 0x82, 0xe1, 0x9b, 0x8f, 0xc4, 0x88, 0xe2, 0xb1, 0xba, 0xc7, 0xb5,
+                0x42, 0xc4, 0xa9, 0xc4, 0x90, 0x61, 0xc6, 0x90, 0xc6, 0xb5, 0xc7, 0x9e, 0xc2, 0xb2,
+                0xc9, 0x85, 0xc3, 0x9e, 0xc9, 0x84, 0xe2, 0xb1, 0xab, 0xc4, 0x98, 0xe1, 0x9a, 0xa3,
+                0xc8, 0x91, 0xe1, 0x9a, 0xbc, 0xc7, 0xba, 0xc3, 0xa9, 0xc7, 0xb1, 0xc4, 0xbf, 0xc8,
+                0xa2, 0xc5, 0xb3, 0xc8, 0xa4, 0xc4, 0xb2, 0xc4, 0xb7, 0x45, 0x32, 0xc8, 0x83, 0xc7,
+                0xa6, 0xe1, 0x9a, 0xab, 0xc5, 0x88, 0xc8, 0x88, 0xc3, 0x92, 0xe2, 0xb1, 0xac, 0xc9,
+                0x8a, 0x25, 0xc8, 0x98, 0xc6, 0xbc, 0xc6, 0xb6, 0x7a, 0xc4, 0xa6, 0xc7, 0xa3, 0xc4,
+                0x8f, 0xe1, 0x9a, 0xb0, 0xc2, 0xaf, 0xe1, 0x9b, 0xaf, 0xc3, 0x8c, 0xc2, 0xbf, 0xc5,
+                0xb5, 0xe2, 0xb1, 0xa1, 0xe1, 0x9b, 0xa3, 0xc8, 0x8f, 0x6c, 0xc3, 0xa2, 0xc4, 0x8c,
+                0xc3, 0xb4, 0xe2, 0xb1, 0xab, 0x7c, 0xc8, 0x93, 0xc9, 0x8c, 0xc6, 0x8d, 0xc9, 0x8c,
+                0xc8, 0xb3, 0xc7, 0x96, 0xc7, 0xa0, 0xc7, 0x9f, 0x69, 0xc6, 0x97, 0xc4, 0xbd, 0xe2,
+                0xb1, 0xb5, 0xc6, 0xa4, 0xe1, 0x9b, 0x83, 0xe1, 0x9b, 0x83, 0xe2, 0xb1, 0xaa, 0xc7,
+                0x85, 0xe2, 0xb1, 0xaf, 0x7d, 0xc6, 0x9b, 0xc2, 0xa5, 0xc7, 0x9c, 0xc5, 0xaf, 0xc7,
+                0x97, 0xc8, 0x9e, 0xc3, 0x91, 0xc2, 0xa2, 0xc7, 0x9f, 0xc4, 0xbf, 0x62, 0xc3, 0x8e,
+                0xc5, 0xbd, 0xc8, 0xb3, 0xcd, 0xb6, 0xc4, 0x95, 0x39, 0xc3, 0xa4, 0xe1, 0x9b, 0xad,
+                0xe1, 0x9b, 0x84, 0xc8, 0xad, 0x42, 0xc8, 0xa1, 0x34, 0xc4, 0xbd, 0x6b, 0xc3, 0x83,
+                0xc7, 0xa8, 0x48, 0x5e, 0xc5, 0x97, 0xc8, 0xb5, 0xc6, 0xa4, 0xc6, 0x94, 0xc7, 0x98,
+                0xc6, 0xb2, 0xc4, 0x9a, 0x46, 0xc6, 0xad, 0xe1, 0x9b, 0x83, 0xc4, 0x8b, 0x3c, 0xc6,
+                0x98, 0xc9, 0x8e, 0xc2, 0xbc, 0xc3, 0x80, 0xc7, 0x83, 0x6f, 0x63, 0xe1, 0x9b, 0xa0,
+                0xc4, 0x94, 0xe1, 0x9a, 0xbc, 0xc3, 0xa9, 0xe1, 0x9a, 0xa4, 0xc5, 0x8c, 0xc8, 0x94,
+                0xc7, 0xa3, 0xce, 0x87, 0xc9, 0x82, 0xe2, 0xb1, 0xa6, 0xc4, 0x81, 0xc4, 0xa8, 0xc6,
+                0xb5, 0xc7, 0x93, 0xe1, 0x9b, 0x8c, 0xc5, 0x87, 0xc4, 0x97, 0xc7, 0x93, 0x4a, 0xc5,
+                0x9e, 0xc9, 0x84, 0xe2, 0xb1, 0xa0, 0xc4, 0xab, 0xc7, 0x83, 0xc6, 0x88, 0xc5, 0xaa,
+                0xc5, 0xa1, 0xe1, 0x9b, 0x86, 0xc7, 0x82, 0xe2, 0xb1, 0xa5, 0xc3, 0x9e, 0xc7, 0xbc,
+                0xc6, 0x8b, 0x46, 0xe1, 0x9a, 0xa9, 0xc6, 0x95, 0xc4, 0xa7, 0xc6, 0x8d, 0xe1, 0x9b,
+                0x8d, 0xc7, 0x95, 0xc3, 0xaf, 0xc6, 0x9a, 0xe2, 0xb1, 0xba, 0xc3, 0xaa, 0xc7, 0x82,
+                0xe1, 0x9b, 0x9d, 0xc9, 0x80, 0x25, 0xc7, 0x8d, 0x28, 0x46, 0xe2, 0xb1, 0xb5, 0xc6,
+                0x8b, 0xe2, 0xb1, 0xb4, 0xc3, 0x85, 0xc8, 0xbe,
             ],
             asset_base: [
-                0xa7, 0x62, 0x5a, 0x60, 0xff, 0x6a, 0xdc, 0x49, 0x8a, 0xc2, 0xf5, 0x7b, 0x4d, 0xbe,
-                0xd3, 0x67, 0x26, 0xba, 0xe6, 0x40, 0x1f, 0x3e, 0x01, 0xc2, 0x61, 0x17, 0x0b, 0x02,
-                0x81, 0x0f, 0x08, 0x19,
+                0xb2, 0x5c, 0xbe, 0xdd, 0x3c, 0xae, 0xa0, 0x46, 0x24, 0x08, 0x21, 0xa9, 0x22, 0xcd,
+                0xae, 0xb7, 0xfe, 0xcc, 0x4f, 0xed, 0x1d, 0x60, 0xc1, 0x61, 0x57, 0x9c, 0xd9, 0xcf,
+                0x4e, 0x0c, 0xc9, 0x1f,
             ],
         },
         TestVector {
             key: [
-                0x16, 0x88, 0x4f, 0x1d, 0xbc, 0x92, 0x90, 0x89, 0xa4, 0x17, 0x6e, 0x84, 0x0b, 0xb5,
-                0x81, 0xc8, 0x0e, 0x16, 0xe9, 0xb1, 0xab, 0xd6, 0x54, 0xe6, 0x2c, 0x8b, 0x0b, 0x95,
-                0x70, 0x20, 0xb7, 0x48,
+                0xd5, 0x9a, 0x54, 0xb2, 0x87, 0x10, 0x58, 0xe8, 0xdf, 0x0e, 0x8d, 0xb3, 0x15, 0x6f,
+                0xb5, 0x60, 0xd9, 0x8d, 0xa4, 0xdb, 0x99, 0x04, 0x2c, 0xe9, 0x85, 0x2f, 0x4b, 0x08,
+                0xb1, 0xf4, 0x9f, 0xaa,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xe1, 0x9b, 0x93, 0xc6, 0xab, 0xe1, 0x9b, 0x88, 0xc2, 0xb5, 0x24, 0xc6, 0x85, 0xe2,
+                0xb1, 0xae, 0xe1, 0x9a, 0xbe, 0xc6, 0x9c, 0xc5, 0xb1, 0xc3, 0xad, 0xc6, 0xaa, 0xc3,
+                0xaf, 0xc3, 0x9d, 0xc2, 0xab, 0xc7, 0x9b, 0xc6, 0xad, 0xc3, 0xb3, 0xc7, 0xbe, 0xe1,
+                0x9b, 0xac, 0xc7, 0x91, 0xc8, 0x9d, 0xc9, 0x82, 0xc4, 0xae, 0xc4, 0x81, 0xe1, 0x9b,
+                0xa8, 0xc6, 0x84, 0xe2, 0xb1, 0xb0, 0xc5, 0x86, 0x61, 0xc6, 0x95, 0xcd, 0xb4, 0xc2,
+                0xbd, 0xc6, 0xb4, 0xc4, 0x84, 0xc7, 0x97, 0xe2, 0xb1, 0xb6, 0xc9, 0x8a, 0xe1, 0x9a,
+                0xbb, 0xcd, 0xbc, 0xcd, 0xb6, 0xc8, 0xbc, 0xe1, 0x9b, 0xb0, 0xe2, 0xb1, 0xa5, 0xc7,
+                0x89, 0xe1, 0x9b, 0x92, 0xc5, 0xad, 0xe2, 0xb1, 0xad, 0xc3, 0x85, 0xe1, 0x9a, 0xbb,
+                0xc7, 0xb3, 0xc6, 0xb4, 0xc5, 0xaf, 0xc5, 0x92, 0xe1, 0x9a, 0xb8, 0xc3, 0x88, 0xc2,
+                0xb7, 0xe1, 0x9a, 0xab, 0xc8, 0xb2, 0xc7, 0x96, 0xc6, 0xb3, 0xe1, 0x9b, 0x89, 0x31,
+                0xe1, 0x9a, 0xa7, 0xc4, 0x89, 0xc4, 0x96, 0x5d, 0xe1, 0x9b, 0xa6, 0xc4, 0x84, 0xc6,
+                0x8d, 0xc7, 0xb9, 0xc8, 0x94, 0xe1, 0x9b, 0x8b, 0xc9, 0x8b, 0xc3, 0xb0, 0x44, 0x6f,
+                0xce, 0x86, 0x71, 0xc6, 0xb2, 0xe1, 0x9a, 0xbf, 0xc6, 0x80, 0xc5, 0x98, 0xc4, 0xbd,
+                0xc6, 0xbb, 0xc7, 0xad, 0xc5, 0xbb, 0x77, 0xc2, 0xb8, 0xc2, 0xb5, 0xc8, 0xbd, 0xc3,
+                0xb1, 0xc8, 0x84, 0xcd, 0xb2, 0xc6, 0xa2, 0x7c, 0xc5, 0x81, 0x4f, 0xc5, 0xab, 0xc4,
+                0xa5, 0xc4, 0xb6, 0xc3, 0x81, 0xc6, 0xba, 0xc4, 0x84, 0xe2, 0xb1, 0xa8, 0xc4, 0x9e,
+                0xe1, 0x9b, 0xae, 0xc5, 0x9a, 0xc5, 0xa2, 0xc2, 0xbe, 0xc8, 0xb9, 0xe2, 0xb1, 0xb2,
+                0xe2, 0xb1, 0xb9, 0xc8, 0xa8, 0x2c, 0xe1, 0x9b, 0x9d, 0xc3, 0xaf, 0xc3, 0x98, 0xc4,
+                0x9d, 0xe1, 0x9b, 0x85, 0x55, 0xc8, 0x89, 0xc6, 0x8f, 0xc4, 0xb6, 0xc6, 0xab, 0xc6,
+                0xaa, 0xc6, 0xb8, 0x32, 0xc4, 0x88, 0xc6, 0x95, 0xc7, 0x93, 0xc6, 0xa1, 0xc2, 0xb3,
+                0xc4, 0xb3, 0xc5, 0x80, 0xc5, 0x93, 0x7a, 0xc5, 0xa4, 0x66, 0xc4, 0xa1, 0x47, 0x44,
+                0xe1, 0x9a, 0xb5, 0x7d, 0xc6, 0xab, 0xc2, 0xa2, 0xc6, 0x86, 0xc8, 0x8b, 0xc8, 0x8d,
+                0xc8, 0xa7, 0xc8, 0xae, 0xc3, 0xb6, 0xc8, 0xac, 0x24, 0x3d, 0xcd, 0xbc, 0xc3, 0x8f,
+                0xc5, 0xbb, 0xc8, 0x92, 0xc3, 0xba, 0xc4, 0x84, 0xe1, 0x9a, 0xbb, 0xc5, 0x83, 0x6b,
+                0x41, 0xc6, 0xb8, 0xc4, 0x9d, 0xc7, 0x89, 0xe1, 0x9b, 0x9c, 0x45, 0xc7, 0xb0, 0xc2,
+                0xa3, 0xe1, 0x9a, 0xa4, 0xc8, 0x94, 0xc8, 0x92, 0xc9, 0x8e, 0x71, 0xc7, 0x8a, 0x5b,
+                0xe1, 0x9b, 0xaa, 0xc6, 0xaf, 0xe1, 0x9b, 0xab, 0xe1, 0x9b, 0x9e, 0xe1, 0x9b, 0x83,
+                0xc8, 0x9f, 0xe2, 0xb1, 0xb6, 0xe1, 0x9a, 0xb7, 0xc2, 0xa7, 0xc4, 0x83, 0x2f, 0xc2,
+                0xae, 0xe2, 0xb1, 0xaf, 0xe1, 0x9a, 0xa1, 0xe1, 0x9a, 0xbe, 0x66, 0x3b, 0xc8, 0xaf,
+                0xc8, 0xbd, 0xc7, 0xb8, 0xc9, 0x8d, 0xc5, 0x89, 0xc5, 0xa5, 0xe1, 0x9a, 0xae, 0xc8,
+                0xa1, 0xc6, 0x8b, 0xc2, 0xa5, 0xc9, 0x80, 0xe2, 0xb1, 0xa4, 0xc3, 0xba, 0xe2, 0xb1,
+                0xb7, 0xc5, 0x92, 0xc4, 0x9b, 0xc7, 0x87, 0xc6, 0xb5, 0xc5, 0xb3, 0xc6, 0x9c, 0x3c,
+                0xc6, 0x9e, 0xc4, 0x9b, 0xc8, 0xa9, 0xc5, 0x8c, 0xe1, 0x9b, 0x90, 0xc7, 0xa8, 0xc7,
+                0x9d, 0xc8, 0x9b, 0xc7, 0xb2, 0xe2, 0xb1, 0xae, 0xc6, 0x90, 0xc6, 0x8e, 0x70, 0xe1,
+                0x9b, 0xa7, 0x32, 0xc5, 0x85, 0x66, 0xc5, 0xbb, 0xc7, 0xb8, 0xc7, 0x8b, 0xc8, 0xb1,
+                0xc8, 0xaa, 0xc5, 0x8c, 0xc8, 0x82, 0xc6, 0xb2, 0xcd, 0xb7, 0xe1, 0x9b, 0x93, 0xc6,
+                0x9e, 0xe1, 0x9b, 0x90, 0x4d, 0x70, 0xc8, 0xaf,
             ],
             asset_base: [
-                0xb9, 0xfc, 0x57, 0x2c, 0x5a, 0xd8, 0x81, 0x26, 0xff, 0x6b, 0x7c, 0x65, 0x9f, 0x78,
-                0x74, 0x91, 0xf7, 0xc2, 0x7c, 0x5f, 0xe4, 0xff, 0x24, 0x20, 0x8a, 0x02, 0xbc, 0x94,
-                0x5e, 0x55, 0x4a, 0xbf,
+                0xbd, 0x7f, 0x79, 0xe7, 0xda, 0xdd, 0x1d, 0x48, 0x27, 0x06, 0x04, 0xcd, 0xdb, 0x1d,
+                0x65, 0x44, 0x09, 0x29, 0xea, 0x25, 0xe7, 0x7b, 0x72, 0x85, 0x5f, 0xf6, 0xfd, 0x99,
+                0x18, 0xa5, 0x91, 0xb6,
             ],
         },
         TestVector {
             key: [
-                0xd4, 0x22, 0x9e, 0x19, 0x5e, 0x25, 0xf6, 0x02, 0xa2, 0x18, 0x61, 0x22, 0xcb, 0x4e,
-                0x78, 0x76, 0x7b, 0x3c, 0x66, 0xac, 0x39, 0x08, 0x08, 0xd2, 0xd1, 0xb4, 0x04, 0x42,
-                0xda, 0x7f, 0x00, 0x66,
+                0x85, 0xbc, 0x7d, 0x64, 0xbe, 0x0d, 0xef, 0xc4, 0x77, 0xeb, 0x05, 0xe7, 0x95, 0xf7,
+                0x69, 0x57, 0x62, 0x80, 0x02, 0x61, 0x62, 0x5a, 0x7b, 0x71, 0xa1, 0x4d, 0x18, 0xf0,
+                0xef, 0x1f, 0x01, 0xb0,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc7, 0x96, 0xcd, 0xb7, 0xc3, 0x9b, 0xc7, 0x8d, 0xc4, 0x92, 0x7b, 0xcd, 0xb4, 0x34,
+                0xc3, 0x84, 0xcd, 0xb6, 0xc2, 0xbc, 0x3d, 0xc6, 0xa7, 0xc8, 0xbc, 0xe1, 0x9b, 0x9f,
+                0xc3, 0xbd, 0xc8, 0x9a, 0xc5, 0x81, 0xc4, 0xb7, 0x6c, 0xc5, 0xb3, 0xe1, 0x9a, 0xa5,
+                0xe1, 0x9b, 0xa6, 0x44, 0xe1, 0x9b, 0xa4, 0xc5, 0xbc, 0xe1, 0x9b, 0x99, 0xc6, 0x91,
+                0xc8, 0x9c, 0xc6, 0x93, 0xc5, 0x95, 0xc4, 0xa2, 0xe2, 0xb1, 0xa2, 0xc8, 0x84, 0x45,
+                0xc2, 0xaa, 0x7e, 0xc2, 0xb7, 0xc3, 0x83, 0x66, 0xc4, 0x81, 0xc7, 0x98, 0xc8, 0x83,
+                0x2b, 0xc6, 0xad, 0xc7, 0x9c, 0xc4, 0x8b, 0xe2, 0xb1, 0xaa, 0x78, 0xc4, 0xa8, 0xc4,
+                0x86, 0xc6, 0x9a, 0xc8, 0xa2, 0x35, 0xc3, 0x81, 0xc6, 0x8f, 0xc6, 0x9b, 0xe1, 0x9b,
+                0x93, 0xc6, 0x8c, 0xe1, 0x9b, 0x8e, 0xc4, 0xb1, 0xc6, 0xbc, 0xe2, 0xb1, 0xb3, 0x5a,
+                0xc5, 0x98, 0xc6, 0xaa, 0xc4, 0xae, 0xc8, 0xa1, 0xe1, 0x9a, 0xbb, 0xc7, 0xad, 0xc5,
+                0xae, 0xc5, 0xaa, 0xc6, 0x85, 0xc2, 0xb2, 0xe1, 0x9b, 0x9e, 0xc7, 0xb4, 0x6b, 0xc4,
+                0xaf, 0xc7, 0xa9, 0xc4, 0xa6, 0xc8, 0xa8, 0xc4, 0x9e, 0xcd, 0xb1, 0xc7, 0xad, 0xc3,
+                0xb8, 0xc3, 0x81, 0xc3, 0xa4, 0xc8, 0x98, 0xc3, 0xbd, 0xc4, 0xae, 0xe1, 0x9b, 0x84,
+                0xc8, 0x8e, 0x6a, 0xc4, 0x96, 0xe1, 0x9a, 0xa6, 0xc6, 0x90, 0xe1, 0x9a, 0xbe, 0xc7,
+                0xa1, 0x2b, 0xcd, 0xb2, 0xc8, 0xa5, 0xc7, 0x87, 0xc7, 0x95, 0x32, 0xc8, 0xa8, 0xc9,
+                0x85, 0xc5, 0x84, 0xc5, 0x99, 0xc7, 0x9f, 0x63, 0x42, 0xc6, 0xb6, 0x42, 0x79, 0xc7,
+                0x90, 0xc5, 0x9d, 0xe2, 0xb1, 0xb7, 0xc4, 0xab, 0xc5, 0xbf, 0xc3, 0xaf, 0x35, 0x49,
+                0xc6, 0xb9, 0xe1, 0x9b, 0x88, 0xc5, 0xbe, 0xc3, 0xb1, 0x23, 0xe2, 0xb1, 0xa3, 0xc5,
+                0x96, 0xc8, 0x8c, 0xe1, 0x9b, 0xa7, 0xc5, 0xa8, 0xc8, 0x95, 0xc7, 0xa6, 0xc8, 0xa7,
+                0xe1, 0x9a, 0xaf, 0xc3, 0xa0, 0xc5, 0x82, 0xc6, 0x83, 0x70, 0xe2, 0xb1, 0xb1, 0xc8,
+                0x86, 0xc7, 0xb4, 0xe1, 0x9b, 0x8b, 0xe1, 0x9a, 0xb3, 0xc5, 0xa2, 0xc3, 0x96, 0xc3,
+                0xbd, 0xc9, 0x87, 0xc2, 0xa5, 0xce, 0x88, 0xc3, 0xa3, 0xe1, 0x9b, 0xa8, 0xc4, 0x8f,
+                0xe1, 0x9a, 0xbf, 0xe1, 0x9b, 0x8b, 0xc2, 0xb3, 0xc3, 0xb7, 0xc6, 0xa1, 0xc5, 0x88,
+                0xe1, 0x9b, 0xa3, 0xc6, 0xa3, 0xc3, 0x8c, 0xc3, 0xa4, 0xc6, 0xa1, 0xe1, 0x9b, 0x87,
+                0xc8, 0xa0, 0xc3, 0x94, 0xc6, 0x9a, 0xc7, 0xb1, 0xc5, 0x85, 0xc6, 0xbf, 0xc8, 0x91,
+                0xc6, 0x88, 0xc4, 0x9e, 0xc6, 0x9a, 0xcd, 0xb1, 0xc4, 0xa6, 0xc6, 0xb0, 0xc3, 0xbc,
+                0x23, 0xc4, 0x9b, 0xc3, 0xa4, 0xc8, 0xb3, 0xe2, 0xb1, 0xa3, 0x73, 0xc6, 0xb6, 0xc8,
+                0xb0, 0xc8, 0xb4, 0xc7, 0xa8, 0xc8, 0xa7, 0xc6, 0x80, 0xc4, 0xb0, 0xc7, 0xaf, 0x6c,
+                0xc8, 0xbb, 0xc4, 0x81, 0xc3, 0x93, 0xc7, 0x8c, 0xc7, 0xb4, 0xe1, 0x9b, 0x9c, 0xc4,
+                0xa1, 0xc6, 0xa8, 0xc7, 0xbc, 0xc3, 0x9d, 0xc4, 0x8a, 0xc6, 0x82, 0xc6, 0x9c, 0xc7,
+                0xb4, 0xc3, 0x83, 0xc8, 0xae, 0xc3, 0x93, 0xe1, 0x9a, 0xab, 0xc7, 0x8a, 0xc7, 0xb5,
+                0xc2, 0xbc, 0xc4, 0x92, 0xc3, 0x9b, 0xc7, 0x8c, 0xc5, 0xa3, 0xc9, 0x84, 0xc4, 0xb5,
+                0xc3, 0xba, 0xc6, 0xb3, 0x46, 0xc7, 0x8f, 0xe1, 0x9a, 0xab, 0xc8, 0x8d, 0xc7, 0xac,
+                0x40, 0xc7, 0xbd, 0xc8, 0xa1, 0xc4, 0xa8, 0xc4, 0x86, 0xc3, 0xaa, 0xc4, 0xbc, 0xc6,
+                0x80, 0x76, 0xc7, 0xb0, 0xc4, 0x85, 0xc5, 0xb7, 0x2a, 0xc4, 0xb7, 0xc2, 0xb6, 0xc8,
+                0xa8, 0xc6, 0xa6, 0x6f, 0xc4, 0xad, 0xc8, 0x90, 0xc4, 0xb9, 0xc8, 0x9a, 0xc6, 0x95,
+                0xc5, 0x80, 0xc3, 0xa5, 0xe1, 0x9b, 0x83, 0x5a,
             ],
             asset_base: [
-                0x69, 0x03, 0x15, 0xe6, 0xb7, 0xbb, 0xbc, 0x9d, 0x88, 0x60, 0x17, 0xfd, 0x0e, 0xb1,
-                0x38, 0x67, 0x16, 0xc2, 0xb4, 0x3f, 0x43, 0xf9, 0xa1, 0xc5, 0x42, 0x74, 0xd7, 0x4a,
-                0x50, 0xbc, 0x22, 0x8d,
+                0x6f, 0x2d, 0x95, 0xed, 0x1d, 0x96, 0x0b, 0x7a, 0xe1, 0xcf, 0x9c, 0x0b, 0x66, 0xe8,
+                0x5a, 0xdd, 0x2c, 0xf1, 0xcd, 0x44, 0x6e, 0x02, 0x74, 0x51, 0x2e, 0x3b, 0x99, 0x6d,
+                0x8e, 0xe7, 0x77, 0xa2,
             ],
         },
         TestVector {
             key: [
-                0x72, 0x73, 0xb6, 0x57, 0xd9, 0x71, 0xa4, 0x5e, 0x72, 0x24, 0x0c, 0x7a, 0xaa, 0xa7,
-                0xd0, 0x68, 0x5d, 0x06, 0xd7, 0x99, 0x9b, 0x0a, 0x19, 0xc4, 0xce, 0xa3, 0x27, 0x88,
-                0xa6, 0xab, 0x51, 0x3d,
+                0xd7, 0x5a, 0xf5, 0x78, 0x2a, 0x5c, 0x72, 0x16, 0x38, 0xf7, 0x59, 0x32, 0x91, 0x11,
+                0x49, 0x93, 0x24, 0x05, 0x3a, 0x5d, 0x1e, 0x1b, 0x2a, 0x4a, 0xb3, 0xcd, 0xf7, 0xf8,
+                0x24, 0x12, 0xff, 0x42,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc3, 0xa1, 0xc7, 0xa6, 0xc4, 0xa7, 0xc5, 0xa9, 0x37, 0xc4, 0x87, 0xc7, 0xb0, 0xe1,
+                0x9a, 0xa1, 0xe2, 0xb1, 0xa1, 0xc6, 0x83, 0xc3, 0xa9, 0xc6, 0xa9, 0xc8, 0x82, 0xe2,
+                0xb1, 0xab, 0xc4, 0xa5, 0xe1, 0x9b, 0x99, 0xc6, 0x9e, 0xe1, 0x9a, 0xaa, 0xc8, 0xa0,
+                0xc8, 0xa2, 0xc4, 0x93, 0xe1, 0x9b, 0x83, 0xe1, 0x9b, 0x92, 0xe1, 0x9b, 0x86, 0xc5,
+                0xb5, 0xc2, 0xb4, 0xc5, 0x97, 0xc6, 0x87, 0xc4, 0x9a, 0xe1, 0x9b, 0x85, 0xc8, 0x91,
+                0xe1, 0x9a, 0xa7, 0xc6, 0xa1, 0xc3, 0x81, 0xc6, 0xab, 0xc5, 0x93, 0xc6, 0xb6, 0xc7,
+                0x86, 0x3f, 0xcd, 0xb5, 0xe2, 0xb1, 0xa5, 0xc7, 0x86, 0xc5, 0x88, 0xc2, 0xa5, 0xc3,
+                0xa5, 0xce, 0x87, 0xc5, 0x8c, 0xc5, 0x9d, 0xe1, 0x9b, 0xa7, 0x70, 0xc3, 0x98, 0xc2,
+                0xb7, 0xe1, 0x9b, 0xb0, 0xc4, 0x85, 0xc6, 0x82, 0xc3, 0x85, 0xc4, 0x9c, 0xe1, 0x9b,
+                0x9d, 0x2c, 0xc4, 0xa6, 0xc9, 0x86, 0xe1, 0x9b, 0xab, 0xc3, 0xb6, 0xc7, 0xad, 0xc5,
+                0xbb, 0xe1, 0x9a, 0xa4, 0x39, 0xc5, 0x82, 0xc6, 0x85, 0xc9, 0x82, 0x41, 0xcd, 0xbb,
+                0xc3, 0x81, 0xc6, 0x8b, 0xe1, 0x9b, 0xb0, 0xc4, 0xa6, 0x49, 0x6a, 0xce, 0x89, 0xc8,
+                0xbb, 0xc6, 0xa5, 0xc5, 0xa7, 0xc7, 0xa9, 0xe2, 0xb1, 0xb7, 0x3c, 0xc5, 0xb5, 0xc3,
+                0xbb, 0xc7, 0xad, 0xc3, 0x84, 0xc3, 0xac, 0xe2, 0xb1, 0xbd, 0xc8, 0xaa, 0x51, 0xc2,
+                0xaa, 0xcd, 0xba, 0xc5, 0xa1, 0x52, 0x62, 0xc6, 0x9f, 0xc4, 0xb6, 0xc8, 0x83, 0x6f,
+                0xc3, 0x9f, 0x48, 0xc6, 0x8f, 0x31, 0xc3, 0x83, 0xe1, 0x9b, 0x80, 0xc5, 0x93, 0xcd,
+                0xba, 0xc4, 0xb6, 0xc7, 0x9c, 0xe1, 0x9b, 0x82, 0xe2, 0xb1, 0xb1, 0x28, 0xc6, 0x94,
+                0xc7, 0x83, 0xc5, 0x9d, 0xc7, 0x86, 0xe1, 0x9a, 0xbe, 0xc5, 0xa9, 0xc7, 0x83, 0xe2,
+                0xb1, 0xad, 0xe1, 0x9b, 0x81, 0xc3, 0x96, 0x60, 0xc4, 0xa3, 0xc2, 0xb7, 0xc5, 0xb6,
+                0xc5, 0x93, 0x74, 0xc6, 0x97, 0x21, 0xe2, 0xb1, 0xae, 0xc2, 0xa8, 0xcd, 0xb1, 0xc6,
+                0x89, 0xc3, 0xbe, 0xe1, 0x9a, 0xb3, 0xc4, 0xa4, 0xc5, 0x94, 0xc8, 0xb8, 0xe1, 0x9b,
+                0x8e, 0xc5, 0x84, 0xc2, 0xbc, 0xc3, 0x86, 0x55, 0xe1, 0x9b, 0x87, 0xce, 0x85, 0xe1,
+                0x9a, 0xb9, 0xc8, 0x90, 0xe1, 0x9b, 0x8e, 0x72, 0xc7, 0x82, 0xc3, 0x85, 0xc4, 0x9f,
+                0xcd, 0xb5, 0xe1, 0x9b, 0xa7, 0xc3, 0x88, 0x73, 0xc2, 0xa5, 0xc6, 0x88, 0xc4, 0xb4,
+                0xc5, 0xa9, 0xcd, 0xbe, 0xc3, 0x99, 0xe1, 0x9a, 0xbf, 0xc4, 0xb0, 0xc4, 0xbf, 0xe2,
+                0xb1, 0xb1, 0xc3, 0x8e, 0x2a, 0xc5, 0x93, 0xc8, 0xb6, 0xc6, 0x89, 0xc6, 0x8b, 0x5a,
+                0x64, 0xe1, 0x9b, 0x9d, 0x41, 0xc3, 0xba, 0xcd, 0xbe, 0xc7, 0x90, 0xc8, 0x8b, 0xc6,
+                0x82, 0xc6, 0xb0, 0xe1, 0x9a, 0xb7, 0xc4, 0xa9, 0xc4, 0x9d, 0xe2, 0xb1, 0xab, 0xc4,
+                0x84, 0xc5, 0xb4, 0xc8, 0xb7, 0xc7, 0x81, 0xc4, 0xad, 0xce, 0x88, 0xc8, 0xb7, 0xc3,
+                0xa8, 0xcd, 0xbc, 0xc6, 0x97, 0xe2, 0xb1, 0xa8, 0xc8, 0x84, 0xc8, 0xa2, 0xe1, 0x9a,
+                0xaa, 0xc5, 0xa4, 0xc5, 0xb3, 0xc5, 0x88, 0x25, 0xc7, 0xb4, 0xc6, 0xa7, 0xc4, 0xbc,
+                0x36, 0x3c, 0xc8, 0x8b, 0x6a, 0xc9, 0x84, 0xe1, 0x9b, 0x9e, 0xc7, 0xa9, 0xe1, 0x9b,
+                0x89, 0xc5, 0xb1, 0xc7, 0xb6, 0xc8, 0x8a, 0xcd, 0xb5, 0xc4, 0x80, 0xe1, 0x9b, 0x98,
+                0xc6, 0x94, 0xc6, 0x82, 0xc4, 0xb4, 0xe1, 0x9a, 0xa3, 0xe1, 0x9b, 0x8f, 0xc3, 0xb6,
+                0xc5, 0xb3, 0xe1, 0x9b, 0x8a, 0xc8, 0xa2, 0xc7, 0x97, 0xc3, 0xb9, 0xc5, 0xac, 0xe1,
+                0x9a, 0xbb, 0xe1, 0x9b, 0xa5, 0xc5, 0xb2, 0xc5, 0x8c, 0xe1, 0x9b, 0x85, 0xc5, 0x8c,
+                0xc7, 0xab, 0xc7, 0xab, 0xe2, 0xb1, 0xbb, 0x48,
             ],
             asset_base: [
-                0x9b, 0xe1, 0x71, 0xf6, 0xf2, 0x77, 0x5f, 0x14, 0xa8, 0x8a, 0xf7, 0x42, 0x5f, 0xb8,
-                0x37, 0xe8, 0x4e, 0x4f, 0xb0, 0x8b, 0x69, 0xdc, 0xa7, 0x0d, 0x96, 0x70, 0x94, 0xd6,
-                0x78, 0xb9, 0x66, 0x92,
+                0x35, 0x3e, 0x4f, 0xa9, 0x48, 0x59, 0xab, 0x52, 0xfc, 0xc2, 0xdd, 0x1c, 0x91, 0x45,
+                0x3c, 0x09, 0x3f, 0x15, 0x43, 0x31, 0x43, 0x65, 0x80, 0x38, 0xba, 0xc3, 0xaa, 0xf0,
+                0x89, 0xf0, 0xd4, 0x23,
             ],
         },
         TestVector {
             key: [
-                0xce, 0xb7, 0x5a, 0x43, 0x9f, 0xf0, 0x16, 0x15, 0x80, 0xbf, 0x29, 0x57, 0x24, 0xc6,
-                0xd9, 0x2d, 0x31, 0xb7, 0xaa, 0x02, 0x84, 0x03, 0x39, 0x44, 0x49, 0x64, 0x48, 0x6f,
-                0xae, 0xa8, 0x90, 0xe5,
+                0x1b, 0x39, 0xca, 0x34, 0x32, 0x36, 0xdf, 0xab, 0x88, 0xfe, 0x78, 0x12, 0x10, 0xe1,
+                0xe8, 0x79, 0x29, 0x3b, 0xe0, 0xf4, 0xc5, 0x1c, 0x86, 0xfd, 0x8a, 0x6f, 0xff, 0xdb,
+                0xb4, 0xad, 0x26, 0x73,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xa5, 0xc2, 0xba, 0xc6, 0x8c, 0xc3, 0x81, 0xc6, 0x82,
+                0xc4, 0x80, 0xc4, 0xa3, 0xc6, 0xad, 0xc3, 0x80, 0xc8, 0x8a, 0xc8, 0x99, 0xe2, 0xb1,
+                0xae, 0xc5, 0xa2, 0xc8, 0x8e, 0xc3, 0xb4, 0xc6, 0x86, 0xc5, 0xa3, 0xc9, 0x88, 0xcd,
+                0xb4, 0x25, 0xe2, 0xb1, 0xa4, 0x50, 0xc3, 0x88, 0xc4, 0xaf, 0xc8, 0x86, 0xc3, 0xa5,
+                0xe1, 0x9b, 0x99, 0xc7, 0xb4, 0xc4, 0xb6, 0xc5, 0x99, 0xc5, 0x8b, 0xc8, 0x85, 0x21,
+                0xe1, 0x9a, 0xaa, 0xc4, 0x95, 0xc3, 0xa9, 0xe1, 0x9a, 0xba, 0x5d, 0xc4, 0xa4, 0xc6,
+                0x9b, 0x4e, 0x37, 0x35, 0xc2, 0xb2, 0xc7, 0x9b, 0xe1, 0x9a, 0xba, 0xc9, 0x80, 0xc7,
+                0x9b, 0xc3, 0x9b, 0xc3, 0xb4, 0xe1, 0x9b, 0x9b, 0xc3, 0xb8, 0xc7, 0xbe, 0xc8, 0x9f,
+                0xc8, 0xa0, 0xc7, 0x8a, 0xcd, 0xb3, 0xc2, 0xae, 0xc4, 0xaf, 0xc4, 0x84, 0x5b, 0xc8,
+                0x87, 0xc9, 0x84, 0xc3, 0x87, 0xc8, 0xa9, 0xc3, 0xa5, 0xc4, 0x87, 0xc5, 0xbf, 0x37,
+                0xc5, 0xac, 0xe1, 0x9a, 0xaa, 0xc6, 0x80, 0xe2, 0xb1, 0xa0, 0xc5, 0xb7, 0xc6, 0x8d,
+                0xc3, 0xbb, 0xc7, 0x85, 0xc2, 0xb6, 0xc4, 0x90, 0xe1, 0x9a, 0xba, 0xc3, 0xb7, 0xe2,
+                0xb1, 0xb6, 0xc6, 0xa8, 0xc7, 0xac, 0xc4, 0xaf, 0xce, 0x8a, 0xc6, 0x8f, 0xc2, 0xa1,
+                0xc3, 0x82, 0xe1, 0x9b, 0x96, 0xc8, 0xb5, 0xc4, 0x9f, 0xc3, 0x88, 0xe1, 0x9b, 0xa6,
+                0xc5, 0xb9, 0xc5, 0xad, 0xe1, 0x9a, 0xa2, 0xc3, 0x95, 0x5c, 0xe1, 0x9a, 0xb2, 0xcd,
+                0xb2, 0xc8, 0xb3, 0xcd, 0xb7, 0x7b, 0xc5, 0xb6, 0xc8, 0xb0, 0x7a, 0xc7, 0x9e, 0x4a,
+                0xc4, 0x86, 0xc3, 0xbf, 0xc7, 0xb2, 0xc8, 0xbc, 0xc9, 0x87, 0xc3, 0x8c, 0xe1, 0x9a,
+                0xbb, 0xc8, 0x8d, 0xc3, 0x9a, 0xc9, 0x8e, 0xc5, 0xb3, 0xe2, 0xb1, 0xab, 0xc5, 0x89,
+                0xc8, 0x9e, 0xe1, 0x9a, 0xb3, 0xc7, 0xb7, 0xc4, 0x8d, 0xe1, 0x9b, 0x84, 0xe1, 0x9b,
+                0xa3, 0xc3, 0xbd, 0xc5, 0x80, 0xc5, 0xab, 0xc3, 0xa6, 0xc4, 0x90, 0xc7, 0x90, 0xe1,
+                0x9b, 0x97, 0xc5, 0xbb, 0xc3, 0x80, 0xc5, 0x98, 0xc3, 0xa4, 0xe1, 0x9b, 0x9a, 0xc7,
+                0x90, 0xc3, 0xb5, 0xc8, 0xaf, 0xc2, 0xac, 0xe1, 0x9b, 0x9f, 0xc5, 0x82, 0x34, 0xce,
+                0x87, 0xc6, 0xa4, 0xc3, 0xa5, 0xc4, 0x89, 0x44, 0xc3, 0x8b, 0xc4, 0x84, 0xc7, 0xac,
+                0xe1, 0x9b, 0xb0, 0xc5, 0x82, 0x76, 0xc8, 0x99, 0xc4, 0x9d, 0xc7, 0xad, 0xc3, 0xa3,
+                0x31, 0xc3, 0xb2, 0xc5, 0x82, 0xc2, 0xbd, 0xc7, 0x8c, 0xc2, 0xb5, 0xe1, 0x9a, 0xaf,
+                0xc7, 0x9a, 0xe1, 0x9a, 0xbb, 0xc5, 0xa9, 0xc6, 0x94, 0xc7, 0x82, 0xe2, 0xb1, 0xb5,
+                0xc5, 0x9b, 0xe1, 0x9b, 0xa3, 0xc6, 0xb2, 0xc4, 0x88, 0x7d, 0xc4, 0x81, 0xc5, 0xb0,
+                0xe1, 0x9a, 0xa4, 0xc8, 0xbb, 0xe2, 0xb1, 0xbe, 0xc4, 0x98, 0xc4, 0xba, 0xc8, 0x8d,
+                0x68, 0xc4, 0x99, 0xc8, 0x86, 0x40, 0x59, 0xe1, 0x9a, 0xa1, 0xe1, 0x9b, 0x9a, 0xc7,
+                0x89, 0xc8, 0x99, 0xc7, 0xa8, 0x4e, 0xc9, 0x81, 0xc5, 0x92, 0xc8, 0xb0, 0xcd, 0xb2,
+                0xc7, 0xa4, 0xc8, 0x95, 0xe1, 0x9a, 0xb3, 0xc4, 0x88, 0x32, 0xc7, 0x88, 0xc2, 0xa7,
+                0x34, 0x75, 0xc6, 0xb0, 0xc7, 0x9f, 0xc8, 0xb2, 0x50, 0xc5, 0x95, 0xc7, 0xb9, 0x50,
+                0xc2, 0xa5, 0xc3, 0xa3, 0xc9, 0x84, 0xce, 0x85, 0xe1, 0x9b, 0xad, 0xc4, 0x9e, 0xe1,
+                0x9b, 0xa3, 0xc5, 0x81, 0x5d, 0xc6, 0xb8, 0xe1, 0x9a, 0xb7, 0xc4, 0x99, 0xc2, 0xb2,
+                0xc4, 0xa2, 0xc4, 0x99, 0xc6, 0x8f, 0x26, 0xc3, 0x88, 0xc4, 0xa3, 0xc5, 0x87, 0xc9,
+                0x8f, 0x59, 0xc8, 0x85, 0xc7, 0x9a, 0xe1, 0x9b, 0x8a, 0xe2, 0xb1, 0xb7, 0xc8, 0x83,
+                0xe1, 0x9b, 0x88, 0x61, 0xc6, 0xa9, 0xc4, 0xa2,
             ],
             asset_base: [
-                0x76, 0x3d, 0x56, 0xa8, 0x53, 0xf6, 0xac, 0x5e, 0xe8, 0xef, 0x29, 0x4e, 0xfd, 0x01,
-                0x42, 0xbe, 0x6c, 0x23, 0xc5, 0x18, 0x96, 0xfc, 0xb8, 0x3c, 0x40, 0x09, 0x4d, 0x34,
-                0x01, 0xc0, 0xc0, 0x94,
+                0x76, 0xe9, 0x3a, 0xa6, 0xa3, 0x60, 0x1a, 0x94, 0xdf, 0xde, 0x01, 0xd9, 0x8c, 0x63,
+                0xc6, 0xf1, 0x28, 0x5b, 0x22, 0x28, 0x47, 0x16, 0x86, 0x05, 0x85, 0x93, 0x7c, 0x3d,
+                0xaf, 0x60, 0x7b, 0xbc,
             ],
         },
         TestVector {
             key: [
-                0xec, 0x05, 0xbb, 0x7f, 0x06, 0x5e, 0x25, 0x6f, 0xf4, 0x54, 0xf8, 0xa8, 0xdf, 0x6f,
-                0x2f, 0x9b, 0x8a, 0x8c, 0x95, 0x08, 0xca, 0xac, 0xfe, 0xe9, 0x52, 0x1c, 0xbe, 0x68,
-                0x9d, 0xd1, 0x12, 0x0f,
+                0x56, 0x6e, 0x78, 0x1a, 0xc9, 0x8e, 0x99, 0x13, 0x08, 0x98, 0x1b, 0x7c, 0xdc, 0x73,
+                0x7c, 0x66, 0x78, 0x5b, 0xe5, 0x31, 0xe2, 0x0a, 0xef, 0x77, 0x7a, 0xac, 0xe0, 0x6d,
+                0x38, 0xfa, 0x02, 0x6b,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc6, 0xa4, 0xc7, 0xae, 0xe1, 0x9a, 0xa6, 0xc8, 0x91, 0xc2, 0xb5, 0xc8, 0xaa, 0xc3,
+                0x81, 0x2a, 0xc4, 0x90, 0xc6, 0xa0, 0xe1, 0x9a, 0xb0, 0xc3, 0x85, 0xc8, 0x8b, 0xc6,
+                0xaa, 0x4d, 0xc8, 0x94, 0xc7, 0x98, 0xc8, 0xa7, 0xc8, 0x9b, 0xc3, 0x8f, 0xe1, 0x9b,
+                0x81, 0xc2, 0xab, 0xe2, 0xb1, 0xa5, 0xc6, 0xb2, 0xce, 0x84, 0x73, 0xc5, 0xb1, 0x63,
+                0xc2, 0xb7, 0xc2, 0xb7, 0xc9, 0x87, 0xce, 0x8c, 0xc3, 0xb4, 0xc4, 0xba, 0xe1, 0x9b,
+                0x9b, 0x48, 0xcd, 0xbe, 0x28, 0xe2, 0xb1, 0xbd, 0xe1, 0x9a, 0xa9, 0xc5, 0x9d, 0x61,
+                0xc4, 0xbe, 0xc2, 0xbf, 0xc3, 0x9f, 0xc7, 0xa5, 0xc5, 0xb0, 0x67, 0xc7, 0x99, 0xe2,
+                0xb1, 0xa7, 0xc5, 0xac, 0xc4, 0xbe, 0xc8, 0xa6, 0xe1, 0x9a, 0xaa, 0xc7, 0xb9, 0xc9,
+                0x88, 0xc6, 0x9f, 0xe2, 0xb1, 0xa2, 0xe1, 0x9a, 0xaa, 0xc3, 0x89, 0xc3, 0x83, 0xc7,
+                0x87, 0xc2, 0xac, 0xc7, 0xa5, 0xe1, 0x9b, 0xae, 0xc4, 0xb0, 0xc3, 0xa6, 0xc6, 0x90,
+                0xc7, 0xb2, 0xc3, 0xa7, 0xc2, 0xb8, 0xc5, 0x9a, 0xc5, 0xa1, 0xe1, 0x9b, 0x8c, 0xc5,
+                0xac, 0xc8, 0xb7, 0xe2, 0xb1, 0xa8, 0xc3, 0xbc, 0xc9, 0x8e, 0x5e, 0xc2, 0xb4, 0xc7,
+                0xb3, 0xc5, 0xba, 0xc8, 0xac, 0xc6, 0x92, 0x6c, 0x2a, 0xc4, 0x82, 0xc5, 0xac, 0xc5,
+                0xaf, 0xc8, 0x99, 0xc8, 0xbd, 0xc2, 0xb3, 0xe1, 0x9a, 0xb4, 0x3f, 0xe1, 0x9a, 0xb5,
+                0xcd, 0xb2, 0x6b, 0xc3, 0x98, 0xc3, 0xbd, 0xc3, 0x9c, 0xc2, 0xac, 0x3b, 0xc6, 0xa8,
+                0xc3, 0x8c, 0x58, 0x2f, 0x5e, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0x95, 0xe1, 0x9b, 0xa1,
+                0xe2, 0xb1, 0xba, 0xc7, 0xa4, 0xe2, 0xb1, 0xa0, 0xc4, 0x9d, 0xc3, 0xa4, 0xe1, 0x9b,
+                0xa5, 0xe2, 0xb1, 0xab, 0xc6, 0x83, 0xc2, 0xa4, 0x4e, 0xc4, 0xb1, 0xe1, 0x9b, 0xa9,
+                0xc8, 0xb1, 0xc5, 0x93, 0xe2, 0xb1, 0xae, 0xc7, 0x99, 0xc3, 0xbe, 0xe2, 0xb1, 0xa3,
+                0x7a, 0x60, 0xc7, 0x94, 0xe2, 0xb1, 0xac, 0xe1, 0x9b, 0x80, 0xc8, 0xad, 0xc8, 0x93,
+                0x48, 0xe1, 0x9b, 0x83, 0xc6, 0xab, 0xe1, 0x9a, 0xa2, 0xc4, 0xbe, 0xc3, 0x89, 0xc7,
+                0xb7, 0xcd, 0xb5, 0xc6, 0x88, 0xe1, 0x9b, 0x85, 0x6a, 0x43, 0xc9, 0x84, 0xc7, 0x91,
+                0x31, 0xc9, 0x8b, 0xe1, 0x9a, 0xa8, 0x6e, 0xc7, 0x96, 0xc3, 0x9c, 0x28, 0xc3, 0x90,
+                0x41, 0xc5, 0x8b, 0xc5, 0x8d, 0xc2, 0xab, 0xcd, 0xb5, 0xc7, 0xb0, 0x5d, 0xc3, 0x8b,
+                0xc8, 0xaa, 0xe2, 0xb1, 0xa6, 0xe2, 0xb1, 0xbf, 0xc6, 0xb7, 0xe1, 0x9a, 0xb8, 0xc5,
+                0xbb, 0xe1, 0x9a, 0xaf, 0xe2, 0xb1, 0xb3, 0xc7, 0xa8, 0xc8, 0xb8, 0xc4, 0xb0, 0xe2,
+                0xb1, 0xaf, 0xe1, 0x9b, 0xa9, 0xe1, 0x9b, 0x9f, 0xc3, 0x81, 0xc2, 0xaa, 0xc5, 0xae,
+                0xc5, 0x83, 0x65, 0xc7, 0xbd, 0xc5, 0x9d, 0x2f, 0xc5, 0x91, 0xc6, 0xb6, 0xc2, 0xb9,
+                0xc2, 0xa1, 0x4b, 0xc6, 0x9f, 0xc3, 0xb9, 0xcd, 0xb1, 0xe1, 0x9a, 0xbb, 0xc8, 0xad,
+                0xc2, 0xa1, 0xc3, 0x9c, 0xc3, 0x8f, 0xc5, 0x8e, 0xc3, 0xb5, 0xc2, 0xb7, 0xc4, 0xa4,
+                0xc5, 0xa5, 0xe1, 0x9b, 0x8b, 0xc4, 0xb2, 0xc2, 0xa2, 0xc7, 0x86, 0xc3, 0xb8, 0x4c,
+                0xc3, 0x9b, 0xc5, 0x81, 0xc5, 0x95, 0xe1, 0x9b, 0x85, 0xc6, 0x94, 0xc4, 0xa6, 0xc4,
+                0xac, 0x4f, 0xc3, 0xb0, 0xe1, 0x9b, 0xad, 0xc7, 0xa4, 0xc2, 0xa4, 0xc5, 0xa4, 0xe1,
+                0x9a, 0xbb, 0xc4, 0xa4, 0xe1, 0x9a, 0xbf, 0xc3, 0xb6, 0xc6, 0xaf, 0xc6, 0xbb, 0xc8,
+                0x94, 0xc3, 0xa6, 0xc3, 0xb4, 0xe1, 0x9b, 0x9c, 0xc3, 0x9b, 0xc7, 0xb3, 0xc5, 0xbc,
+                0xce, 0x8a, 0xc7, 0xb2, 0xc3, 0xa9, 0x23, 0xc5, 0xa0, 0xc7, 0xba, 0xc2, 0xa1, 0xc9,
+                0x85, 0xc6, 0xa9, 0xc7, 0xac, 0xc7, 0x9f, 0x5a,
             ],
             asset_base: [
-                0x90, 0x10, 0xb3, 0x4c, 0xdf, 0xfd, 0x95, 0x84, 0x96, 0x62, 0x44, 0xdd, 0x6c, 0x3a,
-                0x23, 0x4f, 0xc6, 0xa0, 0x74, 0xf1, 0xa9, 0xc9, 0xb2, 0xd8, 0x3d, 0x1c, 0x2c, 0x04,
-                0xf5, 0x30, 0x75, 0x0c,
+                0x50, 0xf6, 0x66, 0x1f, 0x02, 0x22, 0x48, 0x1e, 0x18, 0x94, 0x80, 0x9a, 0x17, 0xd0,
+                0xaf, 0xeb, 0x5e, 0xf9, 0x74, 0x34, 0x43, 0x5d, 0x32, 0xa0, 0x4b, 0x3b, 0x16, 0xb2,
+                0x45, 0xc8, 0xed, 0x0a,
             ],
         },
         TestVector {
             key: [
-                0xb0, 0xfa, 0x9d, 0x77, 0xfc, 0xbd, 0x96, 0x45, 0x91, 0x32, 0xe3, 0x05, 0xe3, 0x24,
-                0xe7, 0x93, 0x6a, 0xe1, 0x3b, 0x15, 0x14, 0x7e, 0x20, 0x5d, 0x7b, 0xae, 0x42, 0xfa,
-                0x7f, 0xaf, 0x5d, 0x1e,
+                0x86, 0xcc, 0x5e, 0x4f, 0xea, 0x9b, 0x7c, 0x1d, 0x0e, 0x1f, 0xa8, 0xb6, 0xa8, 0xf2,
+                0x31, 0xb4, 0x56, 0x2e, 0x53, 0x89, 0xe9, 0xe7, 0x92, 0x16, 0x57, 0x67, 0x96, 0xce,
+                0x3a, 0x49, 0x40, 0x6b,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc2, 0xa1, 0xc4, 0x8e, 0xc3, 0x9f, 0xc5, 0xbb, 0x74, 0xc4, 0x82, 0xc5, 0xbb, 0x7d,
+                0xc6, 0xae, 0xc8, 0xa9, 0xe2, 0xb1, 0xbf, 0xc7, 0x90, 0xc7, 0x93, 0xc9, 0x89, 0xc7,
+                0xa5, 0xc6, 0x8b, 0xc7, 0xbd, 0xe2, 0xb1, 0xb9, 0xcd, 0xbd, 0x4c, 0xcd, 0xbe, 0xc5,
+                0x8d, 0x4d, 0xc4, 0xb2, 0xe2, 0xb1, 0xa3, 0x31, 0xe1, 0x9a, 0xbe, 0xc8, 0xa1, 0xc4,
+                0xab, 0x58, 0xc7, 0x89, 0xc4, 0xb3, 0x7d, 0xc9, 0x88, 0xc7, 0xbc, 0xc4, 0x8d, 0xc4,
+                0xae, 0xc4, 0x98, 0xc7, 0xaa, 0xc3, 0xb4, 0xc5, 0xbe, 0xc6, 0x98, 0x2b, 0xc2, 0xb3,
+                0xc7, 0xaa, 0xc6, 0x83, 0xc6, 0x92, 0xc6, 0xb8, 0xe1, 0x9b, 0xaf, 0xc4, 0x95, 0xc4,
+                0xbc, 0xc8, 0xa5, 0xc3, 0xb9, 0xc3, 0xae, 0xc4, 0xa8, 0xc6, 0x82, 0xe1, 0x9a, 0xad,
+                0xc3, 0xab, 0xc8, 0x88, 0xc4, 0x9c, 0xc5, 0xba, 0xce, 0x87, 0xc3, 0x8b, 0xc7, 0xaf,
+                0xc8, 0xa6, 0xe1, 0x9b, 0x8d, 0xe1, 0x9b, 0x9f, 0xc2, 0xb3, 0xc7, 0x9e, 0x73, 0xc5,
+                0x8a, 0x5c, 0xc5, 0x90, 0xc5, 0xb7, 0xc6, 0x87, 0xc5, 0x9a, 0xc3, 0x86, 0x78, 0xe1,
+                0x9b, 0x9c, 0xc7, 0xae, 0xc8, 0x94, 0xc9, 0x82, 0xc8, 0xb8, 0x69, 0xc8, 0xb3, 0xc5,
+                0x92, 0xe1, 0x9a, 0xa7, 0xc6, 0xb1, 0xc3, 0x85, 0xc5, 0xa5, 0xc4, 0xab, 0xc7, 0x97,
+                0xe1, 0x9a, 0xb2, 0xc7, 0xb7, 0xc8, 0xa9, 0xe1, 0x9b, 0x92, 0xc3, 0xb8, 0xce, 0x86,
+                0xc5, 0xa1, 0x5d, 0xc4, 0xb9, 0xce, 0x88, 0xc6, 0xb1, 0xc7, 0xb2, 0xc6, 0x90, 0xc6,
+                0xaf, 0xe1, 0x9a, 0xb5, 0xce, 0x8c, 0x25, 0x47, 0xc6, 0xb1, 0xc4, 0x92, 0xc8, 0xba,
+                0xc6, 0x95, 0xc8, 0xa6, 0xe2, 0xb1, 0xb5, 0xc5, 0xb0, 0xe2, 0xb1, 0xb3, 0xc7, 0xa5,
+                0xc5, 0x98, 0xc8, 0xbb, 0xc4, 0x9b, 0xc5, 0x83, 0xc4, 0x82, 0xe2, 0xb1, 0xbf, 0xc4,
+                0x9b, 0xc6, 0xa8, 0xc8, 0x8e, 0xe1, 0x9b, 0x88, 0xc8, 0xba, 0x2d, 0x54, 0xe1, 0x9a,
+                0xb1, 0xc2, 0xa9, 0xe1, 0x9b, 0x97, 0xc9, 0x8a, 0xc5, 0x8a, 0xc4, 0x80, 0xc8, 0xb1,
+                0xc4, 0x9e, 0xc7, 0xac, 0xc3, 0x82, 0xc7, 0xb6, 0xc4, 0x8f, 0xc5, 0xa6, 0xc4, 0x98,
+                0xe2, 0xb1, 0xa4, 0x3f, 0xcd, 0xb5, 0xc4, 0xa8, 0xc8, 0xa7, 0xe1, 0x9a, 0xb9, 0xc8,
+                0xad, 0xe1, 0x9b, 0xaa, 0xc4, 0x97, 0xc7, 0xb9, 0x3d, 0xc6, 0xb9, 0xc8, 0x86, 0xc5,
+                0x9d, 0xc2, 0xa4, 0xc7, 0xba, 0xc6, 0xb1, 0xc7, 0xbb, 0xe1, 0x9a, 0xa8, 0xc7, 0x99,
+                0xc6, 0x93, 0x71, 0x5c, 0xc3, 0x91, 0xc8, 0x82, 0xc3, 0x9c, 0x3c, 0xc2, 0xa1, 0xe2,
+                0xb1, 0xba, 0x5b, 0xc5, 0x9a, 0xc6, 0xba, 0x54, 0xce, 0x88, 0xe1, 0x9a, 0xad, 0x6a,
+                0xc7, 0xb5, 0xe2, 0xb1, 0xbf, 0xc4, 0xbd, 0x39, 0xc9, 0x8b, 0xc8, 0x8e, 0x76, 0x49,
+                0xc6, 0xb2, 0xc7, 0xbc, 0x31, 0xc7, 0xa8, 0xc9, 0x88, 0xc4, 0xab, 0xc5, 0x90, 0xc3,
+                0x9f, 0xc3, 0x91, 0xe1, 0x9a, 0xbf, 0xe1, 0x9b, 0xab, 0xc5, 0xab, 0xe2, 0xb1, 0xbe,
+                0xe2, 0xb1, 0xa6, 0xc9, 0x86, 0xc5, 0x97, 0xe1, 0x9a, 0xa1, 0x63, 0xc7, 0x9c, 0xc8,
+                0xab, 0xe1, 0x9a, 0xaa, 0x3a, 0xc6, 0x8b, 0xc3, 0x82, 0xe2, 0xb1, 0xa7, 0xe1, 0x9b,
+                0x9d, 0xc2, 0xb2, 0xe1, 0x9b, 0x98, 0x4c, 0xce, 0x85, 0xc5, 0xbb, 0x6c, 0xc4, 0xb5,
+                0xc3, 0xb6, 0xc2, 0xa3, 0xc8, 0xb2, 0xc8, 0x8f, 0xc5, 0x8a, 0x3f, 0x74, 0xc7, 0x8c,
+                0x63, 0xe1, 0x9a, 0xa6, 0xc3, 0x98, 0xc8, 0xb9, 0xc7, 0x9b, 0x45, 0xc6, 0x9a, 0xc7,
+                0xb1, 0xc2, 0xba, 0x6c, 0x62, 0x66, 0xe1, 0x9a, 0xb7, 0xe1, 0x9b, 0xa3, 0xe1, 0x9b,
+                0x8c, 0xe1, 0x9b, 0x80, 0xc2, 0xb0, 0xc8, 0xaa, 0xc5, 0xbc, 0xc5, 0xb0, 0xc4, 0xa0,
+                0xcd, 0xb4, 0xc7, 0x9a, 0x3f, 0xc4, 0x85, 0x5a,
             ],
             asset_base: [
-                0xbd, 0x61, 0xcd, 0xd1, 0x35, 0x54, 0x21, 0x00, 0x57, 0xaa, 0xef, 0xc0, 0xf0, 0xc7,
-                0xc0, 0xbe, 0x9c, 0xdb, 0xef, 0x14, 0xe8, 0x79, 0xac, 0x10, 0xf3, 0xd2, 0x66, 0xad,
-                0x18, 0x39, 0xc2, 0x1b,
+                0xc9, 0x01, 0x55, 0x24, 0x71, 0x2e, 0x93, 0xf3, 0x40, 0x41, 0x31, 0x02, 0xda, 0x68,
+                0xaf, 0xb4, 0xf5, 0x5f, 0xa2, 0x94, 0x4a, 0xc4, 0xc8, 0x32, 0x34, 0xb5, 0x8a, 0x1d,
+                0x7a, 0x9c, 0xb6, 0x95,
             ],
         },
         TestVector {
             key: [
-                0x81, 0x8f, 0x50, 0xce, 0x47, 0x10, 0xf4, 0xeb, 0x11, 0xe7, 0x43, 0xe6, 0x40, 0x85,
-                0x44, 0xaa, 0x3c, 0x12, 0x3c, 0x7f, 0x07, 0xe2, 0xaa, 0xbb, 0x91, 0xaf, 0xc4, 0xec,
-                0x48, 0x78, 0x8d, 0xe9,
+                0x43, 0x39, 0xfd, 0x2a, 0x6c, 0x66, 0x30, 0x2e, 0x31, 0x8e, 0x18, 0x41, 0xf7, 0xe6,
+                0x36, 0xb7, 0x76, 0x58, 0xda, 0xfc, 0x9c, 0x8e, 0x96, 0x45, 0xc9, 0x46, 0xe9, 0x5e,
+                0x56, 0x9c, 0x3c, 0x45,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc9, 0x80, 0xc4, 0x80, 0xe1, 0x9a, 0xb0, 0xc4, 0xa3, 0xc6, 0x8e, 0xc5, 0xb2, 0xc6,
+                0x8e, 0x3f, 0xc8, 0xb7, 0xc6, 0xb4, 0xc6, 0xb5, 0x65, 0xc7, 0xa5, 0xc8, 0x9e, 0xc6,
+                0x97, 0xc3, 0xb1, 0xc6, 0x9c, 0xcd, 0xbd, 0x29, 0xc9, 0x88, 0xc2, 0xa2, 0xce, 0x86,
+                0xc3, 0xb8, 0xc6, 0x9f, 0x3e, 0xc8, 0x81, 0xc3, 0x99, 0xc3, 0x88, 0xc7, 0xa2, 0xc5,
+                0xb5, 0xc5, 0xb0, 0xc6, 0xa2, 0xc8, 0x89, 0xc6, 0x8c, 0xe1, 0x9b, 0xae, 0xc7, 0x83,
+                0xcd, 0xba, 0xcd, 0xb5, 0xc3, 0xbc, 0xe1, 0x9b, 0xab, 0xc5, 0x8e, 0xc7, 0xb3, 0xc7,
+                0xa7, 0xc4, 0xb5, 0xc3, 0x8b, 0xc3, 0xbf, 0x5e, 0xe1, 0x9a, 0xa0, 0xc6, 0xbe, 0xc8,
+                0xb5, 0x31, 0xe2, 0xb1, 0xbe, 0xc7, 0x90, 0x7a, 0xc6, 0x81, 0x2a, 0xc7, 0xb7, 0xc3,
+                0xbc, 0xc2, 0xb4, 0xc8, 0xa4, 0xc6, 0xa8, 0x64, 0xc7, 0x99, 0xc4, 0xa4, 0xc2, 0xbb,
+                0xcd, 0xb1, 0xc6, 0xb0, 0xe1, 0x9b, 0xad, 0xc6, 0x95, 0x43, 0xc8, 0xb9, 0xc5, 0x98,
+                0xc7, 0xb6, 0xc7, 0x9d, 0xc4, 0x8d, 0xc3, 0x90, 0x6c, 0xc7, 0x98, 0xc9, 0x80, 0xc2,
+                0xae, 0xc6, 0x80, 0xc8, 0xba, 0xcd, 0xba, 0xc7, 0xa7, 0x41, 0xc6, 0xbf, 0xc4, 0x96,
+                0xc7, 0x84, 0xc3, 0xa7, 0xc9, 0x89, 0xc8, 0xa2, 0xc8, 0x92, 0x71, 0xc2, 0xb5, 0xc4,
+                0x9c, 0xc3, 0xbc, 0xc3, 0x84, 0xe1, 0x9b, 0xa4, 0x3b, 0xc7, 0x9d, 0xc4, 0xb9, 0xc4,
+                0x9a, 0xc5, 0x93, 0xe1, 0x9a, 0xbb, 0xc8, 0x96, 0xc7, 0xa9, 0xc6, 0x8d, 0xc8, 0xb7,
+                0x72, 0xc5, 0x8d, 0xc5, 0x83, 0xc4, 0x80, 0xc2, 0xb3, 0xc3, 0xb2, 0xc7, 0xa1, 0xc8,
+                0x9c, 0xc3, 0x9c, 0xc6, 0x8a, 0xc3, 0xa2, 0xe1, 0x9b, 0x93, 0xc5, 0xa1, 0xc2, 0xa1,
+                0xe1, 0x9b, 0x9a, 0xc3, 0xa5, 0xc3, 0x97, 0xc7, 0x82, 0xc2, 0xb4, 0xc3, 0x89, 0xc3,
+                0xb3, 0xc9, 0x83, 0x70, 0xc7, 0xb8, 0xc5, 0xa4, 0xc8, 0x83, 0xc4, 0xb5, 0xc8, 0x84,
+                0xc8, 0xa3, 0xe1, 0x9b, 0x86, 0xc7, 0x8c, 0xe2, 0xb1, 0xb5, 0x68, 0x5e, 0xc3, 0x8f,
+                0xe2, 0xb1, 0xa6, 0xc6, 0xa1, 0xc8, 0xb9, 0xc4, 0x92, 0xc9, 0x8a, 0xc3, 0x8c, 0xe1,
+                0x9b, 0x83, 0xe1, 0x9b, 0xa3, 0x4b, 0x59, 0xc8, 0xb9, 0xc6, 0xa6, 0xc8, 0x8d, 0xc6,
+                0x8f, 0xe2, 0xb1, 0xba, 0xc5, 0xa4, 0xc8, 0xa7, 0xc5, 0xad, 0xc3, 0x95, 0xe1, 0x9a,
+                0xb5, 0xc5, 0xa4, 0xe2, 0xb1, 0xbd, 0xe1, 0x9b, 0xad, 0xc3, 0x92, 0xcd, 0xbe, 0xc6,
+                0xa8, 0xc6, 0x83, 0xc4, 0x80, 0xe1, 0x9b, 0x84, 0xc3, 0xbc, 0xc5, 0x88, 0xe1, 0x9b,
+                0x89, 0xc7, 0xb0, 0xc2, 0xba, 0xc3, 0x9f, 0xc9, 0x8e, 0xc3, 0x98, 0xc8, 0xbd, 0xc5,
+                0x99, 0xc8, 0x90, 0xc2, 0xae, 0xe1, 0x9a, 0xb9, 0xe1, 0x9b, 0x8d, 0xc6, 0xb8, 0xc2,
+                0xb0, 0xe1, 0x9b, 0xa9, 0xc7, 0x89, 0xc9, 0x8d, 0xc8, 0xaf, 0xc5, 0xa4, 0xc4, 0x9f,
+                0xc4, 0x98, 0xc7, 0x84, 0xc8, 0x99, 0xc3, 0x86, 0xc5, 0xa8, 0xe1, 0x9b, 0x94, 0x7e,
+                0xc8, 0xa2, 0xc8, 0x9b, 0xc3, 0xa1, 0xce, 0x89, 0xe2, 0xb1, 0xa6, 0x51, 0xc4, 0x88,
+                0xc2, 0xa2, 0xe1, 0x9a, 0xb3, 0xe2, 0xb1, 0xb9, 0xe2, 0xb1, 0xa6, 0x41, 0xe2, 0xb1,
+                0xbc, 0xc5, 0xa3, 0xc3, 0x9c, 0xc8, 0x95, 0xc5, 0xab, 0xc3, 0xb4, 0x42, 0xc6, 0xb3,
+                0xe1, 0x9b, 0x96, 0xe1, 0x9b, 0x98, 0xe1, 0x9b, 0xa7, 0xc6, 0x92, 0xc4, 0xa1, 0xe1,
+                0x9b, 0xac, 0xc8, 0xb0, 0xc6, 0x91, 0xc7, 0x8f, 0x25, 0xc9, 0x86, 0xc6, 0x83, 0xc3,
+                0xb4, 0xc5, 0xb5, 0xc5, 0x9f, 0xe1, 0x9b, 0x8a, 0xc6, 0x9d, 0xc8, 0x8a, 0xe1, 0x9b,
+                0xa3, 0xe1, 0x9b, 0xa6, 0xe1, 0x9a, 0xb8, 0xe2, 0xb1, 0xa1, 0xc4, 0x9a, 0xc6, 0x86,
+                0xc3, 0xa7, 0x5c, 0xe1, 0x9b, 0x97, 0x47, 0x5a,
             ],
             asset_base: [
-                0xae, 0xc8, 0x2d, 0x62, 0x1d, 0x97, 0xcf, 0x35, 0xfb, 0xef, 0x86, 0x88, 0xc5, 0xc8,
-                0x30, 0xa0, 0xfd, 0x9c, 0x4a, 0xf7, 0x37, 0x0a, 0x15, 0xc8, 0x99, 0xb2, 0x84, 0x86,
-                0xb3, 0xf0, 0x96, 0x20,
+                0x13, 0x42, 0x79, 0x82, 0x9b, 0x56, 0xe2, 0xb0, 0x4a, 0xa0, 0xfb, 0x95, 0xf7, 0xfc,
+                0x73, 0x79, 0x67, 0x24, 0x5d, 0x49, 0x6a, 0x6d, 0xfa, 0xa0, 0x28, 0x35, 0x2c, 0x39,
+                0x2a, 0x58, 0x0d, 0x22,
             ],
         },
         TestVector {
             key: [
-                0x0b, 0xb4, 0x91, 0x3d, 0xba, 0xf1, 0x4e, 0xf6, 0xd0, 0xad, 0xeb, 0x8b, 0x70, 0x27,
-                0xbf, 0x0b, 0x9a, 0x8f, 0x59, 0x0d, 0x3e, 0x2d, 0x95, 0xa1, 0x2d, 0xba, 0xaf, 0x0b,
-                0x95, 0x33, 0xdc, 0xa4,
+                0x46, 0x2e, 0xe2, 0x38, 0x00, 0xc2, 0x1e, 0x2b, 0xbd, 0x90, 0x2b, 0xf7, 0x2f, 0x60,
+                0xe1, 0xab, 0x08, 0x26, 0xd3, 0x68, 0x0c, 0x6f, 0xd0, 0xa2, 0x6f, 0x87, 0xdb, 0xac,
+                0xd0, 0xd7, 0x6c, 0xa0,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc6, 0x96, 0x5e, 0x38, 0xc5, 0xa9, 0x73, 0x21, 0xc9, 0x88, 0xcd, 0xb7, 0xc3, 0xba,
+                0xc5, 0x83, 0xc5, 0x99, 0xc8, 0x80, 0xc6, 0xbb, 0xe1, 0x9a, 0xb3, 0xc5, 0x98, 0xe1,
+                0x9a, 0xa1, 0x72, 0xe1, 0x9b, 0x83, 0xc7, 0xa7, 0xc8, 0xbb, 0xc7, 0x95, 0xc6, 0xa7,
+                0xc7, 0x9b, 0xc4, 0xbf, 0xc7, 0x97, 0xc3, 0xb1, 0xc3, 0x84, 0xe2, 0xb1, 0xa4, 0xc9,
+                0x83, 0xc4, 0x96, 0xe2, 0xb1, 0xae, 0xc5, 0xb3, 0xc4, 0x82, 0xc8, 0xbd, 0xe1, 0x9b,
+                0x95, 0xc6, 0x92, 0xe1, 0x9a, 0xa8, 0xc3, 0xb2, 0x25, 0xe1, 0x9b, 0x96, 0xc7, 0x90,
+                0xc9, 0x80, 0xc3, 0x93, 0xc4, 0xa4, 0xc7, 0xb1, 0xc7, 0x82, 0xc4, 0x9b, 0xc9, 0x80,
+                0xc5, 0x8c, 0xe1, 0x9b, 0xa7, 0x48, 0xc4, 0xb7, 0xcd, 0xb6, 0xc9, 0x8d, 0xc8, 0x9f,
+                0xc9, 0x8d, 0xc5, 0xb5, 0xc8, 0x95, 0x79, 0xc4, 0xb6, 0xc5, 0xbb, 0xc4, 0x96, 0xe1,
+                0x9a, 0xbb, 0xc3, 0xb1, 0xc3, 0xbb, 0x64, 0xc4, 0xbb, 0xc7, 0x84, 0xc8, 0x82, 0xe1,
+                0x9a, 0xa4, 0x33, 0xcd, 0xb4, 0xc7, 0x8b, 0xc6, 0xaa, 0xc8, 0xba, 0xc3, 0xb4, 0xe2,
+                0xb1, 0xbb, 0xe1, 0x9a, 0xb7, 0xc5, 0x89, 0x7a, 0xc2, 0xaa, 0xc8, 0x97, 0xc4, 0x9c,
+                0xc4, 0xab, 0xc6, 0xb1, 0xc3, 0x9d, 0xc3, 0x95, 0xc3, 0xbf, 0xe2, 0xb1, 0xbf, 0xce,
+                0x8c, 0x7a, 0xc8, 0xab, 0xc5, 0xa1, 0xc5, 0xa4, 0xc5, 0xb4, 0x24, 0xe2, 0xb1, 0xbf,
+                0xc5, 0xb9, 0xe1, 0x9a, 0xb3, 0x60, 0xc5, 0xb8, 0x45, 0xc9, 0x83, 0x74, 0xc7, 0x86,
+                0xc2, 0xbe, 0xc5, 0xb9, 0xc7, 0xab, 0xc7, 0x86, 0xc4, 0x84, 0xc5, 0x9b, 0xc6, 0x91,
+                0xc4, 0x93, 0xc3, 0x93, 0xc5, 0xa6, 0xc8, 0x93, 0xc7, 0xbd, 0xc2, 0xb3, 0xcd, 0xba,
+                0xc3, 0xb9, 0xc2, 0xb8, 0xc3, 0x87, 0xc8, 0xa1, 0xc6, 0x83, 0xc5, 0xbd, 0xe1, 0x9a,
+                0xa7, 0xc8, 0x92, 0x43, 0xe1, 0x9b, 0x80, 0xc3, 0xb5, 0xc7, 0x8f, 0x74, 0x5a, 0xc6,
+                0x94, 0xc5, 0x80, 0xc9, 0x81, 0xc4, 0xbe, 0xc6, 0xb3, 0xc2, 0xa8, 0xc7, 0xb7, 0xc6,
+                0xb9, 0xc3, 0x97, 0xc6, 0xb7, 0xc6, 0xb4, 0xc6, 0x80, 0xc2, 0xb7, 0xc8, 0xa3, 0xcd,
+                0xb1, 0xc7, 0xb4, 0xc7, 0xb0, 0xc7, 0xb2, 0xc7, 0x9f, 0xc2, 0xa2, 0xc3, 0xa6, 0xe2,
+                0xb1, 0xa1, 0xe2, 0xb1, 0xb3, 0xe1, 0x9b, 0xa6, 0xcd, 0xbd, 0xe1, 0x9b, 0x88, 0xc6,
+                0xb1, 0xc3, 0xaf, 0x42, 0x6f, 0xe1, 0x9b, 0xa2, 0xe2, 0xb1, 0xa7, 0xc5, 0x86, 0x6c,
+                0xc3, 0x9b, 0xc2, 0xbc, 0xc8, 0x8f, 0xc2, 0xa9, 0xc8, 0xbd, 0xe2, 0xb1, 0xbc, 0xe2,
+                0xb1, 0xb5, 0xe1, 0x9b, 0x83, 0x37, 0x37, 0xe2, 0xb1, 0xa0, 0xcd, 0xb5, 0xc7, 0xb7,
+                0x64, 0xc7, 0xbb, 0xc7, 0xa5, 0xe1, 0x9a, 0xb7, 0xc3, 0xb4, 0xc7, 0x95, 0xc2, 0xb5,
+                0xe1, 0x9b, 0x82, 0xc9, 0x81, 0xc4, 0xb6, 0xc7, 0xae, 0x26, 0xc4, 0xb6, 0x3e, 0xc3,
+                0xba, 0xc3, 0xb7, 0xc7, 0x89, 0xc8, 0x87, 0xc7, 0x9d, 0xc5, 0xa5, 0xe2, 0xb1, 0xa8,
+                0xc3, 0x96, 0xcd, 0xb7, 0x75, 0xe2, 0xb1, 0xa0, 0xc7, 0xa6, 0xc7, 0x83, 0x30, 0xc7,
+                0xb8, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0x9a, 0xc3, 0xb8, 0xe2, 0xb1, 0xa3, 0x26, 0xc6,
+                0x8a, 0xc6, 0x90, 0xc3, 0x8f, 0xe2, 0xb1, 0xa2, 0xc4, 0x88, 0xc2, 0xb3, 0xc9, 0x82,
+                0x79, 0xc7, 0x8a, 0xc4, 0xb3, 0x78, 0xc5, 0xb6, 0xc3, 0x9c, 0x36, 0xc4, 0xa7, 0xc3,
+                0xab, 0xc6, 0x87, 0xc5, 0xb4, 0xc6, 0xa2, 0xc7, 0x97, 0xc5, 0x96, 0xc9, 0x8c, 0x2b,
+                0xc6, 0x80, 0xc7, 0x99, 0xc8, 0xb7, 0xc7, 0xb9, 0xc3, 0xa1, 0xc7, 0x8e, 0x7a, 0xc8,
+                0x91, 0xe1, 0x9a, 0xb2, 0xe1, 0x9a, 0xae, 0x5f, 0xe1, 0x9b, 0x9b, 0xc6, 0x93, 0x3f,
+                0xc3, 0xbd, 0xc3, 0xb2, 0xc8, 0x9a, 0xc8, 0x9f,
             ],
             asset_base: [
-                0x4b, 0xec, 0xc4, 0x9b, 0x22, 0x54, 0xb4, 0xdd, 0x36, 0x28, 0xac, 0x96, 0xdc, 0xda,
-                0x24, 0x70, 0x0e, 0xf8, 0xd7, 0x30, 0x5a, 0x25, 0x4e, 0x8e, 0x0c, 0xa6, 0xce, 0x23,
-                0x91, 0x3f, 0xd8, 0x0d,
+                0xe4, 0xb5, 0xf3, 0x96, 0x78, 0x10, 0xbc, 0x94, 0xfe, 0x85, 0x44, 0x13, 0x38, 0x48,
+                0xab, 0x35, 0xf6, 0xa5, 0x22, 0x2b, 0x0e, 0x74, 0xa8, 0xd3, 0xf0, 0x35, 0xdb, 0xdc,
+                0x31, 0xa6, 0x3d, 0x04,
             ],
         },
         TestVector {
             key: [
-                0xae, 0x36, 0xb6, 0x1a, 0x3d, 0x10, 0xf1, 0xaa, 0x75, 0x2a, 0xb1, 0xdc, 0x16, 0xe3,
-                0xe4, 0x9b, 0x6a, 0xc0, 0xd2, 0xae, 0x19, 0x07, 0xd2, 0xe6, 0x94, 0x25, 0xec, 0x12,
-                0xc9, 0x3a, 0xae, 0xbc,
+                0x9e, 0x94, 0xc3, 0xbb, 0x8a, 0xb5, 0x31, 0x98, 0xd3, 0x9e, 0xf1, 0xb4, 0x05, 0xd1,
+                0x75, 0x39, 0x20, 0x6f, 0x1b, 0x9f, 0x8e, 0xe9, 0xbc, 0x62, 0x58, 0xb5, 0xfe, 0xf5,
+                0xb3, 0x0a, 0xb9, 0x4d,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0x76, 0xe1, 0x9b, 0xa3, 0xc5, 0x8f, 0xc3, 0x95, 0xc6, 0xa6, 0x65, 0xc3, 0x9f, 0xc7,
+                0xb0, 0xc6, 0x9c, 0xc4, 0x9d, 0xc5, 0xb8, 0xc6, 0x9c, 0x71, 0xe1, 0x9a, 0xbe, 0xc3,
+                0xb4, 0xc8, 0xa4, 0xe1, 0x9b, 0xb0, 0x25, 0xc4, 0xaa, 0xc3, 0x9a, 0xe1, 0x9b, 0x8c,
+                0xc8, 0x9e, 0x59, 0xe1, 0x9a, 0xb1, 0xc6, 0x91, 0xc2, 0xa2, 0x6b, 0xc7, 0xac, 0xc8,
+                0xad, 0x77, 0xc7, 0xa4, 0xc5, 0xa2, 0xc6, 0x9d, 0xc3, 0x92, 0x29, 0x38, 0xc3, 0x9a,
+                0xc9, 0x86, 0xc4, 0xac, 0xc2, 0xa4, 0xc3, 0x9b, 0xc6, 0xa4, 0x29, 0xce, 0x86, 0xc6,
+                0xab, 0xe1, 0x9b, 0xa8, 0xe1, 0x9a, 0xb5, 0xc3, 0xa9, 0xc6, 0x84, 0xe1, 0x9a, 0xb1,
+                0xc3, 0xb7, 0xe2, 0xb1, 0xbd, 0xc8, 0xb6, 0xc7, 0x9d, 0xc8, 0xa8, 0xc6, 0xa4, 0xe1,
+                0x9a, 0xae, 0xe2, 0xb1, 0xad, 0xc5, 0xac, 0xc4, 0x99, 0xe1, 0x9a, 0xb1, 0xc9, 0x8c,
+                0xc6, 0x85, 0xe2, 0xb1, 0xa3, 0xe1, 0x9b, 0xa6, 0xc4, 0xba, 0xcd, 0xbe, 0xe1, 0x9b,
+                0x80, 0xe1, 0x9b, 0x9c, 0xc6, 0xb3, 0xc8, 0x84, 0xc5, 0x95, 0xc3, 0xae, 0xc9, 0x8a,
+                0xc5, 0xbc, 0xc4, 0xbd, 0xc6, 0xbe, 0xe1, 0x9a, 0xa6, 0xe1, 0x9a, 0xb1, 0x51, 0xc8,
+                0x93, 0xc3, 0x8e, 0xc6, 0x83, 0xc5, 0xbb, 0xe1, 0x9b, 0x89, 0xe1, 0x9b, 0x8a, 0xc5,
+                0xb1, 0x6a, 0xe1, 0x9a, 0xad, 0xc7, 0xbc, 0xc4, 0x86, 0xc8, 0x82, 0xe1, 0x9b, 0x9a,
+                0xc8, 0x86, 0x53, 0xce, 0x89, 0xc3, 0x87, 0xc4, 0xb9, 0xc6, 0x85, 0xc8, 0xa0, 0x28,
+                0xe2, 0xb1, 0xae, 0x62, 0xc8, 0x8b, 0xc4, 0xa2, 0xc5, 0x88, 0xc7, 0x8b, 0xc6, 0x99,
+                0x62, 0xce, 0x85, 0xc5, 0x8c, 0xcd, 0xb0, 0xc2, 0xbf, 0xc7, 0xae, 0x29, 0xe1, 0x9a,
+                0xb6, 0xc2, 0xb0, 0xc9, 0x8e, 0xc9, 0x88, 0xc7, 0x86, 0x55, 0x7b, 0xc3, 0x93, 0xc3,
+                0xa2, 0xc5, 0x9e, 0xe1, 0x9b, 0xa2, 0x40, 0xe1, 0x9b, 0xad, 0xc8, 0x85, 0xc5, 0x8a,
+                0xc5, 0x80, 0xc4, 0x9b, 0xc3, 0x8f, 0xe1, 0x9b, 0x8d, 0xe1, 0x9b, 0x8a, 0x55, 0x4a,
+                0x35, 0xc5, 0xa1, 0xc6, 0x94, 0xc7, 0x96, 0xc7, 0xa8, 0xc5, 0xaf, 0xc7, 0xbc, 0xc8,
+                0xa7, 0xc8, 0x88, 0xc3, 0x8a, 0xc6, 0x84, 0xc7, 0xb6, 0x4b, 0xc6, 0x94, 0xe2, 0xb1,
+                0xa6, 0xc2, 0xaa, 0xc7, 0xb2, 0xc8, 0xae, 0xc8, 0x97, 0xe2, 0xb1, 0xa5, 0xc3, 0xab,
+                0xc4, 0xa4, 0xe1, 0x9a, 0xa3, 0xc4, 0x81, 0xc3, 0x8d, 0xcd, 0xbd, 0xc5, 0x91, 0xc3,
+                0xb6, 0xe2, 0xb1, 0xa0, 0xc7, 0xa6, 0xc4, 0xb1, 0x23, 0xc7, 0xb1, 0xe1, 0x9b, 0x94,
+                0xc5, 0xbc, 0xc6, 0x99, 0xc3, 0x87, 0xc6, 0x97, 0xc7, 0xb4, 0xc4, 0xb5, 0xc7, 0x9b,
+                0x6b, 0xc5, 0x9c, 0xc4, 0x99, 0xc7, 0xba, 0x58, 0xe1, 0x9b, 0x88, 0xc7, 0xa1, 0xc6,
+                0x90, 0xe1, 0x9b, 0x96, 0xe1, 0x9b, 0xaf, 0xc8, 0xba, 0xe1, 0x9a, 0xa4, 0x55, 0xc4,
+                0x9c, 0xc7, 0xbe, 0xc4, 0x90, 0xc4, 0x80, 0xc2, 0xb5, 0xc7, 0x90, 0xce, 0x87, 0xc8,
+                0x93, 0xc4, 0x9b, 0xcd, 0xb7, 0xc9, 0x8b, 0xc4, 0xbd, 0xe2, 0xb1, 0xbb, 0xc4, 0x8c,
+                0xc3, 0x9f, 0xe1, 0x9a, 0xb3, 0xc4, 0x83, 0xc4, 0x98, 0xc7, 0x83, 0xe1, 0x9b, 0x9d,
+                0xc3, 0x84, 0xe2, 0xb1, 0xbd, 0xc8, 0xbd, 0xc4, 0x82, 0xe1, 0x9b, 0xa7, 0xc5, 0x98,
+                0xc3, 0xb0, 0xc5, 0x97, 0xc5, 0x94, 0xc7, 0xab, 0xce, 0x89, 0xc6, 0xb8, 0xc7, 0x86,
+                0xc4, 0x94, 0xc4, 0x96, 0xc4, 0x81, 0x53, 0xcd, 0xbd, 0xc6, 0x86, 0xe1, 0x9b, 0x8e,
+                0xc7, 0xb4, 0x3c, 0xe1, 0x9a, 0xa6, 0xc5, 0x9a, 0xe1, 0x9b, 0x96, 0xc8, 0xae, 0xe2,
+                0xb1, 0xa9, 0xc7, 0xa2, 0xc5, 0x85, 0xc4, 0x97, 0xc4, 0x9c, 0xe1, 0x9a, 0xa1, 0xcd,
+                0xbc, 0xc6, 0xaf, 0xc2, 0xac, 0xc9, 0x89, 0x5a,
             ],
             asset_base: [
-                0xfb, 0xd0, 0x1e, 0x66, 0xf8, 0x29, 0xbf, 0xbf, 0x9d, 0x25, 0xd7, 0x36, 0xbc, 0xb3,
-                0xa1, 0x04, 0x91, 0x82, 0x81, 0x4e, 0x4d, 0xdf, 0xc2, 0x30, 0x95, 0x63, 0x8f, 0x2f,
-                0xf4, 0x3c, 0x15, 0x9b,
+                0x3f, 0xc0, 0xbc, 0x12, 0x07, 0x8b, 0xf1, 0xf2, 0x24, 0x09, 0x2d, 0xb5, 0x81, 0x0b,
+                0x00, 0xaf, 0x8a, 0xe0, 0xb6, 0xe6, 0x35, 0x50, 0xcf, 0xdc, 0xf6, 0xd6, 0x01, 0x0f,
+                0x73, 0xab, 0xb0, 0x3c,
             ],
         },
         TestVector {
             key: [
-                0x61, 0xbb, 0x33, 0x91, 0x59, 0xdf, 0x98, 0x20, 0xef, 0xae, 0xb6, 0x1d, 0x9a, 0x10,
-                0xcd, 0xc1, 0x3b, 0x4c, 0x99, 0xfd, 0xc8, 0x6d, 0x94, 0x85, 0x11, 0x5d, 0xfd, 0x83,
-                0x62, 0x36, 0xac, 0xf8,
+                0xb2, 0xa8, 0xb7, 0x91, 0x5b, 0x37, 0x72, 0x5a, 0xd1, 0xcf, 0x5d, 0xc6, 0xeb, 0x4c,
+                0xd0, 0x9a, 0xf4, 0xe1, 0x87, 0xf8, 0xcf, 0x27, 0x37, 0xed, 0x33, 0x7c, 0x77, 0x6e,
+                0x93, 0xe2, 0xa0, 0x89,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xe1, 0x9a, 0xa7, 0x70, 0xc6, 0xa8, 0xe1, 0x9b, 0x9a, 0xe1, 0x9b, 0xa2, 0xc5, 0xad,
+                0x7b, 0xe2, 0xb1, 0xa0, 0xc6, 0xa6, 0xc7, 0x98, 0xc7, 0xaf, 0x36, 0x44, 0xc2, 0xb0,
+                0xc8, 0x8d, 0xc4, 0xac, 0xc6, 0xab, 0x7a, 0xc9, 0x83, 0xc6, 0x97, 0xe1, 0x9b, 0xa4,
+                0xe1, 0x9a, 0xa1, 0xc7, 0xb3, 0xc4, 0x92, 0xc8, 0x8f, 0xc3, 0xb4, 0xc4, 0xa6, 0xc8,
+                0x82, 0xc7, 0xa7, 0xe1, 0x9a, 0xb6, 0xe2, 0xb1, 0xae, 0xc4, 0x8f, 0xe1, 0x9a, 0xa2,
+                0xc7, 0xb6, 0xc5, 0xb7, 0xc5, 0xa2, 0xe2, 0xb1, 0xa2, 0xc4, 0xa7, 0xc7, 0xaa, 0xc8,
+                0xa9, 0xe2, 0xb1, 0xa6, 0xc3, 0x99, 0xc6, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x8f, 0xc8,
+                0xa8, 0xc7, 0x9c, 0xe1, 0x9b, 0xae, 0xc2, 0xaa, 0xc6, 0xbe, 0xc3, 0x94, 0xc5, 0x94,
+                0xc3, 0x9f, 0xc6, 0xa2, 0x69, 0xe1, 0x9a, 0xab, 0xc7, 0x9d, 0xc3, 0xad, 0xc7, 0xaf,
+                0xcd, 0xb5, 0xc7, 0xba, 0xc8, 0xa3, 0xc5, 0xa6, 0xe1, 0x9b, 0xae, 0xc3, 0xa5, 0xc6,
+                0x8e, 0xce, 0x86, 0xc4, 0x98, 0xc5, 0xa3, 0x32, 0x39, 0xc7, 0x9e, 0xc7, 0xae, 0xe1,
+                0x9a, 0xa7, 0xc3, 0x91, 0xc8, 0x84, 0xc3, 0xa0, 0xc5, 0xaf, 0x2c, 0x54, 0x4b, 0xc6,
+                0x81, 0xc3, 0x81, 0x2a, 0xcd, 0xb7, 0xe2, 0xb1, 0xa8, 0x5e, 0x4a, 0xe2, 0xb1, 0xa5,
+                0x2b, 0xc3, 0xa0, 0xc3, 0xb8, 0xc8, 0x91, 0xc7, 0x80, 0xc4, 0xb2, 0x66, 0x3f, 0xc4,
+                0x8b, 0xc5, 0x8d, 0xc9, 0x85, 0x39, 0xc3, 0x87, 0xc4, 0x8d, 0xc2, 0xb9, 0xc3, 0xaf,
+                0x45, 0xc7, 0x89, 0xc4, 0xaa, 0xc4, 0x94, 0xc4, 0x96, 0xce, 0x85, 0xe2, 0xb1, 0xb7,
+                0xc4, 0xbf, 0xc6, 0x9b, 0xc4, 0xae, 0x23, 0xcd, 0xb1, 0xc2, 0xbc, 0xe1, 0x9b, 0x80,
+                0xc5, 0x88, 0xc6, 0x88, 0xc4, 0xb2, 0xc7, 0xae, 0x5b, 0xc6, 0x8f, 0xc7, 0xab, 0xc5,
+                0xb3, 0xe1, 0x9b, 0x83, 0xc3, 0xad, 0xc5, 0xad, 0xc7, 0xa7, 0xc2, 0xbc, 0xc8, 0x83,
+                0x58, 0xc7, 0x89, 0xc7, 0xaa, 0xc9, 0x85, 0x3e, 0xc6, 0x92, 0xc7, 0x94, 0xc3, 0x92,
+                0xc3, 0xa0, 0xc3, 0xb4, 0xc6, 0xa6, 0xcd, 0xb0, 0xc8, 0xa8, 0xc7, 0xa3, 0xe2, 0xb1,
+                0xa3, 0x7b, 0xc6, 0x92, 0xc4, 0x91, 0xc8, 0xac, 0x50, 0xc8, 0x8b, 0xc4, 0xa9, 0xe1,
+                0x9b, 0x90, 0xc4, 0xb5, 0xc8, 0x8e, 0xc3, 0xb7, 0xe2, 0xb1, 0xa2, 0xc6, 0xa1, 0xc3,
+                0xb1, 0xc3, 0xba, 0x43, 0xce, 0x89, 0xc8, 0x98, 0x59, 0xcd, 0xbc, 0xe1, 0x9a, 0xa7,
+                0xc8, 0xa0, 0xc6, 0x85, 0x5a, 0xc2, 0xb2, 0xc5, 0xbb, 0xc4, 0xb3, 0xc6, 0x8d, 0xc4,
+                0xa6, 0xc2, 0xbd, 0xc4, 0x89, 0xe1, 0x9b, 0x9e, 0xc3, 0xae, 0xc4, 0x94, 0xc2, 0xb3,
+                0xc5, 0x86, 0xc6, 0x8b, 0xc6, 0xb7, 0x2c, 0xc3, 0x9f, 0xc7, 0x80, 0xc4, 0x87, 0xc4,
+                0xb0, 0xc8, 0x81, 0xc4, 0xa7, 0xce, 0x88, 0xc5, 0x86, 0xc5, 0x87, 0xe1, 0x9a, 0xa0,
+                0xc6, 0x9e, 0xc6, 0x8d, 0xc7, 0x97, 0xc8, 0x9e, 0xc5, 0xb7, 0xc4, 0x9c, 0xc2, 0xba,
+                0xc3, 0xac, 0xe1, 0x9b, 0x8e, 0xe1, 0x9a, 0xb6, 0x6d, 0xc5, 0x8c, 0x6d, 0xc2, 0xaf,
+                0xc4, 0xa9, 0xc4, 0x97, 0xc3, 0x89, 0x4c, 0xc5, 0x9f, 0xc6, 0xbd, 0xc6, 0x8c, 0x68,
+                0xc5, 0xab, 0xce, 0x84, 0xc2, 0xb2, 0xce, 0x8a, 0xc6, 0xa0, 0xc7, 0xb5, 0xc6, 0xbc,
+                0xc3, 0x84, 0xc6, 0xbd, 0xc5, 0xad, 0xc3, 0x84, 0xe1, 0x9b, 0xaf, 0xe2, 0xb1, 0xbc,
+                0xc6, 0xa8, 0xc3, 0x8d, 0xe2, 0xb1, 0xb2, 0xc3, 0xb9, 0xc9, 0x8f, 0x33, 0xc8, 0x8a,
+                0xc4, 0xb5, 0xc6, 0x8a, 0xc4, 0x9f, 0xc8, 0x84, 0xc4, 0x9c, 0xc4, 0x9f, 0xc7, 0xa0,
+                0xc8, 0x8d, 0xc7, 0x88, 0xe2, 0xb1, 0xb7, 0xe2, 0xb1, 0xa3, 0xe1, 0x9b, 0xad, 0x60,
+                0xc4, 0x94, 0xc5, 0x80, 0xc8, 0x96, 0xc6, 0xb3,
             ],
             asset_base: [
-                0xd0, 0x46, 0xef, 0xd5, 0xe2, 0xf1, 0xdd, 0x27, 0x2c, 0x7e, 0x65, 0x8a, 0x72, 0x1d,
-                0x36, 0x21, 0x4c, 0x4d, 0xbc, 0x03, 0xf5, 0x99, 0x04, 0x3e, 0x6e, 0xfc, 0xbf, 0xb5,
-                0x6a, 0x6e, 0x90, 0x28,
+                0x70, 0xc1, 0x47, 0xec, 0x23, 0x32, 0x10, 0xed, 0xdf, 0xab, 0x14, 0xcb, 0xca, 0x72,
+                0x4d, 0xd2, 0x8e, 0x2b, 0xc5, 0x7f, 0xb7, 0xb0, 0xd3, 0x44, 0x6d, 0x79, 0x7f, 0x94,
+                0xbc, 0xeb, 0xd0, 0xb8,
             ],
         },
         TestVector {
             key: [
-                0x49, 0x26, 0x53, 0x80, 0xd2, 0xb0, 0x2e, 0x0a, 0x1d, 0x98, 0x8f, 0x3d, 0xe3, 0x45,
-                0x8b, 0x6e, 0x00, 0x29, 0x1d, 0xb0, 0xe6, 0x2e, 0x17, 0x47, 0x91, 0xd0, 0x09, 0x29,
-                0x9f, 0x61, 0xfe, 0xc4,
+                0xe6, 0xdf, 0x3e, 0xbc, 0x84, 0x4c, 0x0c, 0x39, 0xcb, 0x25, 0xac, 0x91, 0xd6, 0xc1,
+                0xd9, 0x20, 0x0f, 0x18, 0xfa, 0x7e, 0x8c, 0x93, 0x4c, 0x4d, 0x0c, 0x30, 0x9d, 0x79,
+                0xb0, 0x4a, 0xb4, 0x43,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xe1, 0x9a, 0xa5, 0xc4, 0x80, 0xc3, 0x85, 0xc5, 0xa4, 0xc5, 0xbb, 0xc7, 0xbf, 0x34,
+                0xc9, 0x84, 0xc7, 0x81, 0xc5, 0xbe, 0xc7, 0xbc, 0xe1, 0x9b, 0x97, 0xc5, 0x9e, 0xe2,
+                0xb1, 0xbc, 0x37, 0xc8, 0x83, 0x30, 0xc8, 0x84, 0xc6, 0xb3, 0xc8, 0x97, 0xc6, 0xac,
+                0xc4, 0xa0, 0x51, 0xc7, 0xab, 0xc8, 0xa3, 0xc3, 0xa9, 0xc5, 0x92, 0xc3, 0x8d, 0xc2,
+                0xa3, 0xc5, 0xb9, 0xc8, 0xab, 0xc5, 0xa1, 0x70, 0xc7, 0x85, 0xc7, 0xbf, 0xcd, 0xbd,
+                0xc6, 0xab, 0x4c, 0xe1, 0x9a, 0xa5, 0x36, 0xc5, 0xa1, 0xc4, 0xad, 0x4c, 0xc8, 0x92,
+                0xc6, 0x9e, 0xc4, 0xbd, 0xc5, 0x95, 0xc3, 0xb4, 0x56, 0xc3, 0xb0, 0xc8, 0xa8, 0xe1,
+                0x9a, 0xbf, 0xc4, 0x98, 0xc8, 0xaa, 0x33, 0xc4, 0x97, 0xe1, 0x9a, 0xb2, 0xc9, 0x86,
+                0xc2, 0xb1, 0xe1, 0x9b, 0xa2, 0xe1, 0x9b, 0x97, 0xc5, 0xa6, 0x4b, 0xc3, 0x88, 0xe1,
+                0x9a, 0xac, 0xce, 0x86, 0xc3, 0x8a, 0xc4, 0x98, 0xc4, 0x89, 0x48, 0xc7, 0xad, 0xe1,
+                0x9b, 0x8f, 0xe1, 0x9b, 0xa8, 0xcd, 0xb2, 0xc3, 0xb1, 0xc4, 0xa6, 0xc3, 0xb2, 0xc4,
+                0xb1, 0xc8, 0xb4, 0xc3, 0xa9, 0xc9, 0x8d, 0xc7, 0xb6, 0xc4, 0xa0, 0xc6, 0x9b, 0xc6,
+                0xbd, 0xc7, 0xaf, 0xc3, 0x9c, 0xe2, 0xb1, 0xa0, 0xe1, 0x9b, 0x96, 0xc3, 0x87, 0xcd,
+                0xb4, 0xc6, 0x8c, 0xcd, 0xb7, 0xc7, 0xba, 0xc3, 0x94, 0xc8, 0xa3, 0xc3, 0x9e, 0xe1,
+                0x9a, 0xa9, 0xc6, 0x98, 0xc6, 0x8a, 0xc5, 0xb6, 0xc9, 0x8b, 0x59, 0xcd, 0xbc, 0xc6,
+                0x91, 0xc6, 0xa1, 0xc4, 0x8a, 0xe1, 0x9b, 0xad, 0x31, 0xc9, 0x89, 0xc4, 0x97, 0xc3,
+                0xa4, 0xc4, 0x8f, 0xce, 0x8a, 0xe1, 0x9b, 0x8c, 0xc3, 0x9c, 0xc3, 0x89, 0xc6, 0x83,
+                0xc9, 0x81, 0xc8, 0x95, 0xc4, 0x9e, 0x39, 0xc8, 0x86, 0xc7, 0x97, 0xc7, 0x87, 0xc2,
+                0xa8, 0x23, 0xc3, 0x90, 0xcd, 0xb0, 0xc3, 0x9f, 0xc6, 0xac, 0xc5, 0x81, 0xc7, 0xa2,
+                0x78, 0x57, 0xc2, 0xaf, 0xc2, 0xa7, 0x5d, 0xc8, 0x8e, 0x73, 0xe1, 0x9b, 0xa8, 0xc8,
+                0x95, 0xc5, 0x99, 0xc2, 0xb3, 0xc5, 0xb8, 0xe1, 0x9a, 0xa8, 0xc8, 0x85, 0xc7, 0x82,
+                0xc8, 0x8a, 0x34, 0xc3, 0xbd, 0xe1, 0x9b, 0x99, 0xe1, 0x9b, 0xaa, 0xc8, 0xb2, 0xc5,
+                0xa7, 0xc7, 0xb2, 0xc6, 0x98, 0x40, 0xe1, 0x9a, 0xb8, 0xe1, 0x9a, 0xb4, 0x77, 0xc2,
+                0xa2, 0xe1, 0x9a, 0xa4, 0xc5, 0x84, 0xe2, 0xb1, 0xa7, 0xc4, 0xbc, 0xc5, 0xb3, 0xe2,
+                0xb1, 0xa2, 0xc8, 0xb4, 0xc8, 0xbd, 0xc6, 0x98, 0xc8, 0xa9, 0x78, 0xc8, 0x9b, 0xc3,
+                0x85, 0xc5, 0xaf, 0xc5, 0x83, 0x34, 0x5f, 0xc5, 0x88, 0xe1, 0x9a, 0xb3, 0x7d, 0xc4,
+                0xa5, 0xc3, 0xb4, 0xe1, 0x9a, 0xb3, 0xc7, 0x8e, 0xc5, 0x86, 0xc4, 0x94, 0xc7, 0x89,
+                0xe1, 0x9b, 0x8a, 0xe1, 0x9b, 0xa4, 0xc6, 0x9a, 0xc3, 0x8e, 0xc5, 0xa9, 0xc6, 0xbe,
+                0xe2, 0xb1, 0xb5, 0xc4, 0xb2, 0xc3, 0x88, 0xc5, 0xb2, 0xc8, 0xa7, 0xe1, 0x9b, 0x8a,
+                0xc4, 0x9f, 0xc7, 0x94, 0xe1, 0x9a, 0xb5, 0xc9, 0x83, 0xc6, 0xb5, 0xe2, 0xb1, 0xa0,
+                0xc4, 0xb0, 0x59, 0xe1, 0x9b, 0x9f, 0xc4, 0xa9, 0xc3, 0x96, 0xc7, 0xba, 0xc5, 0xad,
+                0xc3, 0xaf, 0xc3, 0xa1, 0xc6, 0x86, 0xc2, 0xb8, 0xe1, 0x9b, 0xa7, 0xc2, 0xb2, 0xc4,
+                0x9d, 0xc8, 0x87, 0xc9, 0x89, 0xe1, 0x9a, 0xa8, 0xc4, 0x8a, 0xc5, 0xbe, 0x33, 0xc7,
+                0x89, 0xce, 0x8c, 0xc9, 0x85, 0x4b, 0xc7, 0xa6, 0x76, 0xc8, 0xbc, 0xc2, 0xb2, 0xcd,
+                0xbb, 0xe1, 0x9b, 0xa5, 0xc8, 0x9d, 0xc7, 0xa1, 0xc7, 0xb3, 0xe1, 0x9a, 0xb5, 0xc7,
+                0x94, 0xc4, 0x86, 0xe1, 0x9a, 0xa2, 0xc8, 0xb1, 0xc3, 0x97, 0xc8, 0xb3, 0xe2, 0xb1,
+                0xb2, 0xc6, 0xb9, 0xc3, 0xb5, 0x74, 0xc2, 0xb3,
             ],
             asset_base: [
-                0xe1, 0x39, 0xe7, 0x7a, 0x0b, 0x76, 0xfc, 0x01, 0xa1, 0xec, 0x3b, 0x46, 0xf0, 0x21,
-                0x29, 0x7b, 0xfb, 0x41, 0xd1, 0x7f, 0x5f, 0x98, 0x3d, 0xed, 0x61, 0x81, 0xee, 0xd9,
-                0x5d, 0xe4, 0x2e, 0xb6,
+                0x85, 0x94, 0x73, 0xb4, 0x98, 0xbb, 0x99, 0x99, 0x4a, 0x06, 0x71, 0x0e, 0x5c, 0xd2,
+                0x10, 0x78, 0xa5, 0x22, 0xea, 0xa5, 0xf6, 0xad, 0x2d, 0x22, 0xe5, 0x12, 0x57, 0x6d,
+                0x8c, 0x89, 0x65, 0x21,
             ],
         },
         TestVector {
             key: [
-                0x19, 0x58, 0x53, 0x8b, 0x12, 0x17, 0xa0, 0x3d, 0x89, 0xcd, 0x83, 0xb8, 0x3d, 0x0b,
-                0xdd, 0x40, 0xa6, 0x9a, 0xbe, 0x3a, 0xc2, 0x5d, 0x00, 0xc6, 0xd2, 0x69, 0x97, 0xf9,
-                0xf2, 0x57, 0x4d, 0x4f,
+                0xdb, 0x1f, 0x0a, 0x56, 0x5c, 0x8c, 0x06, 0xa6, 0x3d, 0x4f, 0x75, 0x92, 0x62, 0x55,
+                0xf4, 0xfa, 0x3c, 0x76, 0x44, 0x23, 0xc0, 0x49, 0x55, 0x02, 0x4e, 0xa0, 0x3b, 0xba,
+                0x63, 0x63, 0x6c, 0x55,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc6, 0xa7, 0xe1, 0x9b, 0x8e, 0xc6, 0x8d, 0xc6, 0x88, 0xc2, 0xa3, 0xc4, 0xbe, 0xc6,
+                0x93, 0xc5, 0x95, 0xe1, 0x9b, 0x88, 0xc3, 0x82, 0xc4, 0xa5, 0x32, 0xc7, 0x95, 0xc9,
+                0x88, 0xc5, 0xbd, 0xe1, 0x9b, 0x85, 0xc9, 0x84, 0xc3, 0x80, 0xe2, 0xb1, 0xa8, 0xc6,
+                0xac, 0xe1, 0x9b, 0x82, 0xc5, 0x82, 0x29, 0xc4, 0x80, 0xc8, 0x9c, 0xc6, 0x88, 0xc3,
+                0xba, 0xc8, 0xa1, 0xe1, 0x9a, 0xb8, 0xc3, 0xbb, 0xc3, 0xb8, 0xc6, 0x90, 0x24, 0xc8,
+                0x8b, 0xe1, 0x9a, 0xa1, 0x31, 0xc8, 0x9c, 0xe1, 0x9a, 0xa4, 0xe1, 0x9b, 0x82, 0xc2,
+                0xb6, 0xc6, 0xb1, 0xe1, 0x9b, 0x87, 0x49, 0xc4, 0xba, 0xe2, 0xb1, 0xb5, 0x32, 0xc6,
+                0x99, 0xc7, 0x9b, 0xc7, 0x85, 0x67, 0xc6, 0xa5, 0xc9, 0x8b, 0x45, 0x77, 0xc6, 0x9e,
+                0x3d, 0xc4, 0x82, 0xe2, 0xb1, 0xaf, 0xc6, 0x87, 0xe1, 0x9a, 0xb0, 0xe1, 0x9a, 0xa0,
+                0xc9, 0x88, 0xc3, 0x98, 0xc3, 0xa7, 0xc6, 0x9b, 0xc7, 0x9c, 0xc4, 0xb5, 0xc3, 0xaf,
+                0xc4, 0xa9, 0xc3, 0xb8, 0xc5, 0xaf, 0xc2, 0xac, 0xc9, 0x8a, 0xe1, 0x9b, 0x8c, 0x47,
+                0xe1, 0x9b, 0xaa, 0xe1, 0x9a, 0xb6, 0x24, 0xc8, 0x9c, 0x4f, 0xc8, 0xb7, 0x64, 0xe1,
+                0x9a, 0xad, 0xc9, 0x87, 0xc2, 0xbe, 0xe1, 0x9b, 0x89, 0x6c, 0xe2, 0xb1, 0xac, 0xc5,
+                0x8e, 0xe1, 0x9b, 0x87, 0xe2, 0xb1, 0xb0, 0xc3, 0xb1, 0xc3, 0x8e, 0xc3, 0x89, 0xe1,
+                0x9b, 0x9f, 0xc4, 0xb7, 0x42, 0xc6, 0xb6, 0xc6, 0x9d, 0xc2, 0xa7, 0xc2, 0xb1, 0xc4,
+                0xa5, 0xc6, 0xa3, 0xc8, 0x84, 0xc7, 0x85, 0x74, 0xe2, 0xb1, 0xbb, 0xe2, 0xb1, 0xaf,
+                0xc7, 0x87, 0x5b, 0xc6, 0xa7, 0xc4, 0x91, 0xc5, 0x95, 0xc8, 0xa6, 0xc4, 0xb0, 0xe1,
+                0x9b, 0xac, 0xe1, 0x9b, 0x8b, 0xc3, 0x95, 0xe1, 0x9a, 0xaf, 0xc3, 0x85, 0xc4, 0xbf,
+                0xc2, 0xb0, 0xc5, 0x97, 0xc5, 0xa3, 0xc5, 0xb2, 0xc6, 0xad, 0x60, 0xc5, 0x8b, 0xc3,
+                0x88, 0xe2, 0xb1, 0xb4, 0xc2, 0xbd, 0xc7, 0xbb, 0xe2, 0xb1, 0xab, 0xc4, 0x99, 0xc4,
+                0x91, 0x21, 0xc9, 0x8d, 0xc6, 0x92, 0xc7, 0x95, 0x32, 0xe1, 0x9b, 0xa3, 0xc5, 0x86,
+                0xc7, 0x95, 0xc8, 0xba, 0xe2, 0xb1, 0xbb, 0xc3, 0x89, 0xc6, 0x9c, 0xc6, 0x92, 0xe2,
+                0xb1, 0xab, 0xc4, 0xaf, 0xc5, 0x81, 0xc4, 0x80, 0xc3, 0x98, 0xc4, 0xad, 0xc5, 0x8b,
+                0xc6, 0xb5, 0x53, 0xc7, 0x8a, 0x43, 0xc4, 0x95, 0xc4, 0xad, 0xc8, 0xba, 0xe1, 0x9a,
+                0xb8, 0x7b, 0xc3, 0xb2, 0x33, 0xc2, 0xb6, 0xc5, 0x8b, 0xe1, 0x9a, 0xb5, 0x74, 0x34,
+                0xc8, 0x9f, 0xc6, 0x83, 0x3d, 0xc2, 0xb1, 0x6b, 0xc4, 0xa8, 0xc3, 0xb5, 0xc7, 0x8c,
+                0xc7, 0x84, 0x2e, 0xc8, 0x85, 0xc4, 0x99, 0xc7, 0x8e, 0x60, 0x4b, 0xc4, 0x93, 0xe2,
+                0xb1, 0xbe, 0xc7, 0x88, 0xc3, 0x86, 0x48, 0x5d, 0xc6, 0xa1, 0x78, 0xc7, 0xaa, 0xc7,
+                0x85, 0x29, 0xc7, 0x82, 0xc3, 0x9c, 0xc6, 0xbe, 0xe1, 0x9b, 0x82, 0x2c, 0xc8, 0xa3,
+                0xc8, 0x95, 0xc8, 0xbe, 0xc3, 0x94, 0xc8, 0xad, 0xcd, 0xb2, 0xc3, 0xa2, 0xc4, 0xbd,
+                0xe1, 0x9b, 0x98, 0xe2, 0xb1, 0xac, 0xc3, 0x8d, 0xc3, 0x99, 0xc4, 0xb1, 0xe1, 0x9b,
+                0x83, 0xe1, 0x9a, 0xb3, 0x72, 0xc6, 0xa2, 0x37, 0xe1, 0x9b, 0xaf, 0xc3, 0x98, 0xc4,
+                0x99, 0xc3, 0xa0, 0xc7, 0xb5, 0xc6, 0x97, 0x6d, 0xc5, 0xb0, 0xc7, 0xa6, 0xe2, 0xb1,
+                0xa5, 0xc5, 0xa8, 0xc3, 0xa8, 0xc5, 0x9b, 0xe1, 0x9a, 0xa1, 0xc7, 0xb5, 0x78, 0xe2,
+                0xb1, 0xbb, 0xe1, 0x9b, 0xa7, 0xc6, 0xae, 0xe1, 0x9a, 0xbb, 0xc4, 0xba, 0xc5, 0xa7,
+                0xc4, 0x86, 0xc5, 0x94, 0xc8, 0xb4, 0xc3, 0xa3, 0xc8, 0x83, 0xc8, 0x8a, 0xc5, 0xb6,
+                0xcd, 0xbc, 0xe1, 0x9a, 0xbc, 0xe2, 0xb1, 0xa8,
             ],
             asset_base: [
-                0xb3, 0xd1, 0x28, 0x2b, 0xf4, 0x32, 0x3d, 0xc3, 0x01, 0xa2, 0xd5, 0x9b, 0x8b, 0x80,
-                0x41, 0xe2, 0xd2, 0x9b, 0x69, 0xee, 0x9b, 0xbc, 0x1c, 0x41, 0x06, 0xd3, 0x60, 0x1e,
-                0x40, 0x39, 0x61, 0x3e,
+                0xb2, 0xea, 0x85, 0x07, 0x94, 0x73, 0xf8, 0x06, 0xce, 0x30, 0xca, 0xe0, 0xbf, 0x6c,
+                0xb9, 0xc9, 0xeb, 0x91, 0x72, 0xc0, 0xb9, 0x86, 0x47, 0x7a, 0xb9, 0x04, 0xd1, 0xfa,
+                0x68, 0x49, 0x01, 0x2e,
             ],
         },
         TestVector {
             key: [
-                0x9a, 0x0e, 0x46, 0x39, 0xb4, 0x69, 0x1f, 0x02, 0x7c, 0x0d, 0xb7, 0xfe, 0xf1, 0xbb,
-                0x5e, 0xf9, 0x0a, 0xcd, 0xb7, 0x08, 0x62, 0x6d, 0x2e, 0x1f, 0x3e, 0x38, 0x3e, 0xe7,
-                0x5b, 0x31, 0xcf, 0x57,
+                0x98, 0x9f, 0xc7, 0x01, 0x45, 0xd2, 0xfb, 0xb4, 0xd2, 0xe2, 0x79, 0xe5, 0xf9, 0x5d,
+                0x72, 0x9f, 0x6a, 0xf4, 0xe9, 0x83, 0x28, 0x53, 0xf5, 0x97, 0xaf, 0x2f, 0xfb, 0xfb,
+                0x88, 0xa6, 0x6e, 0xba,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xce, 0x8a, 0xc7, 0xb5, 0xc7, 0xbd, 0xc2, 0xae, 0x66, 0xc6, 0xbd, 0xc8, 0xa0, 0xc7,
+                0x85, 0x4f, 0xe1, 0x9b, 0xa4, 0xc3, 0xb4, 0xe1, 0x9b, 0x92, 0xc6, 0xa6, 0xc6, 0x95,
+                0xc5, 0x97, 0xc6, 0x97, 0xcd, 0xb2, 0xc6, 0x81, 0xc8, 0xaa, 0xe1, 0x9b, 0x8a, 0xc7,
+                0xa0, 0xc4, 0xaa, 0xe1, 0x9b, 0xa9, 0x79, 0xe2, 0xb1, 0xb2, 0xc8, 0xba, 0xc3, 0x96,
+                0xc8, 0x85, 0xe2, 0xb1, 0xb1, 0xc5, 0x82, 0x2e, 0xc7, 0x8b, 0xc7, 0x85, 0xe2, 0xb1,
+                0xbb, 0xe1, 0x9b, 0xab, 0xc9, 0x8a, 0x3c, 0xc3, 0x9b, 0xc8, 0xac, 0xc2, 0xae, 0xc5,
+                0x86, 0xc2, 0xbb, 0xc3, 0x89, 0xc8, 0x9a, 0x7b, 0xc2, 0xbe, 0xc7, 0x99, 0xc5, 0xb2,
+                0xc4, 0x81, 0xc6, 0xb2, 0xc8, 0x96, 0xc7, 0xb2, 0xc8, 0xba, 0xc5, 0xac, 0xce, 0x88,
+                0xc5, 0x94, 0xc3, 0xbd, 0xc8, 0x81, 0xc5, 0x94, 0xc3, 0xad, 0xc7, 0x83, 0x73, 0xc4,
+                0xba, 0xe2, 0xb1, 0xad, 0xe1, 0x9a, 0xbb, 0xc5, 0x84, 0xc5, 0xbd, 0x40, 0xc3, 0x9c,
+                0xc7, 0xbb, 0xc4, 0xbb, 0xc6, 0xba, 0x67, 0x41, 0xe2, 0xb1, 0xaf, 0xe1, 0x9a, 0xba,
+                0xc6, 0xa9, 0xe1, 0x9b, 0x8d, 0x48, 0xc4, 0xa8, 0xc7, 0x88, 0xc3, 0x9b, 0xc8, 0x8a,
+                0x65, 0xc3, 0xab, 0xe1, 0x9b, 0x9a, 0xe1, 0x9b, 0x8d, 0x52, 0xe1, 0x9a, 0xa1, 0xc8,
+                0x8b, 0x29, 0xc3, 0x9a, 0xc7, 0x86, 0xc3, 0x95, 0xe2, 0xb1, 0xa8, 0xe1, 0x9b, 0x8f,
+                0xc5, 0x94, 0xc4, 0x8e, 0x44, 0xc6, 0xa2, 0xc5, 0x88, 0x3e, 0x7a, 0xc8, 0x9f, 0xe1,
+                0x9a, 0xa5, 0xc4, 0x9b, 0xc5, 0xa7, 0xc5, 0x91, 0xc3, 0x8e, 0xc7, 0xb2, 0xc4, 0x83,
+                0x38, 0xe2, 0xb1, 0xb4, 0xc5, 0xb9, 0xc4, 0xbb, 0xc7, 0x88, 0x4d, 0xc2, 0xa5, 0xe2,
+                0xb1, 0xaf, 0xe1, 0x9a, 0xaa, 0x72, 0xe2, 0xb1, 0xba, 0xc8, 0x8b, 0xe1, 0x9b, 0xaa,
+                0xc7, 0x90, 0xc5, 0xaa, 0x29, 0xc7, 0xa8, 0xc5, 0x90, 0xc7, 0xa9, 0xcd, 0xb7, 0xc8,
+                0xa9, 0xc8, 0x88, 0xc6, 0x8a, 0xc4, 0x84, 0xc4, 0xa2, 0xc7, 0xa2, 0xe1, 0x9a, 0xba,
+                0xc2, 0xb4, 0xe1, 0x9b, 0x8d, 0xc6, 0x91, 0xcd, 0xb1, 0xc5, 0xa5, 0xc3, 0xb3, 0x39,
+                0xe1, 0x9b, 0x85, 0xc4, 0xbe, 0xc4, 0x9e, 0xcd, 0xb1, 0xc6, 0x83, 0x69, 0xc3, 0xba,
+                0xe1, 0x9b, 0x95, 0xc2, 0xbf, 0xc6, 0xbd, 0x53, 0xc7, 0xb9, 0xc8, 0x9b, 0x5b, 0xc9,
+                0x8c, 0xc7, 0xa1, 0xc8, 0xaa, 0xcd, 0xbc, 0xc4, 0xb0, 0xcd, 0xb6, 0xc4, 0x93, 0xc4,
+                0xab, 0xe1, 0x9b, 0x86, 0xc6, 0xaf, 0xc5, 0x9b, 0xc2, 0xb3, 0xc3, 0xa3, 0xe1, 0x9a,
+                0xb1, 0xe1, 0x9b, 0x8a, 0xc5, 0x90, 0xc6, 0xa5, 0xc2, 0xae, 0x51, 0x5b, 0xce, 0x86,
+                0xc9, 0x8c, 0xc7, 0x8f, 0xc6, 0x95, 0xc5, 0x88, 0xc7, 0x82, 0xc5, 0xa2, 0xce, 0x85,
+                0xc8, 0x85, 0xc3, 0x85, 0xc7, 0xb1, 0xc7, 0xbe, 0xc8, 0x8c, 0xe1, 0x9b, 0x8d, 0xc8,
+                0x90, 0xc4, 0xb6, 0xc3, 0xbf, 0xe1, 0x9b, 0x86, 0xc6, 0xb8, 0xe2, 0xb1, 0xb5, 0xc3,
+                0x8e, 0xc8, 0x9b, 0xcd, 0xb7, 0xc5, 0x94, 0xc5, 0x86, 0xc5, 0x9f, 0xc4, 0xb0, 0xc7,
+                0xa6, 0xc2, 0xbd, 0x70, 0xc6, 0xac, 0xc8, 0xb7, 0xe1, 0x9b, 0x96, 0xc5, 0xbe, 0xc5,
+                0x97, 0xe1, 0x9a, 0xb9, 0xc3, 0xa7, 0xe2, 0xb1, 0xb4, 0xc5, 0xb6, 0x24, 0x49, 0x26,
+                0xc5, 0x82, 0xc9, 0x8c, 0xc6, 0x9d, 0xc5, 0x93, 0xc3, 0x85, 0xc3, 0x98, 0xc8, 0xbe,
+                0x4e, 0xc5, 0xae, 0x44, 0x67, 0xe1, 0x9a, 0xa5, 0xc7, 0xb1, 0xc4, 0xb6, 0xc7, 0xaf,
+                0x5d, 0xc3, 0xb9, 0xc3, 0xb5, 0xc3, 0xab, 0xc7, 0x83, 0xc7, 0xb3, 0xe1, 0x9b, 0x99,
+                0xc4, 0x9d, 0xc3, 0x83, 0xc3, 0xb4, 0xc5, 0xb2, 0xc7, 0xbe, 0x5e, 0xcd, 0xba, 0xc9,
+                0x87, 0xe2, 0xb1, 0xbd, 0xc8, 0x8f, 0xc9, 0x8c,
             ],
             asset_base: [
-                0x2b, 0xb6, 0x4e, 0xa4, 0x07, 0xfd, 0x00, 0xb6, 0x4c, 0xe5, 0x96, 0x2e, 0x57, 0x3f,
-                0xaf, 0x9a, 0x40, 0xfb, 0x3a, 0x4d, 0xc1, 0xcc, 0xbf, 0x87, 0xe1, 0xe0, 0xe7, 0x97,
-                0x8a, 0x19, 0xbd, 0x39,
+                0x1a, 0x51, 0xbf, 0x64, 0x82, 0x22, 0x09, 0x2a, 0x98, 0x5b, 0x0e, 0x94, 0xfa, 0x1d,
+                0xb4, 0xb4, 0xbf, 0xad, 0x07, 0x8f, 0xbe, 0x75, 0xc1, 0xbf, 0x83, 0x1c, 0x47, 0xd3,
+                0x54, 0x6f, 0xbc, 0x38,
             ],
         },
         TestVector {
             key: [
-                0x7d, 0xd6, 0xd7, 0x61, 0xe1, 0x02, 0x01, 0x37, 0xfa, 0x01, 0xb4, 0xdd, 0xd3, 0xb0,
-                0xf3, 0x48, 0x04, 0xcc, 0x10, 0xcc, 0x4e, 0x9f, 0x6e, 0x9d, 0xf5, 0xb6, 0x04, 0x69,
-                0xf5, 0x79, 0x36, 0x67,
+                0x1d, 0xa0, 0x2d, 0x7e, 0x6a, 0x75, 0x4b, 0xe4, 0xde, 0xfa, 0x04, 0x90, 0x29, 0xc7,
+                0x94, 0x8b, 0x5e, 0xd2, 0x5b, 0x4d, 0x22, 0xbf, 0x87, 0x27, 0x0b, 0x9d, 0x32, 0xda,
+                0x52, 0x81, 0x92, 0x24,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xe1, 0x9b, 0x9c, 0xe1, 0x9a, 0xa5, 0xc5, 0xb7, 0x2b, 0xc3, 0x81, 0xc3, 0x8d, 0xc8,
+                0xb2, 0xc8, 0xb5, 0xc5, 0x81, 0xc5, 0x9e, 0xc7, 0xa7, 0xe1, 0x9b, 0x8b, 0xc7, 0xb7,
+                0xe1, 0x9b, 0x80, 0x6d, 0xc8, 0x94, 0x64, 0xc6, 0x88, 0xe2, 0xb1, 0xa6, 0xc6, 0x8f,
+                0xc9, 0x82, 0x5d, 0xe1, 0x9a, 0xae, 0xe2, 0xb1, 0xa8, 0xc2, 0xb1, 0xc7, 0xa3, 0xc8,
+                0x87, 0xc3, 0xb4, 0xe2, 0xb1, 0xbe, 0xc6, 0xba, 0xc3, 0x9d, 0xc8, 0xbd, 0xe1, 0x9a,
+                0xae, 0x74, 0xe2, 0xb1, 0xa2, 0xc8, 0x9f, 0xcd, 0xb2, 0xc4, 0x9a, 0xe1, 0x9a, 0xb7,
+                0xc7, 0xa4, 0xe1, 0x9a, 0xa2, 0xc5, 0x95, 0xc7, 0x85, 0xc7, 0xa3, 0x4c, 0xc7, 0xb6,
+                0xcd, 0xbd, 0x26, 0xc7, 0x9b, 0xc4, 0xb4, 0xc6, 0xa0, 0xe1, 0x9a, 0xbe, 0xce, 0x85,
+                0xc2, 0xae, 0x38, 0xc7, 0xab, 0xc6, 0x87, 0xc5, 0xab, 0xc4, 0xb2, 0xc6, 0xb5, 0xc8,
+                0xb3, 0xc7, 0xa6, 0xc3, 0xbd, 0xc5, 0xba, 0x4a, 0xc7, 0x8e, 0xc7, 0x8e, 0xc2, 0xb2,
+                0x49, 0xc5, 0xb1, 0x5a, 0xc3, 0xaa, 0xc6, 0x8b, 0xc5, 0x86, 0x4f, 0xc8, 0xbd, 0x49,
+                0xc3, 0x98, 0xc5, 0x8e, 0xc9, 0x8a, 0xc8, 0x92, 0x36, 0xe1, 0x9b, 0xad, 0xe1, 0x9b,
+                0x9c, 0xc3, 0xa7, 0xc8, 0xab, 0xc4, 0xac, 0xe1, 0x9a, 0xa9, 0xc8, 0xbe, 0xc7, 0xb2,
+                0xe1, 0x9a, 0xb3, 0xc8, 0x8c, 0xc7, 0x8f, 0xe2, 0xb1, 0xa3, 0xc5, 0xaf, 0xc6, 0x9f,
+                0xc7, 0x92, 0xe1, 0x9b, 0xad, 0x4b, 0xc2, 0xb1, 0xc4, 0x9c, 0xcd, 0xbd, 0xc5, 0xba,
+                0xc6, 0xb2, 0xe2, 0xb1, 0xb7, 0xc6, 0xb1, 0xc2, 0xba, 0xc6, 0xa8, 0xc8, 0x89, 0xc5,
+                0x97, 0xc5, 0xaf, 0xe1, 0x9b, 0x8e, 0xc5, 0x9d, 0xc4, 0xa4, 0xc3, 0xb9, 0xc8, 0x8b,
+                0xc7, 0x84, 0xc5, 0xaa, 0x7b, 0x78, 0xe1, 0x9b, 0x81, 0x60, 0x5e, 0xc3, 0x91, 0xc6,
+                0xb4, 0x4f, 0xc9, 0x8d, 0xc4, 0xa3, 0xc5, 0x90, 0xe1, 0x9a, 0xbd, 0xc5, 0x93, 0xc3,
+                0xab, 0xc6, 0x9e, 0xc7, 0xb5, 0xc5, 0xa5, 0xc7, 0xba, 0xe2, 0xb1, 0xb9, 0xe1, 0x9a,
+                0xa9, 0x2a, 0xe1, 0x9a, 0xae, 0xc3, 0xb7, 0xc9, 0x87, 0x4c, 0xc7, 0x86, 0xc9, 0x81,
+                0xc6, 0xba, 0xc8, 0x87, 0xc7, 0x96, 0x57, 0xc5, 0xab, 0xc2, 0xa5, 0xc3, 0x85, 0xc8,
+                0x8f, 0xe1, 0x9b, 0x89, 0xc2, 0xb6, 0xc2, 0xa7, 0xc7, 0x80, 0xc8, 0xb4, 0xcd, 0xb4,
+                0xc9, 0x88, 0xc8, 0x85, 0xc7, 0xb7, 0xc8, 0x99, 0x3d, 0xc7, 0x9f, 0xc7, 0x8f, 0xc4,
+                0xa0, 0xc7, 0xb6, 0xc4, 0x80, 0xc3, 0x85, 0xe1, 0x9a, 0xbc, 0xc3, 0x90, 0xc4, 0xb0,
+                0xc4, 0x83, 0xe1, 0x9a, 0xa4, 0xc9, 0x8e, 0x36, 0xc4, 0xb2, 0xc4, 0x94, 0xc6, 0xbf,
+                0xe2, 0xb1, 0xbd, 0xc5, 0xae, 0xc2, 0xae, 0xe1, 0x9b, 0xa9, 0xc5, 0x96, 0xc8, 0x9d,
+                0xc5, 0xb7, 0xc3, 0x8c, 0xc8, 0xae, 0xe2, 0xb1, 0xaf, 0xc5, 0xa6, 0xc4, 0xac, 0x24,
+                0x6d, 0xc8, 0x99, 0xc7, 0x9d, 0x2c, 0xc2, 0xac, 0xc6, 0xbe, 0xc2, 0xac, 0xc9, 0x88,
+                0xc5, 0xa8, 0xc6, 0xa1, 0xcd, 0xb2, 0xc6, 0xa7, 0x5d, 0xc8, 0xa0, 0xc8, 0xb2, 0xc4,
+                0x83, 0xc3, 0xb9, 0xc4, 0xa0, 0xc5, 0x86, 0x54, 0x5d, 0xe1, 0x9b, 0xb0, 0xc5, 0x94,
+                0x35, 0xe1, 0x9a, 0xb7, 0xe2, 0xb1, 0xa6, 0xc8, 0xa9, 0xc8, 0xa6, 0xcd, 0xb6, 0xc8,
+                0xa1, 0x6b, 0xc5, 0x9b, 0x73, 0xc3, 0x98, 0xc3, 0xa3, 0xc5, 0xb8, 0xe1, 0x9b, 0x9f,
+                0xc5, 0xb5, 0xc5, 0x99, 0xc4, 0xa2, 0xc3, 0x81, 0xc9, 0x87, 0xe1, 0x9a, 0xac, 0x59,
+                0xc8, 0xbb, 0xc6, 0x8b, 0xc4, 0xa8, 0xc4, 0x95, 0xc8, 0xb9, 0xc2, 0xa6, 0xc5, 0xbc,
+                0xc4, 0x87, 0xc5, 0x94, 0xc4, 0x9e, 0x5e, 0xc3, 0xb0, 0x2a, 0x3a, 0xe1, 0x9b, 0x81,
+                0xc7, 0xab, 0xc5, 0x92, 0xc8, 0x8c, 0x5a, 0x5a,
             ],
             asset_base: [
-                0xb0, 0x42, 0x08, 0x91, 0xec, 0xa6, 0x2d, 0x05, 0xd6, 0x89, 0x51, 0x5a, 0x33, 0x90,
-                0xec, 0x57, 0xd8, 0xf7, 0xe9, 0x53, 0xea, 0x89, 0xcc, 0x01, 0xdd, 0xd3, 0xc1, 0x94,
-                0x39, 0xe5, 0x18, 0x21,
+                0xb1, 0x08, 0xcf, 0xf7, 0x04, 0xbf, 0xce, 0x2b, 0xdb, 0x86, 0xdb, 0xb8, 0x40, 0x3f,
+                0x02, 0x20, 0x3f, 0x1c, 0xa1, 0x50, 0x2d, 0x5e, 0x24, 0xe2, 0x21, 0xc2, 0x23, 0xd7,
+                0xeb, 0x82, 0xb2, 0x18,
             ],
         },
         TestVector {
             key: [
-                0xbb, 0xf4, 0x49, 0x82, 0xf1, 0xba, 0x3a, 0x2b, 0x9d, 0xd3, 0xc1, 0x77, 0x4d, 0x71,
-                0xce, 0x33, 0x60, 0x59, 0x9b, 0x07, 0xf2, 0x11, 0xc8, 0x16, 0xb8, 0xc4, 0x3b, 0x98,
-                0x42, 0x23, 0x09, 0x24,
+                0x72, 0xab, 0x8e, 0x45, 0x8e, 0xd4, 0xc8, 0xf2, 0xc5, 0xba, 0xa1, 0x18, 0x50, 0xac,
+                0xff, 0x71, 0x55, 0xd6, 0xad, 0x0d, 0xc9, 0x81, 0x55, 0x7b, 0x0a, 0x63, 0xab, 0xcb,
+                0xf4, 0xa6, 0x8d, 0xe3,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0x6d, 0xc3, 0xbf, 0xc7, 0xa9, 0xc6, 0x93, 0xc4, 0x8b, 0xc4, 0xb2, 0xc8, 0xba, 0xc6,
+                0xab, 0x2d, 0xc7, 0xa4, 0xe2, 0xb1, 0xa5, 0xc6, 0x8f, 0xc7, 0x9d, 0xe2, 0xb1, 0xb0,
+                0xc8, 0xaa, 0xc3, 0x91, 0xc7, 0xbb, 0xe2, 0xb1, 0xaa, 0xe2, 0xb1, 0xa8, 0xc6, 0x97,
+                0x24, 0xe1, 0x9b, 0xa6, 0x3d, 0xc3, 0x96, 0xc8, 0xaf, 0xc6, 0xb6, 0xc3, 0xbb, 0xc6,
+                0xad, 0xc5, 0x81, 0xc8, 0xbb, 0xc7, 0x91, 0xc6, 0x93, 0xc6, 0x8c, 0x2c, 0xc7, 0x9f,
+                0xc6, 0xa2, 0x67, 0xc6, 0xb3, 0xe2, 0xb1, 0xa0, 0xc2, 0xbe, 0xc4, 0x90, 0x4d, 0xe1,
+                0x9b, 0x99, 0xc6, 0x92, 0xe1, 0x9a, 0xa2, 0xe1, 0x9a, 0xb7, 0xe1, 0x9a, 0xa9, 0xe1,
+                0x9b, 0x94, 0xc6, 0xa1, 0x4a, 0xc4, 0xb8, 0xe1, 0x9a, 0xb9, 0xc2, 0xaa, 0xc7, 0x8e,
+                0xe2, 0xb1, 0xa7, 0x25, 0xc4, 0xa5, 0xc6, 0x9a, 0xc5, 0x82, 0xc4, 0xb2, 0xe2, 0xb1,
+                0xbf, 0xc8, 0x91, 0xc3, 0x8e, 0xcd, 0xb4, 0xc8, 0x82, 0xc4, 0xb2, 0xc8, 0xb4, 0xc5,
+                0x9f, 0xc5, 0x9b, 0xe1, 0x9a, 0xb0, 0xc8, 0xa8, 0xc3, 0x9f, 0xc7, 0x9e, 0xe1, 0x9b,
+                0x93, 0xe1, 0x9a, 0xaa, 0xc7, 0x94, 0xe2, 0xb1, 0xa7, 0x77, 0xc3, 0x9e, 0xc8, 0x85,
+                0xc2, 0xab, 0x5f, 0xc3, 0x91, 0xc2, 0xa5, 0xc6, 0xa7, 0xc4, 0x80, 0xe1, 0x9b, 0x92,
+                0xc2, 0xbf, 0xcd, 0xb4, 0xc5, 0xb9, 0xc8, 0xa1, 0xc8, 0x8c, 0xc4, 0x98, 0xc3, 0xa6,
+                0xc2, 0xab, 0xc4, 0x8d, 0xe1, 0x9a, 0xb6, 0xc7, 0x97, 0xc3, 0xa7, 0xc7, 0x99, 0xc3,
+                0x82, 0x65, 0xc7, 0x8f, 0xe1, 0x9b, 0x87, 0xc5, 0xa3, 0xe1, 0x9b, 0x96, 0xc7, 0x8a,
+                0xe1, 0x9b, 0x9f, 0xc6, 0xb0, 0x4e, 0x50, 0xc6, 0xb6, 0xc2, 0xa7, 0xc8, 0xa7, 0xc5,
+                0xbd, 0xc6, 0x96, 0xc6, 0x98, 0xc7, 0x96, 0x30, 0xc8, 0xa7, 0xc6, 0x8c, 0x2e, 0xc8,
+                0x8c, 0x62, 0xe1, 0x9a, 0xbf, 0xc4, 0x8c, 0xc7, 0x89, 0xe1, 0x9a, 0xa4, 0xc8, 0xa5,
+                0x45, 0xcd, 0xbe, 0xe1, 0x9b, 0xb0, 0xc3, 0x90, 0x40, 0xc3, 0xbe, 0xc4, 0x8f, 0xc6,
+                0x89, 0xc5, 0xb9, 0x6b, 0xc8, 0xbd, 0xc3, 0x97, 0xe1, 0x9a, 0xa0, 0xc7, 0xb3, 0xc5,
+                0xb7, 0xc7, 0x85, 0xc3, 0x92, 0xe2, 0xb1, 0xac, 0xc4, 0xb0, 0xc5, 0xbc, 0xc6, 0x9d,
+                0xc6, 0xbb, 0xc6, 0x82, 0xc6, 0x94, 0xc5, 0xb8, 0xc9, 0x8f, 0xc5, 0xbc, 0xc5, 0xad,
+                0xc7, 0x8f, 0xc5, 0xb0, 0xc7, 0x89, 0xc7, 0x82, 0xc6, 0x9c, 0x41, 0xc6, 0xbe, 0xc7,
+                0x93, 0xc5, 0xa2, 0xc6, 0xa5, 0xc7, 0x9c, 0xc5, 0x8d, 0xc7, 0x9f, 0xe1, 0x9b, 0x80,
+                0xc4, 0xba, 0xce, 0x8a, 0xc2, 0xaf, 0xc5, 0x8f, 0x79, 0xc5, 0xb7, 0xc6, 0x87, 0x48,
+                0xc2, 0xa9, 0xc4, 0xb4, 0xc3, 0x9b, 0xc8, 0x87, 0xc9, 0x8c, 0xc8, 0xb2, 0xe1, 0x9b,
+                0xa3, 0x68, 0xe2, 0xb1, 0xb6, 0xc5, 0x8c, 0xc2, 0xaa, 0x64, 0xc5, 0x85, 0x48, 0xc5,
+                0x87, 0x54, 0xe2, 0xb1, 0xaf, 0xc5, 0x88, 0xc4, 0x8f, 0xc5, 0x94, 0xe1, 0x9b, 0xa4,
+                0xe1, 0x9b, 0xa1, 0xc5, 0xa8, 0xc7, 0x92, 0xc4, 0xbc, 0xc4, 0xa8, 0xc8, 0x9f, 0xc3,
+                0xbd, 0xe1, 0x9b, 0xab, 0xe2, 0xb1, 0xa2, 0xe1, 0x9a, 0xa3, 0xc5, 0xac, 0xc8, 0x8e,
+                0xc7, 0xbf, 0xc3, 0xbb, 0xe1, 0x9b, 0x9a, 0xc5, 0x86, 0xc4, 0xae, 0xe2, 0xb1, 0xa9,
+                0xc7, 0x8a, 0x25, 0xc7, 0xbc, 0xc8, 0x89, 0x31, 0xc4, 0x84, 0xc3, 0x9c, 0xc2, 0xbd,
+                0xc3, 0x90, 0xe2, 0xb1, 0xb9, 0xc7, 0x97, 0xc5, 0xb7, 0xc3, 0x81, 0xc8, 0xa1, 0x6d,
+                0xc7, 0xa4, 0xc8, 0x9f, 0xc9, 0x8f, 0xe1, 0x9b, 0x95, 0xe1, 0x9b, 0x9a, 0x3e, 0xc3,
+                0x94, 0xc7, 0x94, 0xc4, 0xbc, 0xcd, 0xb4, 0xc8, 0xbd, 0xc7, 0xb1, 0x39, 0xc3, 0x8c,
+                0xe2, 0xb1, 0xa5, 0xc8, 0x82, 0xc7, 0x8b, 0x5a,
             ],
             asset_base: [
-                0xd7, 0x65, 0x7f, 0x6b, 0xf8, 0xc7, 0x11, 0x02, 0x3d, 0xbb, 0x0e, 0x3c, 0x6b, 0x7d,
-                0x19, 0xae, 0xc5, 0x22, 0x4b, 0x5b, 0xc8, 0x33, 0x73, 0xe6, 0x89, 0x31, 0xbb, 0x3c,
-                0x77, 0x8d, 0x19, 0x07,
+                0x9c, 0x64, 0x87, 0xfa, 0x7e, 0x3e, 0xd4, 0xc1, 0x7c, 0x02, 0x43, 0x93, 0x55, 0x14,
+                0xc9, 0x45, 0x4a, 0x6f, 0x21, 0x3f, 0x7b, 0x1c, 0x5b, 0x32, 0xab, 0xd5, 0xa8, 0x6e,
+                0x49, 0xe1, 0x35, 0x2d,
             ],
         },
         TestVector {
             key: [
-                0xb5, 0x9c, 0x5f, 0x32, 0x34, 0xd6, 0xca, 0x36, 0xcc, 0x48, 0x3d, 0x67, 0xa8, 0x4f,
-                0x37, 0xd6, 0xb2, 0x4b, 0x24, 0x45, 0x48, 0x25, 0xd2, 0xb7, 0xbf, 0xdc, 0x80, 0x2b,
-                0x2e, 0x32, 0x8c, 0x43,
+                0x0e, 0xf9, 0x1a, 0x2b, 0x56, 0xac, 0x5f, 0x19, 0xd1, 0xc9, 0xfb, 0x24, 0x98, 0x6c,
+                0x01, 0x36, 0x2d, 0x66, 0x39, 0x16, 0x0c, 0x27, 0x5b, 0x28, 0x02, 0x46, 0x50, 0x05,
+                0x14, 0x96, 0x98, 0x44,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0x49, 0xc2, 0xa7, 0xc3, 0xb0, 0x67, 0xe1, 0x9b, 0xa1, 0xc6, 0xa6, 0xc6, 0x95, 0xe1,
+                0x9a, 0xa8, 0xc7, 0xae, 0xc8, 0xa1, 0xc7, 0xbc, 0xe1, 0x9a, 0xba, 0xc8, 0x86, 0xe2,
+                0xb1, 0xa9, 0xc6, 0x8e, 0xe1, 0x9a, 0xb3, 0xe1, 0x9a, 0xa7, 0xc8, 0x88, 0xc3, 0x97,
+                0xc7, 0xac, 0xc7, 0x97, 0x64, 0xc7, 0xae, 0xc5, 0xab, 0xc3, 0x9c, 0xc4, 0x8e, 0xc3,
+                0x97, 0xc6, 0x83, 0xc4, 0x9e, 0xc9, 0x89, 0xc4, 0x9a, 0xc2, 0xaf, 0xc2, 0xaa, 0xc7,
+                0x92, 0xcd, 0xb1, 0x65, 0xc5, 0x92, 0xe1, 0x9b, 0xa3, 0xc7, 0x83, 0x4c, 0x63, 0xc2,
+                0xa5, 0xc4, 0xa5, 0x42, 0xc3, 0x9a, 0xc5, 0x85, 0xc5, 0x80, 0xc5, 0x9e, 0xc3, 0xa0,
+                0xc8, 0xb0, 0xcd, 0xb6, 0x75, 0xc6, 0x96, 0xce, 0x84, 0xc5, 0x93, 0xe2, 0xb1, 0xb9,
+                0xe2, 0xb1, 0xa8, 0xc7, 0xb0, 0x45, 0xc5, 0x8b, 0x7a, 0xc3, 0x84, 0xc6, 0x80, 0xc7,
+                0x9b, 0xc5, 0x9c, 0xc3, 0xa3, 0xc8, 0xba, 0xcd, 0xbc, 0xcd, 0xbd, 0xc8, 0xa7, 0xc4,
+                0x8a, 0xc5, 0xa2, 0xe2, 0xb1, 0xb7, 0xc4, 0x84, 0xcd, 0xbe, 0xc7, 0xa1, 0xc4, 0xa3,
+                0xc5, 0x9d, 0xc7, 0xad, 0xc8, 0xb6, 0xc7, 0xb5, 0xc5, 0x8e, 0xe1, 0x9a, 0xb6, 0x65,
+                0xe2, 0xb1, 0xb7, 0xc6, 0xaf, 0xc9, 0x8d, 0xe1, 0x9a, 0xbe, 0xc7, 0x8b, 0x5c, 0x74,
+                0xc8, 0x8a, 0xc8, 0x83, 0xc3, 0x87, 0xc3, 0x83, 0xc6, 0xba, 0xc8, 0xbf, 0xc4, 0x9b,
+                0x3e, 0xc7, 0x96, 0xc7, 0x8b, 0xc5, 0x81, 0xcd, 0xb2, 0xc5, 0x8e, 0xc8, 0x8d, 0xc3,
+                0xa1, 0x5f, 0xc5, 0xa9, 0xc2, 0xbb, 0xe1, 0x9a, 0xa6, 0xc9, 0x88, 0x5e, 0xc9, 0x85,
+                0xc8, 0x91, 0xe1, 0x9b, 0x8e, 0xc4, 0x8f, 0xe1, 0x9b, 0xa4, 0xe1, 0x9a, 0xa8, 0xc6,
+                0xa5, 0x77, 0xc3, 0x85, 0xc7, 0x97, 0xc3, 0xaf, 0xe1, 0x9a, 0xaf, 0x64, 0x6d, 0xc8,
+                0xa3, 0xc3, 0x92, 0xe2, 0xb1, 0xbd, 0xc8, 0xb7, 0xe1, 0x9b, 0x86, 0xe2, 0xb1, 0xb9,
+                0xc6, 0xa1, 0xc3, 0x82, 0xc7, 0x8b, 0xc7, 0x91, 0xc9, 0x86, 0xc5, 0x89, 0xe1, 0x9b,
+                0xae, 0xc8, 0xb6, 0xc4, 0xbb, 0x57, 0xc3, 0xa6, 0xc2, 0xa3, 0xc5, 0xad, 0x2a, 0x6e,
+                0xc3, 0x90, 0xc5, 0xa1, 0xc4, 0x87, 0xc2, 0xb7, 0xc5, 0xb1, 0xc4, 0x99, 0xc6, 0xbd,
+                0xe1, 0x9b, 0x81, 0xe1, 0x9b, 0x8e, 0x28, 0xc8, 0xb6, 0xc2, 0xb5, 0xe1, 0x9a, 0xa6,
+                0xc6, 0x83, 0xe1, 0x9a, 0xbe, 0xc6, 0xbf, 0x2f, 0xc3, 0x80, 0xe1, 0x9a, 0xa2, 0xc7,
+                0xa2, 0xc5, 0xb1, 0xe1, 0x9b, 0x83, 0xe1, 0x9a, 0xa7, 0xc6, 0x85, 0xc7, 0x93, 0xc5,
+                0x95, 0xc8, 0xaf, 0xc7, 0x97, 0x2e, 0xe2, 0xb1, 0xaf, 0xc8, 0xbf, 0xe1, 0x9b, 0x81,
+                0xc3, 0xac, 0x4d, 0xc3, 0xa0, 0xc6, 0x97, 0xe1, 0x9b, 0x92, 0xe1, 0x9b, 0x9f, 0xc4,
+                0x9d, 0xc8, 0x9b, 0xc6, 0xab, 0xc7, 0x92, 0xc6, 0x95, 0xc5, 0xbf, 0x6b, 0xc7, 0xa0,
+                0x5a, 0xc3, 0x94, 0xc6, 0x96, 0xc4, 0x8e, 0xc6, 0xac, 0xc6, 0xb9, 0xc3, 0xb1, 0xc8,
+                0xbd, 0xc8, 0x88, 0xc5, 0xb5, 0xc6, 0x9f, 0xc3, 0x9b, 0xc7, 0xae, 0xc5, 0x9c, 0xc4,
+                0xb5, 0xc6, 0x9e, 0xc3, 0x99, 0xc2, 0xa9, 0xc6, 0xba, 0xc8, 0x9f, 0xc7, 0x83, 0xc8,
+                0xbb, 0x34, 0xc3, 0xb5, 0xc5, 0x8a, 0x3b, 0xc2, 0xaa, 0x7b, 0xc4, 0x8c, 0xc3, 0xbb,
+                0xc8, 0xb9, 0xc5, 0xb5, 0xce, 0x87, 0xc2, 0xb8, 0xc3, 0x97, 0xe1, 0x9b, 0x84, 0xc8,
+                0x85, 0xc2, 0xa8, 0xc2, 0xab, 0xc8, 0x9a, 0xc6, 0xb2, 0xe2, 0xb1, 0xac, 0xc4, 0xa8,
+                0xc4, 0xb2, 0xc9, 0x8b, 0xc5, 0xb4, 0xc6, 0x84, 0xc3, 0xb0, 0xc6, 0xb9, 0xe2, 0xb1,
+                0xae, 0x5b, 0xc8, 0x8b, 0xc3, 0xaa, 0xc5, 0x82, 0xc5, 0xb6, 0xc8, 0x8d, 0xc9, 0x83,
+                0xc5, 0x91, 0xc9, 0x8c, 0xc2, 0xab, 0xc6, 0x9d,
             ],
             asset_base: [
-                0x75, 0xb8, 0x7f, 0x88, 0x85, 0xb9, 0x7f, 0x00, 0x70, 0x93, 0x89, 0xeb, 0x57, 0x0a,
-                0x59, 0x47, 0xd4, 0xca, 0x36, 0x19, 0x98, 0x10, 0xbd, 0x94, 0x37, 0xba, 0x7c, 0x4a,
-                0x2b, 0x24, 0xcd, 0xab,
+                0xb2, 0x75, 0x51, 0xe5, 0x55, 0x32, 0x2a, 0x10, 0x94, 0x42, 0x4d, 0x4c, 0xe8, 0x6d,
+                0xde, 0x6c, 0x6d, 0xf1, 0xbd, 0xec, 0xb6, 0x31, 0x5a, 0x6a, 0xa1, 0xc5, 0x58, 0xc9,
+                0x82, 0x49, 0x54, 0x13,
             ],
         },
         TestVector {
             key: [
-                0xff, 0x63, 0xc7, 0x89, 0x25, 0x1c, 0x10, 0x43, 0xc6, 0xf9, 0x6c, 0x66, 0xbf, 0x5b,
-                0x0f, 0x61, 0xc9, 0xd6, 0x5f, 0xef, 0x5a, 0xaf, 0x42, 0x84, 0xa6, 0xa5, 0x69, 0x94,
-                0x94, 0x1c, 0x05, 0xfa,
+                0x0b, 0x08, 0x3c, 0x42, 0x29, 0xbd, 0x05, 0x85, 0xa4, 0xa0, 0xf5, 0xe8, 0x06, 0x55,
+                0x2b, 0x65, 0xee, 0x24, 0xc7, 0x1a, 0x4a, 0x2a, 0x19, 0x7f, 0x9e, 0x85, 0x5e, 0xdc,
+                0x2e, 0x1a, 0x09, 0xfa,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc5, 0xa0, 0x2a, 0xc4, 0xbc, 0xc6, 0x92, 0xc6, 0x9b, 0xc6, 0x9f, 0xe1, 0x9b, 0xaf,
+                0xe2, 0xb1, 0xb7, 0xc4, 0x9a, 0xc8, 0x93, 0xe1, 0x9b, 0x8d, 0x2b, 0xc3, 0x8b, 0xe2,
+                0xb1, 0xa0, 0xc5, 0xa4, 0xc6, 0x9d, 0xc3, 0xb6, 0xc6, 0xb4, 0xc4, 0xb5, 0x68, 0xcd,
+                0xba, 0xc6, 0x91, 0xc3, 0xa5, 0xc2, 0xaf, 0xe2, 0xb1, 0xbe, 0x6d, 0xc9, 0x86, 0xc6,
+                0x8c, 0x30, 0xc6, 0x90, 0xc7, 0xb3, 0xe1, 0x9b, 0x96, 0x6e, 0xc5, 0xac, 0xe2, 0xb1,
+                0xbc, 0x41, 0xc6, 0xb6, 0xc6, 0xab, 0xe2, 0xb1, 0xb0, 0xc7, 0xa6, 0xe1, 0x9a, 0xa1,
+                0xc2, 0xaa, 0xe1, 0x9b, 0x8a, 0xc6, 0xa9, 0xc4, 0x91, 0xc4, 0xb8, 0xc2, 0xb7, 0xce,
+                0x8c, 0xc3, 0x98, 0x76, 0xc4, 0x98, 0xc5, 0xa4, 0xc7, 0x9f, 0xc5, 0xb9, 0xc8, 0x96,
+                0xe1, 0x9a, 0xbf, 0xce, 0x88, 0xc5, 0xaf, 0xc4, 0x94, 0xc3, 0x84, 0xc7, 0xa3, 0xc3,
+                0x8c, 0xc7, 0x99, 0xcd, 0xb5, 0xc7, 0x9c, 0xc7, 0xb7, 0xe1, 0x9b, 0x96, 0xc9, 0x82,
+                0xe1, 0x9a, 0xb0, 0xc6, 0x8b, 0xc6, 0x8f, 0xc7, 0x8c, 0x3c, 0x68, 0xc8, 0x8d, 0xc5,
+                0x8e, 0xc3, 0xaf, 0xc6, 0x90, 0xe1, 0x9a, 0xa5, 0xe1, 0x9a, 0xbe, 0x26, 0xcd, 0xbb,
+                0xc6, 0x80, 0xc5, 0x82, 0x34, 0xc3, 0x8a, 0x36, 0xc8, 0xa6, 0xcd, 0xbb, 0xe1, 0x9b,
+                0xa1, 0xc8, 0xaa, 0xc3, 0x86, 0x65, 0xc3, 0xaa, 0xc8, 0xa3, 0xc7, 0xa7, 0xc7, 0xa9,
+                0xc3, 0xbb, 0x61, 0xc3, 0xbe, 0xc5, 0xae, 0xc2, 0xb0, 0x6c, 0xc5, 0x9a, 0xc4, 0xbc,
+                0xc8, 0xb6, 0xc4, 0x82, 0xc4, 0x89, 0xc6, 0x8d, 0xc5, 0x90, 0xc8, 0x86, 0xc6, 0x8a,
+                0xc7, 0xac, 0xc8, 0x87, 0xe1, 0x9a, 0xb3, 0xc2, 0xa2, 0x33, 0xc8, 0x8b, 0x2b, 0xc8,
+                0x99, 0xc7, 0xae, 0x4e, 0xc5, 0xa2, 0xc5, 0xaa, 0x7e, 0xc7, 0x9b, 0xc6, 0x9d, 0xc6,
+                0xbe, 0xc8, 0xa8, 0xc6, 0xa9, 0xc4, 0xb0, 0xe1, 0x9b, 0xa9, 0xce, 0x89, 0x41, 0x7a,
+                0xc8, 0xbd, 0xe1, 0x9b, 0xaf, 0xc4, 0x8d, 0xc7, 0x88, 0x40, 0xc5, 0x9c, 0xe1, 0x9b,
+                0x9d, 0xc2, 0xac, 0xc9, 0x8d, 0x41, 0xc5, 0xae, 0xe1, 0x9b, 0x87, 0xc7, 0x92, 0xc4,
+                0x98, 0xc6, 0x97, 0xc2, 0xab, 0x63, 0xce, 0x8c, 0xe1, 0x9b, 0x9d, 0xc2, 0xbc, 0xc4,
+                0xae, 0xc4, 0x97, 0xc8, 0x91, 0xc5, 0xa6, 0x66, 0xc4, 0xb4, 0xc4, 0xb0, 0xe1, 0x9a,
+                0xb0, 0x65, 0xc8, 0xb4, 0xc7, 0x8b, 0xe1, 0x9a, 0xa2, 0xc5, 0x98, 0xc8, 0xa5, 0xc4,
+                0x9f, 0xce, 0x86, 0xc7, 0xa8, 0xc3, 0xaf, 0xc8, 0xa0, 0xc7, 0x96, 0xc4, 0xa3, 0xc4,
+                0x84, 0xc4, 0x98, 0xe1, 0x9b, 0x9e, 0xe2, 0xb1, 0xb1, 0xc2, 0xa3, 0xe1, 0x9b, 0xa7,
+                0xc8, 0x8f, 0xe1, 0x9a, 0xa9, 0xc5, 0xba, 0xc5, 0x8b, 0xe1, 0x9b, 0x97, 0xc8, 0xaa,
+                0xc7, 0x93, 0xc2, 0xaa, 0xc7, 0x96, 0xc3, 0xb5, 0xc5, 0xb0, 0xc8, 0x81, 0xc8, 0x93,
+                0xc2, 0xac, 0xc5, 0xa0, 0x3f, 0x5d, 0xc7, 0x97, 0x4a, 0xc7, 0x91, 0xc9, 0x80, 0xc6,
+                0x94, 0xc4, 0xba, 0xc3, 0x96, 0x3c, 0xe1, 0x9b, 0x90, 0xc3, 0x8f, 0xc5, 0xb1, 0xc3,
+                0xa8, 0xc4, 0xb6, 0xc6, 0x8e, 0xcd, 0xb6, 0xe1, 0x9b, 0x89, 0x26, 0xc7, 0x9f, 0xc6,
+                0x8c, 0xc3, 0xb5, 0xe1, 0x9b, 0xad, 0xc8, 0x85, 0xc2, 0xb7, 0xc6, 0x96, 0xc3, 0x8a,
+                0xe2, 0xb1, 0xab, 0xc8, 0x9a, 0x31, 0xc8, 0x81, 0xc7, 0xa9, 0x44, 0xc4, 0xb2, 0xe1,
+                0x9a, 0xb1, 0xe2, 0xb1, 0xa9, 0xc3, 0xa8, 0x2f, 0xc7, 0xa3, 0xc5, 0x83, 0xc5, 0xb5,
+                0xe2, 0xb1, 0xa5, 0xc5, 0xbb, 0xc8, 0x84, 0xc5, 0xbf, 0xc7, 0xb5, 0xc5, 0x80, 0xc2,
+                0xbc, 0xc5, 0xba, 0x74, 0xc8, 0x92, 0xc4, 0x99, 0xc7, 0xbc, 0xc7, 0x9d, 0xc2, 0xba,
+                0xc5, 0x91, 0x75, 0xc7, 0xbd, 0xe1, 0x9a, 0xb4,
             ],
             asset_base: [
-                0xda, 0x94, 0x71, 0x63, 0xc0, 0x67, 0x83, 0x60, 0xfc, 0x58, 0xb4, 0x33, 0xa8, 0x97,
-                0x66, 0x8e, 0x58, 0x2e, 0xce, 0x67, 0x8f, 0x31, 0xac, 0xb4, 0xb4, 0xad, 0x85, 0xbc,
-                0xd5, 0xf7, 0xc1, 0xae,
+                0x97, 0xf4, 0x4c, 0x37, 0x3a, 0x55, 0x30, 0xbd, 0xc9, 0xd4, 0xbb, 0x76, 0x26, 0x65,
+                0x03, 0xb4, 0xfd, 0x4a, 0x24, 0xf0, 0x22, 0x23, 0x13, 0xe4, 0xff, 0x45, 0x97, 0x74,
+                0xa6, 0x9a, 0x4f, 0x34,
             ],
         },
         TestVector {
             key: [
-                0x45, 0x61, 0x9f, 0x20, 0x6c, 0x3b, 0xfc, 0x84, 0xfd, 0x42, 0x4f, 0xfb, 0x5c, 0x81,
-                0x6f, 0x65, 0x4b, 0x27, 0xaa, 0x7f, 0x7b, 0x4b, 0xd6, 0x7e, 0xc5, 0xf9, 0xac, 0x6d,
-                0x0f, 0x38, 0xdb, 0xb1,
+                0x02, 0x66, 0x60, 0x55, 0xf4, 0x0b, 0x89, 0x61, 0x24, 0xe3, 0x67, 0x56, 0xa7, 0xa0,
+                0x93, 0xbb, 0x8e, 0x0b, 0xaa, 0x26, 0x3c, 0xab, 0x79, 0x67, 0x3b, 0x0f, 0x3d, 0x09,
+                0x74, 0x68, 0x8e, 0xa1,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xc7, 0xac, 0xc3, 0xa5, 0xc7, 0xa7, 0x62, 0xc3, 0xb5, 0x4d, 0xc6, 0x80, 0xc3, 0x83,
+                0xe1, 0x9a, 0xa5, 0x3c, 0xc5, 0x84, 0xc8, 0x92, 0xc5, 0x8f, 0xc4, 0x95, 0xc8, 0x95,
+                0xc3, 0xb4, 0xe1, 0x9b, 0x84, 0xc7, 0xa0, 0xc5, 0x83, 0xc9, 0x83, 0xe1, 0x9b, 0xb0,
+                0xe2, 0xb1, 0xb6, 0xcd, 0xb1, 0xe1, 0x9a, 0xb2, 0xc7, 0x85, 0xc7, 0x8d, 0xe1, 0x9b,
+                0x91, 0xc6, 0x9b, 0xc4, 0x8e, 0x63, 0xe1, 0x9a, 0xa7, 0x4c, 0xe1, 0x9b, 0xa0, 0xc6,
+                0xb0, 0xe2, 0xb1, 0xb5, 0xc2, 0xa1, 0xe1, 0x9b, 0x93, 0xc3, 0xa1, 0xc6, 0xb5, 0x68,
+                0xc5, 0xab, 0xc5, 0x8d, 0xc6, 0xb5, 0xc3, 0x8c, 0xce, 0x89, 0x4e, 0xc8, 0xb4, 0xc4,
+                0xb4, 0xc2, 0xb0, 0xc8, 0x99, 0xc3, 0x86, 0xc4, 0x91, 0xe1, 0x9b, 0x91, 0xe1, 0x9b,
+                0x88, 0x61, 0xc6, 0x8a, 0xc6, 0xa7, 0xc7, 0x8c, 0x71, 0x76, 0xc6, 0xbc, 0xe1, 0x9b,
+                0x9a, 0x77, 0xc5, 0x9c, 0xc8, 0xaa, 0xc3, 0x95, 0xc7, 0x9f, 0xce, 0x8c, 0xc3, 0xa5,
+                0xc4, 0x96, 0xc3, 0x95, 0xc3, 0xa2, 0xe1, 0x9b, 0x98, 0xc2, 0xb4, 0xc7, 0xb1, 0xcd,
+                0xb1, 0xc4, 0xbb, 0x2d, 0xc8, 0xa8, 0xe1, 0x9a, 0xab, 0xc7, 0x8f, 0xc4, 0x83, 0xe1,
+                0x9b, 0xa8, 0xc5, 0x93, 0xc8, 0x97, 0xe1, 0x9a, 0xa3, 0xc3, 0x81, 0xc3, 0x8a, 0x37,
+                0xc4, 0xa9, 0xc2, 0xb8, 0x2b, 0xc8, 0xbb, 0xc7, 0x91, 0xe1, 0x9a, 0xb7, 0xc7, 0xa3,
+                0x6c, 0xe1, 0x9b, 0x96, 0xc8, 0xbf, 0xc8, 0xaf, 0xc4, 0x98, 0xc9, 0x8e, 0xc8, 0x9e,
+                0xc2, 0xb9, 0xc7, 0x80, 0xc3, 0xb2, 0xc3, 0xb0, 0xc3, 0xa1, 0xc5, 0xaf, 0xc5, 0x83,
+                0xc4, 0x87, 0xe2, 0xb1, 0xbb, 0x4f, 0xc8, 0xa9, 0xc6, 0x9f, 0xc9, 0x8b, 0x67, 0xcd,
+                0xb4, 0x5a, 0xc2, 0xa7, 0xe2, 0xb1, 0xa6, 0xc5, 0x8c, 0xc3, 0x8f, 0xc6, 0x8b, 0xc7,
+                0x9c, 0xc9, 0x8a, 0xe2, 0xb1, 0xaa, 0xe2, 0xb1, 0xb0, 0xc8, 0xb7, 0xc4, 0x9e, 0xc6,
+                0xbd, 0xc2, 0xb0, 0xc5, 0x91, 0xc6, 0xbb, 0xc5, 0xbb, 0xc6, 0xa0, 0xc3, 0xa8, 0xc2,
+                0xa5, 0xc8, 0xb0, 0xc4, 0x91, 0xc2, 0xa9, 0xc2, 0xab, 0xc8, 0x99, 0xe1, 0x9a, 0xa4,
+                0xc5, 0x87, 0xe1, 0x9a, 0xa2, 0xc7, 0xa6, 0x37, 0x73, 0xc8, 0x8b, 0x74, 0xc5, 0xab,
+                0xc3, 0x85, 0xe1, 0x9b, 0x9c, 0xc6, 0x87, 0xc5, 0x82, 0xc4, 0xa9, 0xc8, 0x9b, 0xe2,
+                0xb1, 0xb2, 0x6f, 0x51, 0x75, 0xc3, 0xab, 0xc2, 0xbd, 0x49, 0xc4, 0x97, 0x5e, 0xc8,
+                0xb6, 0x5b, 0xc5, 0x9f, 0xc4, 0x98, 0xc8, 0x8f, 0x3a, 0xc6, 0x95, 0xc7, 0x8b, 0xc5,
+                0x89, 0x3f, 0xc5, 0x9f, 0xe1, 0x9b, 0x9e, 0xe2, 0xb1, 0xb1, 0xc7, 0x84, 0xc4, 0xa6,
+                0xe2, 0xb1, 0xa8, 0xc3, 0x85, 0xc3, 0xa5, 0xc8, 0x98, 0xc8, 0xa0, 0x5b, 0xc6, 0xba,
+                0xe1, 0x9a, 0xa6, 0xc4, 0xad, 0xe2, 0xb1, 0xab, 0xc7, 0xa1, 0xe2, 0xb1, 0xbf, 0xe1,
+                0x9b, 0xa8, 0x4c, 0xc4, 0x8f, 0x6a, 0xc5, 0x9d, 0xe1, 0x9b, 0xa8, 0xc6, 0xb5, 0xc8,
+                0x8b, 0xce, 0x8c, 0xc7, 0xa2, 0xc6, 0xbd, 0x33, 0xc4, 0xb0, 0xe1, 0x9a, 0xb2, 0xc7,
+                0x9d, 0xe2, 0xb1, 0xa5, 0xc2, 0xba, 0xc3, 0x8e, 0xc4, 0xbf, 0xc3, 0x9b, 0xc5, 0xad,
+                0x73, 0xe1, 0x9a, 0xa6, 0x31, 0xc8, 0x93, 0xc9, 0x84, 0xc6, 0x84, 0xc2, 0xa9, 0xc2,
+                0xa5, 0xe1, 0x9b, 0x91, 0xe1, 0x9b, 0xb0, 0xc3, 0x97, 0x4f, 0x6b, 0x48, 0xc3, 0xb2,
+                0xe1, 0x9a, 0xb5, 0xc5, 0x8a, 0xc5, 0x92, 0xe1, 0x9b, 0x8d, 0xc7, 0x8d, 0xc4, 0xa6,
+                0x26, 0xc3, 0xab, 0xc4, 0x95, 0xc3, 0xb4, 0xc7, 0x9f, 0xc8, 0xa6, 0xc7, 0xaa, 0xc6,
+                0xb5, 0xc5, 0x8c, 0x66, 0xc9, 0x82, 0xc7, 0x8a, 0xc7, 0x92, 0xc9, 0x88, 0xc4, 0x84,
+                0xe2, 0xb1, 0xb3, 0x47, 0xc6, 0xbb, 0xc8, 0x83,
             ],
             asset_base: [
-                0x01, 0xcb, 0x2c, 0x3f, 0xae, 0x16, 0xf2, 0xe5, 0x82, 0x1e, 0x34, 0x64, 0x70, 0x17,
-                0xf3, 0x68, 0x04, 0xb1, 0x7e, 0xfc, 0x8c, 0xb7, 0x69, 0x54, 0x79, 0x61, 0x5d, 0xe8,
-                0xf3, 0x2d, 0x29, 0x21,
+                0xe7, 0x25, 0x94, 0x56, 0x3c, 0xb3, 0x92, 0xab, 0xbe, 0x95, 0x61, 0x61, 0xfa, 0xed,
+                0x3d, 0x8d, 0xc4, 0xa1, 0xa0, 0x4e, 0x7c, 0x0d, 0x6e, 0x5b, 0xb8, 0x7d, 0x6c, 0xba,
+                0x68, 0xc4, 0x45, 0x27,
             ],
         },
         TestVector {
             key: [
-                0xbf, 0x39, 0x20, 0xce, 0x2e, 0x9e, 0x95, 0xb0, 0xee, 0xce, 0x13, 0x0a, 0x50, 0xba,
-                0x7d, 0xcc, 0x6f, 0x26, 0x51, 0x2a, 0x9f, 0xc7, 0xb8, 0x04, 0xaf, 0xf0, 0x89, 0xf5,
-                0x0c, 0xbc, 0xff, 0xf7,
+                0x0a, 0xc2, 0x8d, 0x35, 0x85, 0x55, 0x65, 0x95, 0xac, 0x16, 0x8a, 0x8c, 0xa3, 0xa0,
+                0x63, 0x31, 0x9c, 0xdf, 0xbb, 0x4f, 0xaf, 0x2c, 0xa2, 0x48, 0x1d, 0x4d, 0xaa, 0x04,
+                0x2d, 0x7c, 0xad, 0xa5,
             ],
             description: [
-                0xe1, 0x9b, 0xa9, 0xc4, 0x80, 0xc4, 0xbb, 0xe1, 0x9b, 0xa4, 0xc5, 0xa5, 0xc4, 0xac,
-                0xc5, 0xbb, 0x7e, 0xc6, 0x82, 0xc5, 0xaf, 0xc3, 0xbd, 0x3b, 0xc8, 0x88, 0xc3, 0xaa,
-                0xc6, 0x97, 0x2c, 0xc6, 0x82, 0x76, 0xe2, 0xb1, 0xa1, 0xc3, 0x9f, 0xc3, 0xa1, 0xc4,
-                0xa2, 0xc4, 0x92, 0xc6, 0xa8, 0xc4, 0x8e, 0xe1, 0x9a, 0xbb, 0xc5, 0xac, 0xcd, 0xb5,
-                0xc6, 0x80, 0xc6, 0xa5, 0xc8, 0xba, 0xc2, 0xa2, 0xc8, 0xb3, 0xc8, 0xa3, 0xc4, 0x98,
-                0x65, 0xe1, 0x9b, 0xb0, 0xe1, 0x9b, 0xa1, 0xc3, 0x96, 0x5c, 0xc8, 0x81, 0xc5, 0x93,
-                0xc6, 0xac, 0xc7, 0x9e, 0xc3, 0x8c, 0x53, 0xc7, 0xb9, 0xc4, 0x88, 0xc3, 0xa4, 0xc7,
-                0x96, 0x64, 0xc5, 0xa7, 0xc4, 0x81, 0x2b, 0x7a, 0xe2, 0xb1, 0xa1, 0xc6, 0xa9, 0xe1,
-                0x9b, 0xa1, 0xc8, 0xa4, 0xe1, 0x9b, 0x9b, 0xc5, 0xbf, 0xc6, 0x8d, 0xe2, 0xb1, 0xa9,
-                0xc8, 0xab, 0xe2, 0xb1, 0xb1, 0xc3, 0x99, 0xc5, 0x96, 0xc7, 0x95, 0xc6, 0xad, 0xc3,
-                0xac, 0xc3, 0x8a, 0x25, 0xc7, 0xa5, 0xc6, 0xa8, 0xe1, 0x9b, 0x80, 0xe2, 0xb1, 0xaf,
-                0xe1, 0x9b, 0xa1, 0xc7, 0xa0, 0xe1, 0x9b, 0xa6, 0xc5, 0xa0, 0xc7, 0x85, 0xc4, 0x99,
-                0xc6, 0xb7, 0x6e, 0xe1, 0x9b, 0xb0, 0x3b, 0x54, 0xc8, 0xa4, 0xc3, 0x89, 0xe1, 0x9a,
-                0xa4, 0x75, 0xc3, 0x9f, 0xc6, 0x98, 0xc4, 0xb8, 0xe1, 0x9b, 0xa7, 0xe2, 0xb1, 0xbb,
-                0xc5, 0xad, 0xc7, 0xbc, 0xc3, 0xaf, 0xc4, 0x9e, 0x61, 0xc8, 0x87, 0x61, 0xc5, 0x82,
-                0xe1, 0x9b, 0x8d, 0xc5, 0xbe, 0xc5, 0xa3, 0xc2, 0xb3, 0xc7, 0xb3, 0xc6, 0x90, 0xc8,
-                0x8b, 0xc6, 0x81, 0xe2, 0xb1, 0xb1, 0xc3, 0xa3, 0xc2, 0xa6, 0xe1, 0x9a, 0xb4, 0xe1,
-                0x9b, 0x81, 0xc6, 0x94, 0xc2, 0xb1, 0xc5, 0xaf, 0xc7, 0x84, 0xc3, 0xa6, 0xc5, 0xb6,
-                0xc3, 0x8a, 0x5c, 0xe1, 0x9b, 0x85, 0xe1, 0x9b, 0xa2, 0xc4, 0x99, 0xc2, 0xb4, 0xc5,
-                0x9b, 0xc8, 0xa8, 0xc8, 0x8f, 0x42, 0xc4, 0x8e, 0xe1, 0x9b, 0xaa, 0xc8, 0x89, 0x6e,
-                0xc5, 0xaf, 0xe1, 0x9a, 0xa8, 0xe1, 0x9a, 0xac, 0xc4, 0xa5, 0xc4, 0x8b, 0xc7, 0x8a,
-                0xe1, 0x9b, 0x93, 0xc8, 0xba, 0xc4, 0xbc, 0xc2, 0xa3, 0xc8, 0x9e, 0xc6, 0xbf, 0xc6,
-                0xb2, 0xcd, 0xbc, 0xc3, 0x9d, 0xc4, 0x98, 0xe1, 0x9b, 0x8f, 0xc4, 0x96, 0xc5, 0xa8,
-                0x77, 0xc4, 0x8d, 0xc5, 0x88, 0xc7, 0xa2, 0xc3, 0x81, 0xc7, 0x89, 0xc4, 0x92, 0xe1,
-                0x9a, 0xb7, 0xc7, 0xb1, 0xe2, 0xb1, 0xab, 0xc4, 0x9b, 0x5e, 0xc4, 0x8b, 0xe2, 0xb1,
-                0xa0, 0xe1, 0x9b, 0xad, 0xcd, 0xbd, 0xe1, 0x9a, 0xa1, 0xe2, 0xb1, 0xbb, 0xe1, 0x9a,
-                0xbf, 0xc8, 0xb1, 0xc6, 0x97, 0xcd, 0xbc, 0xc7, 0xb4, 0xc3, 0xb1, 0xe1, 0x9b, 0x86,
-                0x5d, 0xcd, 0xb2, 0xc6, 0xb0, 0xc9, 0x81, 0xc5, 0xac, 0x4a, 0xc8, 0x97, 0xc7, 0x94,
-                0x64, 0xc3, 0x80, 0xc5, 0xb8, 0xe1, 0x9b, 0x9b, 0xc4, 0x9a, 0xc8, 0xb5, 0xe1, 0x9b,
-                0x88, 0xe1, 0x9a, 0xa2, 0xc7, 0xae, 0xc4, 0xb5, 0x33, 0xc2, 0xb4, 0xc3, 0xb3, 0xc7,
-                0xb0, 0xc5, 0xbb, 0xe1, 0x9b, 0x98, 0xc8, 0xb6, 0x3d, 0x30, 0xe1, 0x9a, 0xa3, 0xc6,
-                0x95, 0xc3, 0x90, 0xc8, 0xae, 0xc9, 0x8f, 0xc3, 0x9b, 0xc6, 0xa7, 0x6a, 0xe1, 0x9a,
-                0xb8, 0xe1, 0x9a, 0xb5, 0xc4, 0xb0, 0xe1, 0x9b, 0x9d, 0x7b, 0xc6, 0xb1, 0xc6, 0xae,
-                0x30, 0xc8, 0xa0, 0xc5, 0x98, 0xc5, 0x91, 0xe1, 0x9a, 0xa3, 0xe2, 0xb1, 0xaf, 0xe2,
-                0xb1, 0xa9, 0xe1, 0x9b, 0x90, 0xc8, 0x89, 0xcd, 0xb4, 0xe1, 0x9b, 0x83, 0xc5, 0x88,
-                0xc2, 0xa5, 0xc6, 0x9c, 0xc2, 0xac, 0xc2, 0xb2, 0xe1, 0x9b, 0x88, 0x6f, 0xe1, 0x9b,
-                0x9b, 0xc5, 0xb4, 0xc6, 0xa7, 0xc8, 0x8f, 0x5a,
+                0xe2, 0xb1, 0xb0, 0xc6, 0x87, 0xc7, 0xb8, 0x58, 0xc8, 0x93, 0xe1, 0x9a, 0xb6, 0xc5,
+                0xbf, 0xc3, 0xb0, 0xc5, 0x92, 0xc3, 0x83, 0x25, 0xc2, 0xb4, 0xc6, 0xbd, 0xc6, 0x87,
+                0xe1, 0x9b, 0x81, 0xc4, 0x9e, 0xc6, 0x9c, 0xe1, 0x9b, 0x84, 0x46, 0x56, 0xe2, 0xb1,
+                0xa4, 0xc3, 0xa9, 0xc5, 0xab, 0xe1, 0x9a, 0xbb, 0x55, 0xc4, 0x85, 0xc4, 0xa8, 0xc2,
+                0xb1, 0xc8, 0xa4, 0xc3, 0xa4, 0x7e, 0xc4, 0x92, 0xc7, 0x9b, 0xc2, 0xac, 0xc3, 0xa1,
+                0xc4, 0x81, 0xcd, 0xb2, 0xc2, 0xa6, 0xc2, 0xa1, 0xc3, 0xa2, 0xe1, 0x9b, 0x95, 0xc5,
+                0xa4, 0xc7, 0xb5, 0xc8, 0x9f, 0xc9, 0x83, 0xe1, 0x9a, 0xa2, 0xc5, 0xb5, 0x25, 0xc5,
+                0x9d, 0xc3, 0xb1, 0x5f, 0xc5, 0xa8, 0x69, 0xe1, 0x9b, 0x88, 0xc4, 0xb2, 0xe2, 0xb1,
+                0xa8, 0xc8, 0xb8, 0x54, 0x4f, 0x2c, 0x6a, 0xc5, 0xbc, 0xc7, 0x84, 0xc8, 0x9b, 0xc6,
+                0x89, 0xc5, 0x9a, 0xc5, 0xb1, 0xc7, 0x8e, 0xc6, 0xab, 0xc6, 0xbe, 0xc6, 0xae, 0xc8,
+                0x8b, 0xc6, 0xbd, 0xc2, 0xa7, 0xc6, 0x9b, 0xc3, 0xb5, 0xc5, 0x8e, 0xc6, 0x92, 0xc8,
+                0xaa, 0xc3, 0xb3, 0xc7, 0xbf, 0xc2, 0xb4, 0xc3, 0xa6, 0xc7, 0xb7, 0xc7, 0x9a, 0xc3,
+                0xb1, 0xc2, 0xa7, 0xc4, 0xb8, 0xc6, 0x93, 0xc7, 0xae, 0xc6, 0x8c, 0x74, 0x5c, 0xc6,
+                0xa1, 0x42, 0x4c, 0xc6, 0xb6, 0xc9, 0x8a, 0x50, 0xc8, 0xba, 0xc7, 0xa5, 0xc8, 0x9d,
+                0xc8, 0x9b, 0xc5, 0xa0, 0xc7, 0x99, 0x21, 0x5e, 0x24, 0xc6, 0x93, 0xc6, 0x9b, 0xc7,
+                0x8d, 0xc8, 0x9b, 0xe1, 0x9b, 0x93, 0xc6, 0x8f, 0xc4, 0xb6, 0xe1, 0x9a, 0xa5, 0x45,
+                0xe1, 0x9b, 0x8e, 0xc6, 0xbe, 0xe1, 0x9b, 0x9e, 0xc6, 0xa8, 0xe1, 0x9a, 0xa7, 0xc4,
+                0xa6, 0xc5, 0x84, 0xc6, 0xbb, 0xc8, 0xad, 0xcd, 0xb2, 0xc6, 0xb8, 0x37, 0xc6, 0xb0,
+                0xe1, 0x9b, 0x84, 0xc3, 0x84, 0xc8, 0x80, 0xc4, 0xb5, 0xc6, 0x91, 0xe2, 0xb1, 0xa5,
+                0xc7, 0x83, 0x60, 0xc5, 0x8f, 0xc5, 0xb0, 0xc7, 0xa0, 0xc8, 0x96, 0xc2, 0xb2, 0xc8,
+                0xa7, 0xc6, 0x9f, 0x2d, 0xc6, 0x99, 0xc5, 0xb8, 0xe1, 0x9a, 0xa6, 0xc7, 0x9b, 0xc6,
+                0x9b, 0xc7, 0x99, 0xc3, 0x84, 0x3c, 0xc6, 0x9a, 0x52, 0xc3, 0xb0, 0xc5, 0xb7, 0xc2,
+                0xab, 0x56, 0xc3, 0x91, 0xc8, 0xbe, 0xc5, 0x84, 0xc8, 0x84, 0xc5, 0xb9, 0xc7, 0xac,
+                0xc8, 0x86, 0xc5, 0xa0, 0xc2, 0xb0, 0xc3, 0xa7, 0xe1, 0x9a, 0xb9, 0xe1, 0x9b, 0x84,
+                0xe1, 0x9b, 0x89, 0xc8, 0x80, 0xc6, 0x82, 0xc5, 0xb1, 0x73, 0xc6, 0x84, 0xc4, 0xb1,
+                0xc8, 0x8b, 0xc4, 0xab, 0xc3, 0xa5, 0xc5, 0xbb, 0xe1, 0x9b, 0x84, 0x63, 0xc3, 0xac,
+                0xc3, 0xad, 0xc3, 0xb8, 0xc5, 0xac, 0xc8, 0x8f, 0xc7, 0xb0, 0xc4, 0x9d, 0xe1, 0x9a,
+                0xac, 0xc6, 0x86, 0x7d, 0xe1, 0x9a, 0xbe, 0xc8, 0xac, 0xcd, 0xbc, 0xcd, 0xba, 0xce,
+                0x8c, 0xc5, 0x9e, 0x57, 0xc4, 0x83, 0xc8, 0x96, 0xc5, 0xb5, 0xe2, 0xb1, 0xac, 0xc4,
+                0xa6, 0xc8, 0xaf, 0xc8, 0x84, 0x65, 0xc5, 0x85, 0x5d, 0xc4, 0xb0, 0xc5, 0xbe, 0xc5,
+                0x9b, 0x3d, 0xc7, 0x80, 0xe1, 0x9b, 0x81, 0xc6, 0x94, 0xc4, 0xb3, 0xe1, 0x9b, 0xa7,
+                0xe2, 0xb1, 0xa2, 0x3d, 0xc5, 0x82, 0x4e, 0x44, 0xe1, 0x9a, 0xb5, 0xc6, 0x90, 0xc3,
+                0x85, 0xe1, 0x9b, 0x82, 0xe1, 0x9a, 0xb3, 0xc7, 0xa2, 0xc5, 0x93, 0xc6, 0xa9, 0xc5,
+                0x92, 0xc6, 0xb3, 0xce, 0x84, 0xe1, 0x9b, 0x87, 0xe1, 0x9b, 0x97, 0xe1, 0x9b, 0x9e,
+                0xc6, 0x81, 0xc4, 0xb7, 0xe1, 0x9b, 0x9e, 0x3d, 0xc7, 0xb8, 0xe1, 0x9b, 0x97, 0xe1,
+                0x9b, 0x9f, 0xc4, 0x81, 0xc5, 0x8a, 0x2c, 0xc6, 0x9a, 0x21, 0xc4, 0xb8, 0xc4, 0xa9,
+                0xc2, 0xa9, 0xc5, 0x89, 0xc8, 0xb5, 0x5a, 0x5a,
             ],
             asset_base: [
-                0x26, 0x21, 0x1d, 0x3b, 0x0b, 0xcf, 0x80, 0x41, 0x43, 0x30, 0x1b, 0x45, 0x23, 0x7b,
-                0x96, 0xc4, 0x97, 0xe6, 0xe3, 0x87, 0x2c, 0x75, 0xb8, 0xc1, 0x58, 0x67, 0x31, 0xda,
-                0x39, 0x1e, 0xc4, 0x25,
+                0x0b, 0xcf, 0xbd, 0x87, 0x2f, 0xc5, 0xed, 0x4c, 0x82, 0x80, 0x35, 0x16, 0x69, 0x20,
+                0x77, 0x21, 0xc6, 0xd2, 0x15, 0x67, 0xdd, 0x34, 0x10, 0x5c, 0x89, 0x7d, 0xbf, 0x66,
+                0x19, 0x95, 0xa3, 0x1d,
             ],
         },
     ]
diff --git a/src/test_vectors/keys.rs b/src/test_vectors/keys.rs
index 56d189478..0213eec1d 100644
--- a/src/test_vectors/keys.rs
+++ b/src/test_vectors/keys.rs
@@ -44,14 +44,14 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xd4, 0xe2, 0x0f, 0x15,
             ],
             isk: [
-                0x1c, 0xdd, 0x86, 0xb3, 0xcc, 0x43, 0x18, 0xd9, 0x61, 0x4f, 0xc8, 0x20, 0x90, 0x5d,
-                0x04, 0x2b, 0xb1, 0xef, 0x9c, 0xa3, 0xf2, 0x49, 0x88, 0xc7, 0xb3, 0x53, 0x42, 0x01,
-                0xcf, 0xb1, 0xcd, 0x8d,
+                0xac, 0xd2, 0x0b, 0x18, 0x3e, 0x31, 0xd4, 0x9f, 0x25, 0xc9, 0xa1, 0x38, 0xf4, 0x9b,
+                0x1a, 0x53, 0x7e, 0xdc, 0xf0, 0x4b, 0xe3, 0x4a, 0x98, 0x51, 0xa7, 0xaf, 0x9d, 0xb6,
+                0x99, 0x0e, 0xd8, 0x3d,
             ],
             ik: [
-                0x16, 0x88, 0x4f, 0x1d, 0xbc, 0x92, 0x90, 0x89, 0xa4, 0x17, 0x6e, 0x84, 0x0b, 0xb5,
-                0x81, 0xc8, 0x0e, 0x16, 0xe9, 0xb1, 0xab, 0xd6, 0x54, 0xe6, 0x2c, 0x8b, 0x0b, 0x95,
-                0x70, 0x20, 0xb7, 0x48,
+                0xd1, 0xa2, 0xfa, 0xb4, 0x17, 0x0c, 0x45, 0xc5, 0xf9, 0x79, 0xc8, 0xe7, 0x46, 0x3b,
+                0x8e, 0x20, 0xf2, 0x34, 0xde, 0x35, 0xeb, 0x58, 0xa8, 0x38, 0xdf, 0x9a, 0x1f, 0xe9,
+                0xb1, 0xa5, 0xaa, 0x45,
             ],
             nk: [
                 0x9f, 0x2f, 0x82, 0x67, 0x38, 0x94, 0x5a, 0xd0, 0x1f, 0x47, 0xf7, 0x0d, 0xb0, 0xc3,
@@ -111,7 +111,7 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x04, 0xfe, 0x32, 0xb2, 0x9b, 0x4f, 0x70, 0x6a, 0xa8, 0xf7, 0x42, 0x0f, 0x3d, 0x8e,
                 0x7a, 0x59, 0x70, 0x2f,
             ],
-            note_v: 4751042572350679487,
+            note_v: 15643327852135767324,
             note_rho: [
                 0x2c, 0xb5, 0xb4, 0x06, 0xed, 0x89, 0x85, 0xe1, 0x81, 0x30, 0xab, 0x33, 0x36, 0x26,
                 0x97, 0xb0, 0xe4, 0xe4, 0xc7, 0x63, 0xcc, 0xb8, 0xf6, 0x76, 0x49, 0x5c, 0x22, 0x2f,
@@ -123,94 +123,94 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x0c, 0x1d, 0x37, 0x10,
             ],
             note_cmx: [
-                0x6a, 0xcb, 0x59, 0x4e, 0x29, 0x6f, 0xfe, 0x99, 0xa8, 0x5c, 0x17, 0x5a, 0xa4, 0x22,
-                0xc8, 0x29, 0x3c, 0xe7, 0xe1, 0x9a, 0x92, 0xdf, 0x7f, 0x80, 0xae, 0x87, 0x66, 0x55,
-                0x44, 0x25, 0x83, 0x38,
+                0x45, 0x02, 0xe3, 0x39, 0x90, 0x1e, 0x39, 0x77, 0x17, 0x83, 0x91, 0x67, 0xcb, 0xb4,
+                0x03, 0x7e, 0x0e, 0xcf, 0x68, 0x13, 0xb5, 0x1c, 0x81, 0xfe, 0x08, 0x5a, 0x7b, 0x78,
+                0x2f, 0x12, 0x42, 0x28,
             ],
             note_nf: [
-                0x1c, 0x64, 0xc6, 0x82, 0x9a, 0x41, 0x21, 0xe1, 0x38, 0xd9, 0x8a, 0xae, 0xb4, 0xe6,
-                0xbd, 0x4f, 0xf4, 0x5a, 0x1d, 0xb8, 0x6d, 0xef, 0x9f, 0x08, 0xd6, 0xaa, 0x60, 0x5a,
-                0x97, 0xf3, 0x79, 0x39,
+                0x1b, 0x32, 0xed, 0xbb, 0xe4, 0xd1, 0x8f, 0x28, 0x87, 0x6d, 0xe2, 0x62, 0x51, 0x8a,
+                0xd3, 0x11, 0x22, 0x70, 0x1f, 0x8c, 0x0a, 0x52, 0xe9, 0x80, 0x47, 0xa3, 0x37, 0x87,
+                0x6e, 0x7e, 0xea, 0x19,
             ],
         },
         TestVector {
             sk: [
-                0xac, 0xd2, 0x0b, 0x18, 0x3e, 0x31, 0xd4, 0x9f, 0x25, 0xc9, 0xa1, 0x38, 0xf4, 0x9b,
-                0x1a, 0x53, 0x7e, 0xdc, 0xf0, 0x4b, 0xe3, 0x4a, 0x98, 0x51, 0xa7, 0xaf, 0x9d, 0xb6,
-                0x99, 0x0e, 0xd8, 0x3d,
+                0xd6, 0x4a, 0xf3, 0x59, 0x7c, 0x04, 0x32, 0x3e, 0xa5, 0x1b, 0x00, 0x52, 0xad, 0x80,
+                0x84, 0xa8, 0xb9, 0xda, 0x94, 0x8d, 0x32, 0x0d, 0xad, 0xd6, 0x4f, 0x54, 0x31, 0xe6,
+                0x1d, 0xdf, 0x65, 0x8d,
             ],
             ask: [
-                0x41, 0xd4, 0x7c, 0xc9, 0x63, 0x13, 0xb4, 0x82, 0x1d, 0xfc, 0x12, 0x96, 0x51, 0xc3,
-                0x13, 0x7f, 0x44, 0xd9, 0xca, 0xd1, 0x6b, 0x3d, 0xc0, 0x81, 0x33, 0xc3, 0xd2, 0xdf,
-                0x0d, 0x0c, 0x53, 0x20,
+                0x09, 0x25, 0x99, 0x63, 0x5a, 0xdb, 0x8e, 0x4e, 0x49, 0x04, 0x8d, 0x69, 0xd7, 0xfd,
+                0x8c, 0xbd, 0x6a, 0x19, 0xda, 0x87, 0x4e, 0x63, 0xdd, 0xdc, 0xd9, 0xee, 0x13, 0xbf,
+                0xa5, 0xce, 0x3b, 0x16,
             ],
             ak: [
-                0x6d, 0xe1, 0x34, 0x98, 0x30, 0xd6, 0x6d, 0x7b, 0x97, 0xfe, 0x23, 0x1f, 0xc7, 0xb0,
-                0x2a, 0xd6, 0x43, 0x23, 0x62, 0x9c, 0xfe, 0xd1, 0xe3, 0xaa, 0x24, 0xef, 0x05, 0x2f,
-                0x56, 0xe4, 0x00, 0x2a,
+                0x6e, 0x44, 0x56, 0x73, 0x37, 0xc9, 0xa0, 0x26, 0xff, 0x00, 0xae, 0x91, 0x8b, 0xe7,
+                0xc0, 0x8e, 0x50, 0x20, 0x44, 0x98, 0xbb, 0x43, 0x12, 0x30, 0x28, 0x4d, 0x05, 0xf1,
+                0xce, 0x53, 0xef, 0x3f,
             ],
             isk: [
-                0xd6, 0x4a, 0xf3, 0x59, 0x7c, 0x04, 0x32, 0x3e, 0xa5, 0x1b, 0x00, 0x52, 0xad, 0x80,
-                0x84, 0xa8, 0xb9, 0xda, 0x94, 0x8d, 0x32, 0x0d, 0xad, 0xd6, 0x4f, 0x54, 0x31, 0xe6,
-                0x1d, 0xdf, 0x65, 0x8d,
+                0x84, 0xb2, 0x7d, 0xb5, 0x9a, 0x4a, 0x15, 0x3d, 0x88, 0x2d, 0x2b, 0x21, 0x03, 0x59,
+                0x65, 0x55, 0xed, 0x94, 0x94, 0xc6, 0xac, 0x89, 0x3c, 0x49, 0x72, 0x38, 0x33, 0xec,
+                0x89, 0x26, 0xc1, 0x03,
             ],
             ik: [
-                0x46, 0x2e, 0xe2, 0x38, 0x00, 0xc2, 0x1e, 0x2b, 0xbd, 0x90, 0x2b, 0xf7, 0x2f, 0x60,
-                0xe1, 0xab, 0x08, 0x26, 0xd3, 0x68, 0x0c, 0x6f, 0xd0, 0xa2, 0x6f, 0x87, 0xdb, 0xac,
-                0xd0, 0xd7, 0x6c, 0xa0,
+                0x39, 0x62, 0x5b, 0x51, 0xaa, 0x0a, 0x3d, 0xde, 0x54, 0x6e, 0xde, 0x39, 0xa1, 0x23,
+                0x2f, 0xa9, 0xba, 0xe8, 0x71, 0xab, 0x4f, 0x18, 0xe9, 0x0e, 0x5a, 0xe8, 0x03, 0x8c,
+                0xce, 0xef, 0x66, 0x37,
             ],
             nk: [
-                0xa8, 0xb7, 0x3d, 0x97, 0x9b, 0x6e, 0xaa, 0xda, 0x89, 0x24, 0xbc, 0xbd, 0xc6, 0x3a,
-                0x9e, 0xf4, 0xe8, 0x73, 0x46, 0xf2, 0x30, 0xab, 0xa6, 0xbb, 0xe1, 0xe2, 0xb4, 0x3c,
-                0x5b, 0xea, 0x6b, 0x22,
+                0x26, 0x84, 0x71, 0xe4, 0x66, 0xfe, 0x31, 0x2d, 0xd2, 0x07, 0x5d, 0x1a, 0x1a, 0x07,
+                0xd8, 0x9b, 0x3e, 0xd2, 0x69, 0xba, 0x73, 0x97, 0xcf, 0x80, 0x14, 0xdd, 0x93, 0xbf,
+                0xad, 0xd9, 0xa7, 0x34,
             ],
             rivk: [
-                0xda, 0xcb, 0x2f, 0x2a, 0x9c, 0xed, 0x36, 0x31, 0x71, 0x82, 0x1a, 0xaf, 0x5d, 0x8c,
-                0xd9, 0x02, 0xbc, 0x5e, 0x3a, 0x5a, 0x41, 0xfb, 0x51, 0xae, 0x61, 0xa9, 0xf0, 0x2d,
-                0xc8, 0x9d, 0x1d, 0x12,
+                0x8d, 0x5e, 0x27, 0x86, 0xb5, 0x03, 0xc4, 0x65, 0xc7, 0x49, 0x03, 0x73, 0x46, 0x53,
+                0xda, 0xff, 0xa3, 0x7a, 0x02, 0xad, 0x69, 0x76, 0x1a, 0x7c, 0x8a, 0x4d, 0x79, 0x83,
+                0x02, 0xac, 0xe2, 0x3c,
             ],
             ivk: [
-                0x56, 0x3a, 0x6d, 0xb6, 0x0c, 0x74, 0xc2, 0xdb, 0x08, 0x49, 0x2c, 0xba, 0xe3, 0xbb,
-                0x08, 0x3f, 0x1a, 0xea, 0xbf, 0xfb, 0xcf, 0x42, 0x55, 0x1d, 0x0a, 0xc6, 0x4f, 0x26,
-                0x90, 0x53, 0x67, 0x11,
+                0x35, 0xee, 0x37, 0x20, 0xc5, 0x5b, 0x02, 0x49, 0x75, 0x66, 0xa2, 0x50, 0x5d, 0x28,
+                0x59, 0x60, 0xab, 0xf8, 0xc0, 0x5e, 0x68, 0x46, 0x9e, 0xad, 0x23, 0x91, 0xc9, 0x50,
+                0xd6, 0xee, 0xc1, 0x10,
             ],
             ovk: [
-                0x71, 0xcd, 0x30, 0x64, 0x0f, 0xdb, 0x63, 0xf8, 0xd1, 0x30, 0x50, 0x29, 0xe9, 0x40,
-                0xe5, 0x3f, 0xd5, 0xec, 0x04, 0xa8, 0xcc, 0xad, 0x41, 0x95, 0x78, 0xc2, 0x42, 0xfe,
-                0xc0, 0x5b, 0x9a, 0xf7,
+                0x60, 0x1a, 0xa8, 0xb5, 0x2f, 0xa8, 0x6b, 0x79, 0x5a, 0x18, 0x56, 0x0b, 0xcc, 0xc8,
+                0x3d, 0xb1, 0xb5, 0xf9, 0x88, 0x25, 0x3c, 0xdd, 0x82, 0xf8, 0x84, 0x79, 0x2a, 0x04,
+                0x25, 0x6f, 0x7b, 0x6d,
             ],
             dk: [
-                0x9d, 0x9b, 0xd4, 0x45, 0x25, 0xe7, 0xae, 0x06, 0xb0, 0x3a, 0xe6, 0xd4, 0xae, 0xcd,
-                0xe6, 0xae, 0x09, 0x27, 0xa7, 0xc6, 0x67, 0xd5, 0xd9, 0xf8, 0x17, 0x6b, 0x54, 0x46,
-                0x95, 0xdf, 0xec, 0x11,
+                0x8a, 0x86, 0x44, 0xba, 0x40, 0xd0, 0xd0, 0x17, 0xf8, 0x1b, 0x04, 0xbb, 0x40, 0x0c,
+                0x1b, 0xf8, 0x41, 0xfa, 0xce, 0x94, 0x6d, 0xc9, 0x8e, 0xc5, 0xde, 0xc6, 0xdd, 0x8f,
+                0x9c, 0x32, 0x58, 0xee,
             ],
             default_d: [
-                0x78, 0x07, 0xca, 0x65, 0x08, 0x58, 0x81, 0x4d, 0x50, 0x22, 0xa8,
+                0x44, 0x44, 0x93, 0xdb, 0xbc, 0x1a, 0x29, 0xe5, 0xe2, 0x6f, 0x6c,
             ],
             default_pk_d: [
-                0x3d, 0x3d, 0xe4, 0xd5, 0x2c, 0x77, 0xfd, 0x0b, 0x63, 0x0a, 0x40, 0xdc, 0x38, 0x21,
-                0x24, 0x87, 0xb2, 0xff, 0x6e, 0xee, 0xf5, 0x6d, 0x8c, 0x6a, 0x61, 0x63, 0xe8, 0x54,
-                0xaf, 0xf0, 0x41, 0x89,
+                0x92, 0xcc, 0x30, 0xfa, 0xcd, 0x3a, 0xd8, 0xe6, 0xe4, 0xbb, 0xe6, 0xde, 0xdc, 0x71,
+                0x9a, 0x09, 0x42, 0xaa, 0xf2, 0x77, 0xd6, 0xab, 0x39, 0x29, 0x2c, 0x26, 0x75, 0x78,
+                0x15, 0x14, 0xd8, 0x93,
             ],
             internal_rivk: [
-                0x8a, 0x22, 0xa7, 0xf5, 0xa1, 0xe9, 0x1a, 0x92, 0xad, 0x39, 0x4b, 0x18, 0xeb, 0x73,
-                0x38, 0xb5, 0x92, 0x47, 0x0d, 0xd4, 0x2b, 0xe8, 0xef, 0x84, 0xc9, 0x3e, 0x7c, 0xd8,
-                0x45, 0xec, 0xfa, 0x32,
+                0xc8, 0x17, 0xbf, 0x0f, 0x2d, 0xe1, 0xd1, 0xa4, 0x12, 0x52, 0x73, 0xb1, 0x15, 0x71,
+                0xca, 0xe0, 0x67, 0x0c, 0xe3, 0xe4, 0x45, 0x6f, 0xbe, 0x0e, 0xb9, 0x03, 0x57, 0xda,
+                0x15, 0xea, 0x2b, 0x03,
             ],
             internal_ivk: [
-                0x12, 0x11, 0x83, 0xcb, 0x3b, 0x8d, 0x06, 0xf5, 0x99, 0xbb, 0x38, 0xb3, 0x73, 0x22,
-                0x85, 0x1e, 0x5f, 0xc9, 0x5a, 0xd0, 0xc9, 0x70, 0x7e, 0xe8, 0x5f, 0xb6, 0x5e, 0x21,
-                0xf1, 0xa3, 0x0d, 0x13,
+                0xcb, 0x28, 0xb7, 0xb9, 0x46, 0xe8, 0xf0, 0xb1, 0xa5, 0xda, 0x87, 0x6d, 0xda, 0x0c,
+                0xac, 0x64, 0x1f, 0xc7, 0xfc, 0x16, 0x4e, 0x18, 0x99, 0xa6, 0xa5, 0xe0, 0xd8, 0x24,
+                0x8c, 0xb1, 0x72, 0x3c,
             ],
             internal_ovk: [
-                0x93, 0x25, 0x2b, 0x24, 0xb4, 0x91, 0xd9, 0xc9, 0xc9, 0x97, 0x65, 0xc8, 0x4d, 0x4a,
-                0xc7, 0xc2, 0xbf, 0xf0, 0x54, 0xcd, 0x9c, 0xad, 0xcd, 0x3e, 0x01, 0xb2, 0x6f, 0x21,
-                0xe2, 0x84, 0x09, 0x09,
+                0x6c, 0x94, 0xe6, 0xe4, 0x55, 0x9e, 0x70, 0xca, 0x50, 0xc5, 0x81, 0x25, 0x94, 0xf7,
+                0x5c, 0x22, 0x93, 0x5d, 0x91, 0xea, 0xf7, 0x23, 0x56, 0x8e, 0xae, 0x2f, 0x9d, 0xc4,
+                0xe9, 0x66, 0x0b, 0x53,
             ],
             internal_dk: [
-                0x6e, 0xea, 0x18, 0xfd, 0x0d, 0x50, 0x70, 0x7f, 0x90, 0xdf, 0x00, 0x2c, 0xbf, 0x30,
-                0x9e, 0xca, 0x3c, 0x00, 0xd3, 0x98, 0xae, 0xde, 0x1f, 0xdc, 0x2a, 0xbf, 0xfc, 0x88,
-                0x35, 0x38, 0x59, 0xaf,
+                0x74, 0xb6, 0xa8, 0xee, 0x5b, 0x9b, 0x14, 0x84, 0x5e, 0x3e, 0x80, 0x7b, 0x84, 0x66,
+                0x8e, 0xe4, 0xe4, 0x57, 0xd6, 0x40, 0xe3, 0xa3, 0xff, 0x61, 0x43, 0x6f, 0xe3, 0xda,
+                0xcb, 0xaa, 0x01, 0xe9,
             ],
             asset: [
                 0x67, 0x43, 0xf9, 0x3a, 0x6e, 0xbd, 0xa7, 0x2a, 0x8c, 0x7c, 0x5a, 0x2b, 0x7f, 0xa3,
@@ -229,94 +229,94 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xaa, 0xbe, 0x3f, 0x1a,
             ],
             note_cmx: [
-                0x3b, 0x7a, 0x77, 0x4e, 0x5a, 0xc0, 0x16, 0xfd, 0x2a, 0x8a, 0x2b, 0xa0, 0x21, 0x2e,
-                0x67, 0xfe, 0x16, 0x92, 0x9b, 0xa7, 0x2e, 0x7b, 0x82, 0x70, 0x8b, 0xd5, 0x74, 0x96,
-                0xfb, 0xb3, 0x0f, 0x22,
+                0x23, 0x60, 0xbf, 0xad, 0x63, 0xb5, 0x1e, 0xfb, 0x16, 0x00, 0xa7, 0x6f, 0xf7, 0x3a,
+                0xd7, 0x33, 0x54, 0x11, 0x31, 0x8a, 0x6a, 0x4b, 0x02, 0xb7, 0x57, 0x78, 0x3f, 0x01,
+                0xdb, 0xa0, 0x40, 0x14,
             ],
             note_nf: [
-                0x6c, 0xba, 0xbc, 0xfe, 0x07, 0x58, 0xc0, 0x61, 0x75, 0x59, 0x3f, 0xcc, 0x89, 0x37,
-                0x55, 0x9a, 0xc1, 0xc7, 0xb7, 0x22, 0xd5, 0x65, 0xa1, 0xf3, 0xfc, 0xf0, 0xb8, 0xc5,
-                0x90, 0x37, 0x8a, 0x1c,
+                0xd7, 0xa8, 0x9c, 0xee, 0x48, 0x18, 0xfc, 0x86, 0x4b, 0x11, 0xa0, 0x8f, 0x65, 0xad,
+                0x3d, 0xbf, 0x26, 0xd4, 0x37, 0x99, 0x7f, 0x6a, 0xb8, 0xa6, 0x02, 0x58, 0x3b, 0xfc,
+                0x6a, 0x62, 0x04, 0x10,
             ],
         },
         TestVector {
             sk: [
-                0x84, 0xb2, 0x7d, 0xb5, 0x9a, 0x4a, 0x15, 0x3d, 0x88, 0x2d, 0x2b, 0x21, 0x03, 0x59,
-                0x65, 0x55, 0xed, 0x94, 0x94, 0xc6, 0xac, 0x89, 0x3c, 0x49, 0x72, 0x38, 0x33, 0xec,
-                0x89, 0x26, 0xc1, 0x03,
+                0x95, 0x86, 0xa7, 0xaf, 0xcf, 0x4a, 0x0d, 0x9c, 0x73, 0x1e, 0x98, 0x5d, 0x99, 0x58,
+                0x9c, 0x8b, 0xb8, 0x38, 0xe8, 0xaa, 0xf7, 0x45, 0x53, 0x3e, 0xd9, 0xe8, 0xae, 0x3a,
+                0x1c, 0xd0, 0x74, 0xa5,
             ],
             ask: [
-                0xe0, 0x9b, 0x65, 0x10, 0x87, 0x7d, 0xd4, 0x0e, 0x85, 0x4e, 0xe4, 0xb9, 0xc4, 0xc3,
-                0x89, 0x8e, 0xc1, 0xe7, 0x26, 0x60, 0xfe, 0xf5, 0xb0, 0xab, 0xda, 0xdb, 0xa8, 0x08,
-                0x10, 0x50, 0xae, 0x38,
+                0xfa, 0x33, 0x7b, 0xa3, 0x9b, 0x90, 0x62, 0xd5, 0x11, 0x74, 0x68, 0x63, 0x83, 0xc8,
+                0xa5, 0x99, 0x5a, 0x47, 0x6e, 0xc1, 0xe0, 0xc7, 0x0b, 0x68, 0xa2, 0x00, 0x3c, 0xd4,
+                0x79, 0x25, 0x3e, 0x26,
             ],
             ak: [
-                0x53, 0xf7, 0x4b, 0x84, 0x33, 0xe9, 0x4a, 0xae, 0xb8, 0x5f, 0x5e, 0xb4, 0x1a, 0x89,
-                0xc1, 0x0f, 0xe2, 0x0a, 0xe0, 0x03, 0xec, 0xf4, 0xbc, 0xe1, 0x63, 0x38, 0xd9, 0x75,
-                0x88, 0x65, 0x6b, 0x38,
+                0xc4, 0xfd, 0xec, 0x5a, 0xc0, 0xc4, 0x8b, 0xe1, 0xf2, 0xb0, 0x60, 0xfa, 0x21, 0x40,
+                0x7f, 0x85, 0xd2, 0xd4, 0x52, 0xf2, 0x8f, 0xc6, 0x42, 0xed, 0x67, 0x50, 0xec, 0x6d,
+                0x8c, 0xf8, 0x7c, 0x22,
             ],
             isk: [
-                0x95, 0x86, 0xa7, 0xaf, 0xcf, 0x4a, 0x0d, 0x9c, 0x73, 0x1e, 0x98, 0x5d, 0x99, 0x58,
-                0x9c, 0x8b, 0xb8, 0x38, 0xe8, 0xaa, 0xf7, 0x45, 0x53, 0x3e, 0xd9, 0xe8, 0xae, 0x3a,
-                0x1c, 0xd0, 0x74, 0xa5,
+                0x58, 0xcf, 0xb5, 0xcd, 0x79, 0xf8, 0x80, 0x08, 0xe3, 0x15, 0xdc, 0x7d, 0x83, 0x88,
+                0xe7, 0x6c, 0x17, 0x82, 0xfd, 0x27, 0x95, 0xd1, 0x8a, 0x76, 0x36, 0x24, 0xc2, 0x5f,
+                0xa9, 0x59, 0xcc, 0x97,
             ],
             ik: [
-                0xcb, 0x48, 0x0d, 0x9b, 0x96, 0x27, 0x3e, 0x89, 0x91, 0x40, 0x89, 0xa1, 0x04, 0xc2,
-                0xc9, 0x36, 0xd0, 0x75, 0x95, 0xd4, 0xf8, 0x46, 0xad, 0xa6, 0xca, 0xea, 0x68, 0x5c,
-                0x88, 0x0b, 0x8a, 0xf8,
+                0x78, 0xd1, 0xdc, 0xef, 0xee, 0x06, 0xc5, 0x66, 0x7f, 0x19, 0x76, 0xa5, 0x66, 0x73,
+                0x13, 0x0b, 0x9e, 0x72, 0x05, 0xf3, 0xa5, 0x0a, 0xd1, 0x96, 0x00, 0x89, 0x6c, 0xe5,
+                0xc2, 0x64, 0xfa, 0xf6,
             ],
             nk: [
-                0x6e, 0x37, 0x10, 0xbc, 0xa6, 0x80, 0x46, 0xc8, 0x3e, 0x54, 0x80, 0xbf, 0xe7, 0x3f,
-                0xd7, 0x54, 0x13, 0x5d, 0xc0, 0x7f, 0xa1, 0xd1, 0x1b, 0x86, 0x5f, 0xd1, 0x5e, 0x7c,
-                0x4e, 0x63, 0xe2, 0x02,
+                0x9d, 0xca, 0xb0, 0x5e, 0x6c, 0x24, 0x15, 0xad, 0x65, 0xb6, 0x4e, 0x6a, 0x9a, 0xec,
+                0xb1, 0x53, 0x60, 0x77, 0x87, 0x8d, 0x85, 0xc5, 0x33, 0x9a, 0x2b, 0x59, 0x79, 0x06,
+                0xdf, 0xba, 0x9f, 0x3e,
             ],
             rivk: [
-                0xaa, 0xcc, 0xc8, 0x41, 0xfe, 0x74, 0x89, 0x49, 0xcf, 0x90, 0x59, 0xb5, 0x41, 0x1c,
-                0x2c, 0xe8, 0xf0, 0x07, 0x05, 0x00, 0x23, 0x85, 0x2d, 0xd5, 0x8d, 0xb0, 0xb6, 0x9b,
-                0x44, 0xfe, 0xf5, 0x33,
+                0x4b, 0x61, 0x99, 0xae, 0x4c, 0x65, 0x21, 0x61, 0x11, 0x3d, 0x78, 0x75, 0xfa, 0x2f,
+                0x85, 0xde, 0x60, 0xa1, 0xa2, 0x01, 0x73, 0x75, 0x9e, 0xa6, 0xb7, 0xcd, 0x8e, 0xc7,
+                0xe5, 0x9b, 0x20, 0x35,
             ],
             ivk: [
-                0xa8, 0x1d, 0xfd, 0x18, 0xbf, 0x1e, 0x5e, 0xad, 0x3d, 0x10, 0x02, 0xf5, 0xfe, 0x4b,
-                0xcb, 0x89, 0xde, 0xea, 0xf9, 0xd6, 0x4c, 0xf8, 0x0a, 0xef, 0xdc, 0xb6, 0xcd, 0x0c,
-                0xb7, 0xd1, 0x79, 0x02,
+                0x1d, 0x9e, 0x91, 0xca, 0x38, 0x82, 0x79, 0x59, 0x18, 0x53, 0x6b, 0x51, 0x14, 0xae,
+                0x21, 0x63, 0x57, 0x62, 0xf1, 0x49, 0xc9, 0x59, 0x09, 0x80, 0x3f, 0x36, 0xea, 0x9f,
+                0xca, 0x71, 0x1f, 0x2f,
             ],
             ovk: [
-                0x45, 0xcf, 0x1a, 0x1d, 0xf6, 0x62, 0xfe, 0xc0, 0xf7, 0x84, 0x7a, 0x63, 0xa0, 0xd7,
-                0x95, 0x51, 0xe1, 0xb0, 0x49, 0xc3, 0xc3, 0x58, 0x7e, 0x68, 0x37, 0xa7, 0x54, 0x45,
-                0xa0, 0x04, 0x12, 0xa7,
+                0x94, 0x30, 0xaf, 0xfd, 0x7e, 0x29, 0x2b, 0xa8, 0xf7, 0xab, 0x0c, 0xc1, 0xfa, 0xcd,
+                0x67, 0xb4, 0x99, 0x59, 0x4b, 0xf6, 0x8d, 0x93, 0xeb, 0x3a, 0xb7, 0x51, 0x5d, 0x88,
+                0xa0, 0x87, 0xe0, 0xef,
             ],
             dk: [
-                0xa8, 0x61, 0xd9, 0xa4, 0x37, 0x61, 0x87, 0xb2, 0xb5, 0xc1, 0x9a, 0x5f, 0x89, 0x6f,
-                0xa4, 0x75, 0xaa, 0x0e, 0xd3, 0x8b, 0x99, 0x54, 0xf3, 0x93, 0x8a, 0x04, 0xec, 0x41,
-                0xe5, 0x4f, 0xaf, 0x1c,
+                0x5f, 0x15, 0x10, 0x14, 0xd0, 0x9f, 0xe9, 0x14, 0x68, 0x52, 0x66, 0x1e, 0xcb, 0xe3,
+                0x3c, 0x1e, 0xea, 0xcc, 0x6d, 0xd9, 0xf7, 0x3b, 0xd0, 0xd4, 0xdc, 0x82, 0x5f, 0x4f,
+                0x2f, 0xc2, 0x94, 0xde,
             ],
             default_d: [
-                0x59, 0x8d, 0x20, 0x0e, 0x50, 0x9e, 0xc2, 0x4b, 0xdc, 0x7f, 0x1c,
+                0x10, 0x23, 0x07, 0x3f, 0x95, 0x67, 0xce, 0xa8, 0x22, 0x82, 0xe1,
             ],
             default_pk_d: [
-                0x68, 0x10, 0x44, 0xee, 0x77, 0xd7, 0xf8, 0x6a, 0x0a, 0x5c, 0x0c, 0xbe, 0x89, 0xa7,
-                0xef, 0x3b, 0x3f, 0x5a, 0x6e, 0x85, 0x99, 0x8f, 0x48, 0x48, 0x51, 0xc9, 0x8a, 0x22,
-                0x80, 0x18, 0xa0, 0x1e,
+                0x28, 0xb9, 0x35, 0x6e, 0x43, 0xb5, 0x75, 0x78, 0x1a, 0x09, 0x02, 0xbd, 0xbc, 0x93,
+                0xe5, 0x57, 0x98, 0x78, 0xa8, 0x41, 0x63, 0x14, 0x70, 0xb4, 0x07, 0x9b, 0x05, 0x90,
+                0x18, 0xa5, 0x20, 0x0d,
             ],
             internal_rivk: [
-                0xda, 0x3c, 0xdd, 0x9e, 0x0a, 0x3d, 0x1c, 0x41, 0x3e, 0x51, 0xb5, 0x34, 0x67, 0x7e,
-                0x88, 0x3e, 0x85, 0x4b, 0x5f, 0x54, 0xbb, 0xdb, 0xba, 0x05, 0x04, 0xab, 0xb2, 0x2b,
-                0x31, 0x5c, 0x4c, 0x1d,
+                0xb2, 0x63, 0x58, 0x05, 0xef, 0x00, 0x78, 0xaf, 0x79, 0x32, 0xe3, 0x93, 0x40, 0x82,
+                0x94, 0xcb, 0xc0, 0xf3, 0xfa, 0x93, 0x56, 0x8f, 0x2b, 0xbe, 0x07, 0x29, 0x8f, 0xc2,
+                0xba, 0xf9, 0x53, 0x3a,
             ],
             internal_ivk: [
-                0x29, 0x3f, 0xf5, 0xf5, 0x2b, 0x40, 0xcf, 0x48, 0xeb, 0x4f, 0x21, 0x45, 0x24, 0xad,
-                0xed, 0x6b, 0x53, 0x85, 0xf6, 0x09, 0x67, 0x56, 0xec, 0xa3, 0x0d, 0x46, 0xff, 0x47,
-                0xa8, 0xc8, 0x6f, 0x0c,
+                0xcb, 0x69, 0xdc, 0x54, 0x1d, 0x52, 0x7e, 0x1c, 0x1f, 0x4c, 0x7a, 0xd7, 0xd2, 0x67,
+                0xe3, 0x18, 0xed, 0xaa, 0x79, 0x15, 0x61, 0xcd, 0x5c, 0xee, 0x51, 0x8e, 0x14, 0xaa,
+                0xaa, 0x4c, 0x0e, 0x08,
             ],
             internal_ovk: [
-                0x0c, 0xfc, 0xe5, 0xec, 0xc4, 0x1f, 0x12, 0x02, 0xcb, 0x61, 0xa4, 0x7f, 0x6d, 0x55,
-                0x9a, 0x63, 0x92, 0x25, 0xc5, 0xb4, 0x7a, 0x99, 0x65, 0xc3, 0x02, 0x00, 0xd1, 0xb7,
-                0xea, 0x58, 0xc1, 0x30,
+                0x25, 0x58, 0x8e, 0xdb, 0xf6, 0x77, 0x42, 0xab, 0x55, 0xca, 0x95, 0xa9, 0x0a, 0xe0,
+                0xe0, 0x29, 0xa8, 0x7f, 0xc4, 0xcf, 0x9c, 0xf3, 0xf7, 0x00, 0x65, 0xe0, 0x64, 0xec,
+                0xc4, 0xd6, 0x45, 0x8e,
             ],
             internal_dk: [
-                0x43, 0x81, 0x82, 0x5b, 0x76, 0xeb, 0x8d, 0x47, 0x0a, 0x8b, 0x98, 0xed, 0x53, 0xff,
-                0xb4, 0xd1, 0xf2, 0x1e, 0x96, 0x45, 0x0b, 0xe9, 0x4b, 0x15, 0xa8, 0x52, 0x1e, 0xe8,
-                0x6f, 0xb6, 0xea, 0xe8,
+                0xad, 0x38, 0x62, 0x22, 0xdd, 0xd6, 0x65, 0x3b, 0xed, 0x73, 0x36, 0x64, 0x3d, 0xcb,
+                0x63, 0x51, 0x4a, 0x25, 0x17, 0x7a, 0x81, 0xf5, 0x8f, 0x84, 0x06, 0x84, 0x4e, 0x16,
+                0x42, 0xdb, 0x6e, 0x03,
             ],
             asset: [
                 0x67, 0x43, 0xf9, 0x3a, 0x6e, 0xbd, 0xa7, 0x2a, 0x8c, 0x7c, 0x5a, 0x2b, 0x7f, 0xa3,
@@ -335,94 +335,94 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xd9, 0xee, 0xcf, 0xa1,
             ],
             note_cmx: [
-                0x1b, 0x83, 0x10, 0x6d, 0xf8, 0x12, 0xf5, 0xb3, 0x24, 0xbc, 0x8d, 0xc9, 0x87, 0x02,
-                0x52, 0xfd, 0x7a, 0x44, 0xf2, 0xd7, 0x5b, 0xf5, 0x54, 0x41, 0xac, 0x92, 0x5b, 0x45,
-                0x82, 0xf9, 0x75, 0x17,
+                0x44, 0x41, 0x60, 0xcb, 0x6e, 0x4c, 0xe5, 0x98, 0xe9, 0x48, 0x82, 0x6a, 0x81, 0x6f,
+                0xfa, 0xdb, 0xfb, 0xd2, 0x4b, 0xe0, 0x1d, 0x4e, 0xfd, 0x41, 0x37, 0x8f, 0x79, 0x2e,
+                0xdb, 0xa9, 0xf0, 0x14,
             ],
             note_nf: [
-                0x4b, 0xf3, 0xd9, 0x9e, 0x14, 0xdb, 0x5c, 0xa1, 0xb5, 0x81, 0x8d, 0x93, 0x37, 0xe9,
-                0x26, 0xb1, 0x3c, 0x55, 0x94, 0x12, 0xd5, 0x61, 0xb6, 0xc7, 0x30, 0x53, 0xe2, 0xc7,
-                0xb2, 0x08, 0x5a, 0x2d,
+                0xec, 0xe2, 0x42, 0x8b, 0x0b, 0x0a, 0x02, 0x26, 0xbb, 0x88, 0xf6, 0x4f, 0xfe, 0x2e,
+                0x9c, 0x5e, 0x6d, 0x4c, 0x44, 0x3d, 0xa9, 0x46, 0xb0, 0x0d, 0x0d, 0x8f, 0x80, 0x1c,
+                0x2f, 0x2d, 0xa9, 0x03,
             ],
         },
         TestVector {
             sk: [
-                0x58, 0xcf, 0xb5, 0xcd, 0x79, 0xf8, 0x80, 0x08, 0xe3, 0x15, 0xdc, 0x7d, 0x83, 0x88,
-                0xe7, 0x6c, 0x17, 0x82, 0xfd, 0x27, 0x95, 0xd1, 0x8a, 0x76, 0x36, 0x24, 0xc2, 0x5f,
-                0xa9, 0x59, 0xcc, 0x97,
+                0x48, 0x9c, 0xe7, 0x57, 0x45, 0x82, 0x4b, 0x77, 0x86, 0x8c, 0x53, 0x23, 0x9c, 0xfb,
+                0xdf, 0x73, 0xca, 0xec, 0x65, 0x60, 0x40, 0x37, 0x31, 0x4f, 0xaa, 0xce, 0xb5, 0x62,
+                0x18, 0xc6, 0xbd, 0x30,
             ],
             ask: [
-                0x74, 0xef, 0xaa, 0xff, 0x27, 0x9c, 0xde, 0x93, 0x36, 0x11, 0x7a, 0xa4, 0x68, 0xb4,
-                0xed, 0xdb, 0x70, 0x38, 0xa1, 0x22, 0xef, 0x86, 0x7d, 0xba, 0x05, 0x3e, 0x33, 0x55,
-                0x68, 0x0a, 0x8c, 0x3c,
+                0x2c, 0x04, 0x9c, 0x69, 0xcf, 0x07, 0x87, 0x81, 0x61, 0xc0, 0xa3, 0x55, 0x24, 0x07,
+                0x8a, 0x46, 0x55, 0x30, 0xb6, 0xec, 0xab, 0x1b, 0xd8, 0xd7, 0x48, 0xb1, 0xd8, 0x16,
+                0x9e, 0x91, 0xe6, 0x08,
             ],
             ak: [
-                0xc4, 0x51, 0x8d, 0x3c, 0xde, 0xa6, 0x55, 0xa3, 0x2d, 0xf8, 0xe3, 0xf5, 0xc1, 0x51,
-                0xb5, 0x42, 0x32, 0x85, 0x31, 0xca, 0x01, 0xa6, 0x3f, 0x3c, 0x03, 0xa3, 0xc2, 0x4e,
-                0xa7, 0x32, 0x82, 0x3a,
+                0x7d, 0xcf, 0x33, 0x91, 0x77, 0x05, 0x64, 0xc8, 0xf9, 0xe7, 0xc1, 0x7b, 0xf6, 0x7f,
+                0x05, 0x4e, 0x5b, 0xd0, 0x40, 0xc4, 0xde, 0x28, 0xd8, 0xdd, 0x46, 0xd5, 0x8d, 0xf8,
+                0xc5, 0xee, 0xe6, 0x2d,
             ],
             isk: [
-                0x48, 0x9c, 0xe7, 0x57, 0x45, 0x82, 0x4b, 0x77, 0x86, 0x8c, 0x53, 0x23, 0x9c, 0xfb,
-                0xdf, 0x73, 0xca, 0xec, 0x65, 0x60, 0x40, 0x37, 0x31, 0x4f, 0xaa, 0xce, 0xb5, 0x62,
-                0x18, 0xc6, 0xbd, 0x30,
+                0x7f, 0x4f, 0x5c, 0xcb, 0xdb, 0xc5, 0x96, 0x63, 0x12, 0x77, 0xf8, 0xfe, 0xcd, 0x08,
+                0xcb, 0x05, 0x6b, 0x95, 0xe3, 0x02, 0x5b, 0x97, 0x92, 0xff, 0xf7, 0xf2, 0x44, 0xfc,
+                0x71, 0x62, 0x69, 0xb9,
             ],
             ik: [
-                0xed, 0x56, 0xef, 0x8b, 0x55, 0x28, 0x00, 0x0f, 0xc2, 0xee, 0xf3, 0x33, 0x50, 0x8f,
-                0x4c, 0x32, 0x71, 0x62, 0xd8, 0x96, 0x3b, 0xad, 0x50, 0xcc, 0x55, 0xdc, 0x03, 0x7d,
-                0xb9, 0x60, 0x7f, 0x52,
+                0x39, 0xc4, 0x51, 0xf4, 0xd8, 0xdd, 0xcf, 0x69, 0x05, 0xed, 0xd8, 0x82, 0x5a, 0xd9,
+                0x81, 0xb9, 0xe7, 0x3c, 0xa6, 0x83, 0x1c, 0xa2, 0xb3, 0xd7, 0xe8, 0xce, 0xf3, 0xd0,
+                0xba, 0xaa, 0x31, 0x1b,
             ],
             nk: [
-                0x76, 0xff, 0xc1, 0xbb, 0x8d, 0xd7, 0xfb, 0x48, 0x7d, 0x48, 0xd0, 0x94, 0x29, 0x66,
-                0x0b, 0xbc, 0x1d, 0xfc, 0xbf, 0x57, 0xc4, 0xa5, 0xa3, 0x21, 0x33, 0x24, 0x33, 0x44,
-                0x70, 0xed, 0xdf, 0x33,
+                0x8d, 0xa4, 0xba, 0x62, 0x70, 0xae, 0x6d, 0x89, 0xa8, 0x6a, 0x06, 0xbc, 0x84, 0xbb,
+                0x41, 0x53, 0xac, 0xbc, 0x5f, 0x7d, 0xb7, 0xa9, 0x55, 0x6c, 0x57, 0x79, 0xcf, 0x76,
+                0xb7, 0x66, 0x25, 0x03,
             ],
             rivk: [
-                0x22, 0xe2, 0xf3, 0x90, 0x11, 0xe6, 0x70, 0xc8, 0x0f, 0xba, 0xc8, 0x91, 0x59, 0xac,
-                0x63, 0x4d, 0x84, 0xd7, 0xc1, 0x3e, 0xbe, 0xfb, 0x97, 0x3b, 0xa4, 0x1f, 0x0c, 0x79,
-                0xf0, 0x33, 0xfc, 0x3f,
+                0xf3, 0x50, 0x76, 0x23, 0x5d, 0x13, 0xd3, 0x20, 0xdd, 0xd5, 0x1c, 0xf8, 0x7f, 0xaa,
+                0x09, 0x40, 0xed, 0x38, 0xa6, 0x06, 0xae, 0xe1, 0x8b, 0x90, 0x18, 0x30, 0xa8, 0x87,
+                0x87, 0xb2, 0xa1, 0x32,
             ],
             ivk: [
-                0xe6, 0x80, 0xf5, 0xa7, 0x15, 0xb3, 0x2b, 0x9e, 0x1a, 0x14, 0x67, 0x9f, 0x11, 0x16,
-                0xf1, 0x13, 0xaa, 0x04, 0x93, 0xf3, 0x82, 0x1b, 0x10, 0x8c, 0xa7, 0xe1, 0xc0, 0x71,
-                0xad, 0x75, 0x2d, 0x22,
+                0xcc, 0x27, 0xbc, 0x8f, 0xda, 0x30, 0x60, 0xa5, 0x95, 0x26, 0x23, 0xef, 0x80, 0xaa,
+                0x64, 0x1c, 0x58, 0x43, 0x2a, 0x82, 0xd3, 0x26, 0x8b, 0x35, 0x89, 0xb1, 0x45, 0xf1,
+                0x52, 0x0b, 0x43, 0x1d,
             ],
             ovk: [
-                0x2a, 0x34, 0xab, 0x11, 0xc4, 0x0c, 0x6b, 0x3b, 0x28, 0x54, 0x56, 0xa6, 0x91, 0x54,
-                0xcb, 0xe4, 0x4c, 0xba, 0x01, 0xda, 0x6d, 0xb0, 0xc2, 0xb2, 0x2b, 0x84, 0xca, 0x27,
-                0x2b, 0xae, 0x01, 0xad,
+                0xae, 0xee, 0xcc, 0x69, 0x80, 0xf9, 0x7c, 0x1e, 0x6f, 0x89, 0x09, 0xaf, 0x63, 0x48,
+                0xe4, 0xbd, 0x20, 0x83, 0x65, 0x81, 0x0d, 0x1b, 0x99, 0xe8, 0x47, 0x56, 0xa3, 0xcb,
+                0xdf, 0x4c, 0x35, 0x98,
             ],
             dk: [
-                0xfa, 0xaa, 0xb4, 0xb9, 0x32, 0x46, 0x23, 0xc6, 0xc8, 0x6b, 0xd5, 0xdb, 0x70, 0xa7,
-                0x18, 0xd9, 0x0b, 0xc0, 0xf1, 0x5b, 0x2b, 0x39, 0xeb, 0xfa, 0x82, 0xb5, 0xb1, 0xcc,
-                0x14, 0x67, 0x0c, 0xbe,
+                0x63, 0xc4, 0xf6, 0xcd, 0x2c, 0xbd, 0xbb, 0x5a, 0x04, 0x81, 0xba, 0x93, 0x4f, 0xd1,
+                0xc1, 0xd7, 0x4c, 0x1c, 0xeb, 0xf0, 0xcb, 0x58, 0x39, 0x78, 0xc8, 0x5b, 0xa2, 0x0b,
+                0x14, 0x81, 0x89, 0x17,
             ],
             default_d: [
-                0x66, 0x4c, 0xab, 0xf8, 0xf7, 0x68, 0x93, 0xcb, 0x8d, 0xa7, 0x84,
+                0xa1, 0xc6, 0x51, 0x16, 0xe0, 0x0a, 0x9b, 0x10, 0x51, 0x18, 0x0e,
             ],
             default_pk_d: [
-                0x07, 0x7c, 0x84, 0x57, 0x8b, 0x1d, 0xae, 0x2f, 0x80, 0x69, 0xef, 0x67, 0xd2, 0x87,
-                0x71, 0x8d, 0xaf, 0xf5, 0xa1, 0x69, 0x4e, 0x1a, 0x8e, 0xa2, 0x36, 0xc9, 0xe6, 0x94,
-                0x61, 0x5f, 0xb8, 0x16,
+                0x1a, 0xea, 0xce, 0xdd, 0x51, 0x8a, 0x38, 0x57, 0x7d, 0x6a, 0x70, 0x90, 0x45, 0x59,
+                0x72, 0x15, 0x5b, 0x34, 0x44, 0xb3, 0x24, 0x29, 0x34, 0x5d, 0x39, 0x67, 0x50, 0x87,
+                0xbd, 0xcc, 0x39, 0xb1,
             ],
             internal_rivk: [
-                0xc4, 0x01, 0xbc, 0x90, 0x7a, 0xaa, 0xed, 0xd1, 0x3b, 0x1f, 0xa7, 0x0d, 0x7a, 0xb2,
-                0x8d, 0x71, 0x3b, 0x46, 0x38, 0xeb, 0xfb, 0xc8, 0xf9, 0xcc, 0x1d, 0xae, 0xd5, 0xac,
-                0x2b, 0x76, 0x75, 0x33,
+                0x69, 0xbe, 0x50, 0x0f, 0xdd, 0xc9, 0x8f, 0x2d, 0x11, 0x0f, 0x4e, 0xc6, 0x96, 0xd1,
+                0xf5, 0x7c, 0xe6, 0x3d, 0x2c, 0xae, 0xd8, 0x85, 0x39, 0x74, 0x75, 0xc2, 0x5d, 0x21,
+                0x09, 0x09, 0xf6, 0x1f,
             ],
             internal_ivk: [
-                0xea, 0x9b, 0xeb, 0x2d, 0x19, 0x6a, 0xd4, 0x79, 0x69, 0xf2, 0x03, 0xdd, 0x28, 0xa0,
-                0xfb, 0xe2, 0x4b, 0x98, 0x12, 0xb1, 0x15, 0x5b, 0x17, 0x01, 0x96, 0x36, 0x6a, 0xcd,
-                0x62, 0xf5, 0xeb, 0x0c,
+                0x32, 0xee, 0xca, 0x1a, 0xa6, 0x74, 0x76, 0x74, 0xb9, 0x75, 0x25, 0x5d, 0x08, 0x4b,
+                0x03, 0x5b, 0x98, 0x51, 0xcd, 0x50, 0x18, 0xdd, 0xf6, 0x47, 0xce, 0xb9, 0xe1, 0xde,
+                0x9e, 0x43, 0x9b, 0x2c,
             ],
             internal_ovk: [
-                0x2f, 0x6d, 0x74, 0x4f, 0x40, 0xd6, 0xdc, 0xe6, 0x5e, 0x33, 0x5d, 0x3c, 0xb3, 0x96,
-                0xc5, 0xaf, 0x54, 0xf0, 0xf7, 0xd5, 0x4f, 0xb4, 0x37, 0xec, 0x8e, 0x20, 0x29, 0x28,
-                0x05, 0x8e, 0xfa, 0xdf,
+                0x43, 0x48, 0xf7, 0x3e, 0x04, 0x54, 0x47, 0x05, 0x59, 0xad, 0x5e, 0x42, 0x29, 0x37,
+                0xb8, 0x78, 0x87, 0x4d, 0x64, 0x64, 0xf9, 0x94, 0x08, 0x04, 0x17, 0xeb, 0x16, 0xb6,
+                0xd0, 0xac, 0x1b, 0xa4,
             ],
             internal_dk: [
-                0x9f, 0xec, 0x61, 0xd0, 0x20, 0xb9, 0x29, 0x37, 0xbd, 0xf3, 0xc3, 0xce, 0x09, 0x43,
-                0x3d, 0xdf, 0x01, 0xd4, 0xab, 0xe7, 0x43, 0x93, 0x94, 0x6e, 0x49, 0xcd, 0x79, 0xd1,
-                0x19, 0x86, 0xb9, 0xfe,
+                0x27, 0x6d, 0x6e, 0xf9, 0xed, 0x58, 0xfa, 0x8a, 0x81, 0x18, 0x02, 0xbd, 0x3a, 0x0c,
+                0x44, 0xd7, 0x9d, 0xbb, 0xe0, 0x6b, 0x94, 0x20, 0x0d, 0x43, 0x44, 0x28, 0x5b, 0x26,
+                0x60, 0x03, 0xf4, 0x45,
             ],
             asset: [
                 0x67, 0x43, 0xf9, 0x3a, 0x6e, 0xbd, 0xa7, 0x2a, 0x8c, 0x7c, 0x5a, 0x2b, 0x7f, 0xa3,
@@ -441,94 +441,94 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x33, 0x57, 0xd7, 0x76,
             ],
             note_cmx: [
-                0xbb, 0x2d, 0xd3, 0x29, 0xdf, 0xca, 0x48, 0xdc, 0x11, 0x56, 0x36, 0x58, 0xd0, 0x7e,
-                0x20, 0x4a, 0x1d, 0x21, 0x2d, 0x20, 0x27, 0xe1, 0x45, 0x7c, 0xe6, 0x96, 0x8c, 0xdf,
-                0xb0, 0x07, 0x7e, 0x04,
+                0x5f, 0x5f, 0x8c, 0xff, 0x89, 0xb1, 0xbe, 0xdc, 0x6f, 0x58, 0x4f, 0x0b, 0x85, 0x58,
+                0x6a, 0x54, 0x4b, 0xc4, 0x25, 0x53, 0x88, 0xa5, 0xff, 0x72, 0xf6, 0x75, 0x13, 0x8b,
+                0xcb, 0x70, 0xb2, 0x27,
             ],
             note_nf: [
-                0xd4, 0x0c, 0xe3, 0x47, 0xb2, 0x3e, 0x26, 0x36, 0xc2, 0xb4, 0xc5, 0x43, 0x39, 0x50,
-                0x26, 0xab, 0xb4, 0xa1, 0x5f, 0x28, 0xf9, 0x0a, 0x67, 0xb7, 0x08, 0xd6, 0x4b, 0x22,
-                0x6f, 0x3a, 0x39, 0x31,
+                0x8f, 0xca, 0x6e, 0x8b, 0x77, 0xab, 0x9d, 0x19, 0xf2, 0xf8, 0x35, 0x39, 0xa2, 0x91,
+                0x29, 0x2f, 0xb1, 0x5e, 0x00, 0x50, 0xde, 0xd7, 0x77, 0x13, 0x3e, 0x75, 0x1e, 0x9f,
+                0x0a, 0xe2, 0xff, 0x35,
             ],
         },
         TestVector {
             sk: [
-                0x7f, 0x4f, 0x5c, 0xcb, 0xdb, 0xc5, 0x96, 0x63, 0x12, 0x77, 0xf8, 0xfe, 0xcd, 0x08,
-                0xcb, 0x05, 0x6b, 0x95, 0xe3, 0x02, 0x5b, 0x97, 0x92, 0xff, 0xf7, 0xf2, 0x44, 0xfc,
-                0x71, 0x62, 0x69, 0xb9,
+                0x26, 0xd6, 0x2e, 0x95, 0x96, 0xfa, 0x82, 0x5c, 0x6b, 0xf2, 0x1a, 0xff, 0x9e, 0x68,
+                0x62, 0x5a, 0x19, 0x24, 0x40, 0xea, 0x06, 0x82, 0x81, 0x23, 0xd9, 0x78, 0x84, 0x80,
+                0x6f, 0x15, 0xfa, 0x08,
             ],
             ask: [
-                0x0a, 0xfd, 0x61, 0xd4, 0x12, 0x57, 0xb5, 0xe9, 0x36, 0xb9, 0x29, 0x29, 0xa3, 0xe1,
-                0xb8, 0x7d, 0x60, 0x89, 0x7c, 0xb3, 0xdc, 0x8e, 0x77, 0x3f, 0x4f, 0xa1, 0xef, 0x40,
-                0xef, 0xb5, 0x4b, 0x04,
+                0xfa, 0x92, 0x86, 0xf7, 0x67, 0x77, 0x23, 0x5c, 0x74, 0x3d, 0xfa, 0xc1, 0xb8, 0x83,
+                0x0d, 0x9f, 0xe3, 0x33, 0xca, 0xd7, 0x21, 0xd5, 0x49, 0xa9, 0x47, 0xc7, 0x5e, 0xce,
+                0x7d, 0x00, 0xf5, 0x38,
             ],
             ak: [
-                0x84, 0x7e, 0xc5, 0xb1, 0xe3, 0xdd, 0xfd, 0x93, 0xca, 0x0c, 0x67, 0xea, 0x48, 0x1b,
-                0x40, 0x5b, 0xae, 0xef, 0x48, 0xb0, 0xf2, 0x7f, 0x87, 0xb8, 0x1f, 0xed, 0x32, 0xae,
-                0x56, 0x31, 0x6f, 0x04,
+                0x10, 0x07, 0x3a, 0x7a, 0xe1, 0x28, 0x59, 0x2d, 0xbe, 0xe5, 0x28, 0x2b, 0xc1, 0x24,
+                0x1b, 0x94, 0x75, 0xa5, 0x98, 0x19, 0x62, 0xbd, 0xf2, 0x14, 0xe9, 0x35, 0xd9, 0xb3,
+                0x27, 0xf0, 0x25, 0x24,
             ],
             isk: [
-                0x26, 0xd6, 0x2e, 0x95, 0x96, 0xfa, 0x82, 0x5c, 0x6b, 0xf2, 0x1a, 0xff, 0x9e, 0x68,
-                0x62, 0x5a, 0x19, 0x24, 0x40, 0xea, 0x06, 0x82, 0x81, 0x23, 0xd9, 0x78, 0x84, 0x80,
-                0x6f, 0x15, 0xfa, 0x08,
+                0xe2, 0xf5, 0x7e, 0x34, 0xfb, 0xc7, 0x54, 0x23, 0xc3, 0x73, 0x7f, 0x5b, 0x2a, 0x06,
+                0x15, 0xf5, 0x72, 0x2d, 0xb0, 0x41, 0xa3, 0xef, 0x66, 0xfa, 0x48, 0x3a, 0xfd, 0x3c,
+                0x2e, 0x19, 0xe5, 0x94,
             ],
             ik: [
-                0x95, 0x9c, 0x44, 0x8d, 0xaf, 0xb6, 0xb7, 0xc2, 0x54, 0x90, 0x42, 0xdd, 0x75, 0x7a,
-                0x81, 0xfa, 0x16, 0xca, 0xd4, 0xd2, 0x7f, 0xc1, 0x5f, 0x45, 0x33, 0xcd, 0xe2, 0x0c,
-                0xc5, 0xb5, 0xcd, 0xc9,
+                0x2b, 0x5d, 0xe5, 0x60, 0x92, 0xfe, 0xa3, 0x1a, 0x8e, 0xa9, 0xf8, 0x70, 0x84, 0x7d,
+                0xc1, 0xfa, 0x87, 0xfd, 0x3c, 0x25, 0xcf, 0x70, 0x9a, 0x0e, 0xff, 0xd6, 0x99, 0xc2,
+                0x96, 0x41, 0x31, 0x6e,
             ],
             nk: [
-                0xd7, 0xd8, 0xf3, 0xd5, 0x18, 0x22, 0xd3, 0x4a, 0xdf, 0x86, 0xeb, 0xd3, 0x53, 0x36,
-                0x47, 0x73, 0x2c, 0x03, 0xf6, 0x42, 0xd6, 0xed, 0x06, 0xff, 0x61, 0xd2, 0x50, 0xd6,
-                0xba, 0xfd, 0x59, 0x37,
+                0x4f, 0xb7, 0x68, 0x10, 0x2e, 0x99, 0xbe, 0xfe, 0x6e, 0x76, 0xed, 0x4e, 0xea, 0x65,
+                0x83, 0x54, 0x14, 0x78, 0x00, 0x4e, 0x96, 0x49, 0x26, 0xfd, 0x34, 0x70, 0x4a, 0xcc,
+                0xd9, 0x2d, 0x0c, 0x1f,
             ],
             rivk: [
-                0xae, 0xea, 0xd1, 0x3e, 0x25, 0x36, 0xe8, 0xcb, 0xa6, 0x24, 0x46, 0xd8, 0xff, 0x10,
-                0x99, 0x88, 0xce, 0xa9, 0xb2, 0x57, 0xce, 0xaf, 0xc8, 0xd2, 0x0b, 0x85, 0x07, 0xcc,
-                0xc9, 0x81, 0x58, 0x2a,
+                0x1a, 0x02, 0xd2, 0x88, 0x78, 0x30, 0xe0, 0xb4, 0xb6, 0xdf, 0xe3, 0xcf, 0x65, 0x8d,
+                0x2c, 0x04, 0x05, 0x20, 0x26, 0x4b, 0x38, 0x12, 0xaf, 0xd7, 0x9e, 0x13, 0xed, 0xfc,
+                0xb2, 0x53, 0xd4, 0x39,
             ],
             ivk: [
-                0x83, 0xbb, 0x91, 0x72, 0x72, 0xb0, 0xa0, 0x4b, 0x78, 0x21, 0xfb, 0x8e, 0xef, 0xd5,
-                0x7b, 0xdb, 0x15, 0xa0, 0x28, 0x28, 0x73, 0x95, 0x46, 0x28, 0x5e, 0x7f, 0x19, 0x78,
-                0x17, 0x43, 0xaa, 0x10,
+                0xa6, 0x1a, 0x67, 0x10, 0x00, 0x60, 0x14, 0x96, 0x42, 0xca, 0x66, 0x90, 0xd2, 0x4e,
+                0x9f, 0xc3, 0x13, 0xa1, 0x82, 0x59, 0xdb, 0x73, 0x0a, 0x50, 0xd7, 0xe7, 0x58, 0xc5,
+                0xd5, 0x44, 0xd0, 0x1d,
             ],
             ovk: [
-                0x48, 0x25, 0xc8, 0x9b, 0xc8, 0xef, 0x4d, 0x75, 0x50, 0xa8, 0xdc, 0x1b, 0xda, 0x47,
-                0xc4, 0xe4, 0x1a, 0x30, 0xca, 0x56, 0x72, 0x26, 0xd0, 0xb3, 0x78, 0xb0, 0xb9, 0xcc,
-                0xb2, 0xfb, 0x36, 0xe5,
+                0x72, 0x7a, 0x52, 0x1e, 0xf1, 0xf9, 0x1c, 0x43, 0xf2, 0x17, 0xc4, 0x54, 0xc6, 0x41,
+                0xb8, 0x3e, 0xc4, 0xb1, 0x66, 0x1a, 0x3c, 0xac, 0x0e, 0x3f, 0x74, 0xa7, 0x48, 0x0f,
+                0xda, 0xaf, 0xad, 0x9f,
             ],
             dk: [
-                0x17, 0x84, 0x93, 0x0e, 0xf3, 0xd2, 0x6a, 0xce, 0x1e, 0xad, 0xb7, 0x0b, 0x38, 0x81,
-                0x0b, 0x98, 0xf1, 0x82, 0x33, 0x8d, 0x54, 0xff, 0xe8, 0x37, 0x78, 0xf2, 0x7b, 0xe2,
-                0xd1, 0x20, 0x67, 0xc0,
+                0x20, 0x9d, 0xbb, 0x87, 0x11, 0xd9, 0xee, 0xef, 0x7f, 0x22, 0x0f, 0xd4, 0x28, 0x09,
+                0xfb, 0xbb, 0x4c, 0x4b, 0x92, 0x65, 0xd1, 0x62, 0xdf, 0xf2, 0x36, 0x78, 0xca, 0xe7,
+                0x70, 0x2b, 0xc5, 0x5e,
             ],
             default_d: [
-                0x46, 0x3b, 0x71, 0x6d, 0x24, 0xdd, 0x01, 0x02, 0x03, 0xa7, 0x29,
+                0xc5, 0x57, 0x04, 0x43, 0xf9, 0xc5, 0x17, 0xc5, 0x2b, 0x07, 0x68,
             ],
             default_pk_d: [
-                0x9e, 0x22, 0xd0, 0x82, 0xbf, 0xbe, 0x2f, 0x05, 0x20, 0x69, 0x13, 0xa8, 0x63, 0x15,
-                0xf0, 0x80, 0xbb, 0x87, 0xe7, 0x87, 0xff, 0x51, 0x84, 0x53, 0xb0, 0x85, 0x0b, 0xc3,
-                0x57, 0xd9, 0x18, 0x06,
+                0xbd, 0x78, 0x5b, 0x8f, 0xa7, 0x56, 0x86, 0xd6, 0x9c, 0xd5, 0xaa, 0x5c, 0xb1, 0xff,
+                0x1f, 0x58, 0xa1, 0x2d, 0x37, 0x75, 0x74, 0x28, 0x3a, 0xad, 0x1f, 0x06, 0xa9, 0xd9,
+                0x63, 0x5e, 0x1d, 0x11,
             ],
             internal_rivk: [
-                0xdf, 0x5f, 0x4f, 0x62, 0x55, 0x28, 0xd5, 0x6b, 0x2e, 0x64, 0xaf, 0x93, 0xb4, 0x79,
-                0xbf, 0x1c, 0x3b, 0x37, 0xab, 0x8a, 0xcb, 0x9b, 0x9d, 0x4a, 0x75, 0x75, 0xcc, 0x75,
-                0x2a, 0x9c, 0x08, 0x1b,
+                0xd7, 0xcf, 0x88, 0xd8, 0xe7, 0xca, 0x57, 0x0e, 0x4a, 0xa2, 0x29, 0xbf, 0x82, 0x68,
+                0x0d, 0x4d, 0xec, 0xb7, 0xcd, 0x05, 0xb6, 0x8e, 0x5c, 0x9c, 0x2b, 0xf1, 0x26, 0xba,
+                0x6f, 0x41, 0x34, 0x3d,
             ],
             internal_ivk: [
-                0xe3, 0x3c, 0xea, 0x19, 0xf7, 0x6a, 0x3b, 0xdc, 0x49, 0xc3, 0x2e, 0x32, 0x2f, 0xeb,
-                0x87, 0x0e, 0xd2, 0xae, 0x18, 0x57, 0xca, 0x47, 0x03, 0x4a, 0x01, 0x60, 0x40, 0x0e,
-                0x9c, 0xeb, 0x4c, 0x2b,
+                0xc4, 0xd0, 0x70, 0xe8, 0x0e, 0x34, 0xb5, 0x03, 0x9f, 0x0d, 0xe6, 0x96, 0xb2, 0x11,
+                0x35, 0x5f, 0x72, 0xc8, 0xf2, 0x52, 0xef, 0x81, 0xd0, 0xb7, 0x4c, 0xa1, 0xd1, 0x7b,
+                0xed, 0x46, 0x4e, 0x1e,
             ],
             internal_ovk: [
-                0xc9, 0x3d, 0x92, 0x4f, 0x45, 0x96, 0x08, 0xef, 0x68, 0xa6, 0x36, 0xe2, 0xe2, 0xfe,
-                0xd5, 0xeb, 0x9b, 0xe3, 0x8c, 0xeb, 0xae, 0x57, 0x1d, 0x0e, 0xeb, 0xf3, 0xe8, 0xa5,
-                0x37, 0x4f, 0x99, 0x71,
+                0xeb, 0xc7, 0x26, 0x70, 0x3c, 0xc4, 0x93, 0xd8, 0x81, 0x68, 0xa6, 0x7c, 0xfb, 0xb1,
+                0x95, 0xdd, 0xb7, 0x91, 0xff, 0x83, 0x19, 0x63, 0xd1, 0xcf, 0xe4, 0x24, 0xe5, 0x83,
+                0x3a, 0x01, 0x1a, 0xa6,
             ],
             internal_dk: [
-                0xec, 0xe1, 0xd3, 0x58, 0x8f, 0xc5, 0x0a, 0xa1, 0xf1, 0x06, 0x5d, 0x93, 0xf5, 0xd8,
-                0xcf, 0xca, 0xf1, 0x35, 0x3a, 0xe1, 0xab, 0x39, 0x58, 0x9a, 0xb9, 0x28, 0xdf, 0xda,
-                0xfe, 0x36, 0x84, 0x43,
+                0x2a, 0xca, 0x74, 0x2a, 0x79, 0x77, 0xac, 0x71, 0xbd, 0x75, 0x5f, 0xd6, 0xb9, 0xe0,
+                0x20, 0x70, 0x16, 0x74, 0x68, 0x88, 0x51, 0x4c, 0x52, 0x84, 0x0e, 0x58, 0xdb, 0xfc,
+                0x6a, 0x3a, 0xd4, 0xc8,
             ],
             asset: [
                 0x67, 0x43, 0xf9, 0x3a, 0x6e, 0xbd, 0xa7, 0x2a, 0x8c, 0x7c, 0x5a, 0x2b, 0x7f, 0xa3,
@@ -547,99 +547,99 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x3e, 0x0f, 0x46, 0x0f,
             ],
             note_cmx: [
-                0xd6, 0x3a, 0x49, 0x61, 0x70, 0x68, 0x72, 0xdd, 0xf4, 0x0b, 0x6d, 0xd2, 0xa9, 0xc9,
-                0xc1, 0xdb, 0xec, 0xb9, 0x7e, 0x72, 0xf0, 0x3f, 0x2f, 0x5a, 0xdd, 0x8b, 0x63, 0x53,
-                0xe3, 0x9e, 0x59, 0x10,
+                0x77, 0xb9, 0x90, 0x78, 0x30, 0x7c, 0x8b, 0x33, 0x0b, 0x74, 0xe1, 0x0e, 0x0a, 0xc9,
+                0x02, 0x75, 0xfc, 0x9e, 0x46, 0x8c, 0xba, 0x67, 0x1c, 0x7c, 0xa2, 0xc5, 0xea, 0x12,
+                0xfd, 0x8a, 0x45, 0x10,
             ],
             note_nf: [
-                0x7e, 0xbe, 0xaa, 0x1a, 0x59, 0xed, 0x46, 0x01, 0x45, 0x8b, 0xa4, 0x6d, 0xcc, 0x96,
-                0x2e, 0xd8, 0x1c, 0x15, 0xc7, 0x7f, 0x7e, 0x44, 0x52, 0x48, 0xe4, 0xfb, 0x52, 0x1e,
-                0x59, 0xaa, 0x23, 0x1c,
+                0x5b, 0xf6, 0xcf, 0x6f, 0xa6, 0xcf, 0x95, 0x17, 0x30, 0xe0, 0x23, 0x28, 0x8d, 0xaa,
+                0xd0, 0xc6, 0x7c, 0x19, 0xab, 0xd7, 0xf7, 0xc9, 0x89, 0xfc, 0x8c, 0x56, 0xda, 0x15,
+                0xa6, 0x08, 0x71, 0x08,
             ],
         },
         TestVector {
             sk: [
-                0xe2, 0xf5, 0x7e, 0x34, 0xfb, 0xc7, 0x54, 0x23, 0xc3, 0x73, 0x7f, 0x5b, 0x2a, 0x06,
-                0x15, 0xf5, 0x72, 0x2d, 0xb0, 0x41, 0xa3, 0xef, 0x66, 0xfa, 0x48, 0x3a, 0xfd, 0x3c,
-                0x2e, 0x19, 0xe5, 0x94,
+                0x44, 0xa6, 0x4a, 0xdd, 0x6d, 0xf1, 0xd9, 0x63, 0xf5, 0xdd, 0x5b, 0x50, 0x10, 0xd3,
+                0xd0, 0x25, 0xf0, 0x28, 0x7c, 0x4c, 0xf1, 0x9c, 0x75, 0xf3, 0x3d, 0x51, 0xdd, 0xdd,
+                0xba, 0x5d, 0x65, 0x7b,
             ],
             ask: [
-                0x12, 0x4b, 0x26, 0x4c, 0x66, 0x07, 0xd3, 0x43, 0x5b, 0x4b, 0xbb, 0x10, 0x39, 0x31,
-                0x4b, 0x39, 0x60, 0x4f, 0x06, 0x54, 0x10, 0x0e, 0xa9, 0x0a, 0x3f, 0x9b, 0xfa, 0xe5,
-                0x4a, 0x45, 0xa8, 0x36,
+                0xca, 0xac, 0x7a, 0xe5, 0x49, 0x2d, 0x63, 0xe8, 0x88, 0xaa, 0xf3, 0x80, 0x5f, 0xcb,
+                0x79, 0xae, 0x4a, 0xbc, 0x4a, 0xe1, 0x58, 0x4d, 0xf3, 0x85, 0x8b, 0xd4, 0xe3, 0x2a,
+                0xd1, 0xc6, 0xbd, 0x14,
             ],
             ak: [
-                0xbe, 0xbc, 0xa2, 0xb4, 0x46, 0x40, 0x91, 0x6a, 0xbf, 0x7e, 0xab, 0xb3, 0x44, 0x48,
-                0xef, 0x19, 0xec, 0x7c, 0x02, 0x32, 0x8b, 0x12, 0x5e, 0xb5, 0xa1, 0x04, 0xcc, 0xf3,
-                0x08, 0xfb, 0xd0, 0x3c,
+                0xbc, 0x3c, 0x59, 0x11, 0x13, 0xdf, 0xd0, 0x29, 0x66, 0x3f, 0x03, 0x1c, 0xc1, 0x3f,
+                0x7f, 0x94, 0xf4, 0x3c, 0x89, 0x8a, 0x79, 0x62, 0x90, 0x86, 0x11, 0x08, 0x99, 0xb2,
+                0xb8, 0xe3, 0x3f, 0x13,
             ],
             isk: [
-                0x44, 0xa6, 0x4a, 0xdd, 0x6d, 0xf1, 0xd9, 0x63, 0xf5, 0xdd, 0x5b, 0x50, 0x10, 0xd3,
-                0xd0, 0x25, 0xf0, 0x28, 0x7c, 0x4c, 0xf1, 0x9c, 0x75, 0xf3, 0x3d, 0x51, 0xdd, 0xdd,
-                0xba, 0x5d, 0x65, 0x7b,
+                0xc4, 0x8f, 0xbd, 0x46, 0x7f, 0x75, 0xb7, 0x80, 0x14, 0x9a, 0xe8, 0x80, 0x8f, 0x4e,
+                0x68, 0xf5, 0x0c, 0x05, 0x36, 0xac, 0xdd, 0xf6, 0xf1, 0xae, 0xab, 0x01, 0x6b, 0x6b,
+                0xc1, 0xec, 0x14, 0x4b,
             ],
             ik: [
-                0x0b, 0x93, 0xf6, 0x34, 0x6e, 0x57, 0x23, 0x27, 0x1b, 0x60, 0x7b, 0xc8, 0x08, 0x68,
-                0x08, 0xf1, 0xbb, 0x03, 0x5d, 0x0d, 0xe5, 0x52, 0x4d, 0x06, 0x48, 0x08, 0x31, 0xe7,
-                0x16, 0x31, 0x52, 0xd7,
+                0xe2, 0xb7, 0xd3, 0x28, 0x92, 0x52, 0xf8, 0x69, 0x17, 0xd4, 0xcb, 0x43, 0x04, 0xbe,
+                0x9a, 0x06, 0xd6, 0x25, 0xdb, 0x6f, 0xb2, 0xcb, 0xea, 0xf8, 0x84, 0xc2, 0x80, 0x66,
+                0x94, 0x16, 0xad, 0x30,
             ],
             nk: [
-                0x49, 0xaf, 0xb9, 0xd3, 0x17, 0x63, 0x82, 0x90, 0x2b, 0x98, 0x5d, 0x7b, 0x04, 0xb3,
-                0x77, 0x7b, 0x3e, 0x93, 0xf9, 0x25, 0xc0, 0xcf, 0x09, 0x40, 0x22, 0x91, 0xd6, 0x90,
-                0x9d, 0x8b, 0x64, 0x0b,
+                0x54, 0x81, 0x3a, 0x55, 0x4c, 0xd0, 0x88, 0xfd, 0xad, 0x77, 0x91, 0x00, 0xa5, 0xa4,
+                0xe4, 0xb0, 0xec, 0x83, 0xd6, 0xc2, 0x8c, 0xa4, 0x8e, 0x0e, 0x6c, 0xd4, 0xc0, 0xae,
+                0x3a, 0xec, 0x67, 0x1f,
             ],
             rivk: [
-                0x29, 0x1c, 0xe2, 0x3e, 0x99, 0x33, 0x8b, 0x88, 0x3c, 0x3e, 0xcc, 0x93, 0xed, 0x61,
-                0x59, 0x74, 0x83, 0xea, 0x1f, 0xbc, 0x78, 0x3f, 0xa4, 0x5b, 0xa7, 0xba, 0xf8, 0xfb,
-                0x14, 0x78, 0xfe, 0x1a,
+                0x7c, 0xa6, 0x44, 0x60, 0x34, 0x5e, 0xe1, 0x58, 0x8a, 0x1d, 0x68, 0xa5, 0x19, 0xcc,
+                0x43, 0xf2, 0x04, 0xf9, 0xcc, 0x09, 0xf1, 0x5c, 0x67, 0x2b, 0x84, 0x26, 0x7b, 0xfd,
+                0xd6, 0xfe, 0xba, 0x0f,
             ],
             ivk: [
-                0x61, 0x58, 0x87, 0xc8, 0x04, 0xac, 0x73, 0x06, 0x24, 0x51, 0x93, 0x54, 0x3f, 0x8a,
-                0x8b, 0x20, 0xde, 0x76, 0x67, 0xba, 0xdd, 0xd3, 0x52, 0x64, 0x78, 0x07, 0x63, 0x37,
-                0x49, 0x20, 0xd1, 0x1f,
+                0x1a, 0xc4, 0x6c, 0x8c, 0x2d, 0x85, 0xcd, 0xd1, 0x93, 0xd2, 0x19, 0xe2, 0x5b, 0x11,
+                0xd8, 0xf8, 0xc7, 0x8a, 0x70, 0x29, 0x61, 0x40, 0x22, 0xfb, 0x6c, 0x48, 0x5f, 0x7a,
+                0x79, 0x0b, 0xba, 0x3a,
             ],
             ovk: [
-                0x69, 0x96, 0x86, 0xa4, 0x13, 0xbc, 0x95, 0x43, 0xe8, 0xb3, 0x90, 0xc1, 0x51, 0x4a,
-                0x41, 0xff, 0xa2, 0x80, 0xf1, 0xea, 0x8a, 0x52, 0xc6, 0x1a, 0x56, 0xea, 0x94, 0x98,
-                0x6d, 0xd8, 0x66, 0x2c,
+                0xc8, 0x07, 0x3c, 0x0e, 0x75, 0xfb, 0x45, 0xc5, 0x4b, 0x17, 0x04, 0xa4, 0xe9, 0x4c,
+                0x26, 0x78, 0xe2, 0xfb, 0x36, 0xea, 0xea, 0x1e, 0xd8, 0x48, 0xb2, 0x47, 0xaa, 0x25,
+                0x2f, 0xa5, 0x05, 0x86,
             ],
             dk: [
-                0x2b, 0xc7, 0xd4, 0x9f, 0xed, 0x53, 0xc1, 0x59, 0x21, 0x9d, 0x29, 0xb3, 0xe5, 0x51,
-                0x08, 0xd6, 0x5d, 0x2a, 0x82, 0x3f, 0xce, 0x17, 0x51, 0x08, 0xdb, 0xc9, 0xc5, 0xb5,
-                0x00, 0x4a, 0x7f, 0xd4,
+                0x78, 0x2a, 0xb8, 0xbe, 0x6d, 0x3b, 0x74, 0x03, 0x62, 0x12, 0xe5, 0xea, 0xc8, 0x95,
+                0x7f, 0xc4, 0x85, 0x6a, 0x4d, 0xd0, 0x4b, 0x60, 0x71, 0xa0, 0x55, 0x13, 0xa8, 0x6b,
+                0x35, 0x05, 0xfb, 0x8f,
             ],
             default_d: [
-                0x80, 0x1a, 0x91, 0xc1, 0x78, 0x47, 0x23, 0x30, 0x82, 0x67, 0x9a,
+                0xba, 0x03, 0xdb, 0x92, 0xca, 0xb9, 0x1d, 0x77, 0xfb, 0xff, 0x92,
             ],
             default_pk_d: [
-                0x8e, 0xa1, 0xac, 0x5f, 0x65, 0xc1, 0x79, 0x9b, 0x6c, 0x7a, 0x68, 0x4f, 0xf3, 0x5e,
-                0x63, 0xbd, 0xdf, 0x75, 0xff, 0xf6, 0x9f, 0xc2, 0xd2, 0x83, 0x59, 0xf2, 0xd4, 0x96,
-                0xff, 0x9e, 0xb7, 0x20,
+                0x5e, 0x25, 0x56, 0xeb, 0x74, 0x70, 0x78, 0x26, 0x3b, 0x4d, 0xb4, 0xba, 0xc7, 0xf8,
+                0x56, 0xe0, 0x66, 0x1b, 0x04, 0xed, 0xc6, 0x14, 0xb4, 0xeb, 0xd4, 0x96, 0x45, 0xf7,
+                0x63, 0xd3, 0x23, 0x86,
             ],
             internal_rivk: [
-                0x29, 0x8e, 0xf3, 0x46, 0x9e, 0x43, 0x01, 0x93, 0x44, 0xfa, 0x27, 0x4b, 0x67, 0xcc,
-                0xd3, 0xef, 0xda, 0x04, 0x02, 0x18, 0x07, 0x17, 0xea, 0x6c, 0x7e, 0x6f, 0x11, 0xdf,
-                0x1c, 0x8e, 0xbe, 0x20,
+                0xb9, 0xcc, 0x87, 0xef, 0x06, 0x4f, 0x87, 0xff, 0xe5, 0xd3, 0xc2, 0x3b, 0x69, 0x44,
+                0x9e, 0x44, 0x6b, 0x21, 0x33, 0x3e, 0xe0, 0x39, 0x04, 0xad, 0xca, 0xb1, 0x6f, 0x05,
+                0x15, 0xee, 0x78, 0x07,
             ],
             internal_ivk: [
-                0xa2, 0xea, 0xb2, 0x74, 0xa9, 0x69, 0xc4, 0x46, 0x8f, 0x66, 0x83, 0x9c, 0x72, 0xaa,
-                0x6e, 0x65, 0xe6, 0x59, 0xb1, 0x2c, 0xd2, 0x17, 0xba, 0x91, 0x04, 0x21, 0xb8, 0x89,
-                0x9f, 0xab, 0x59, 0x32,
+                0x44, 0x35, 0x8f, 0x75, 0xda, 0x3a, 0x1d, 0xd9, 0xa2, 0xa2, 0xb0, 0x7c, 0x0b, 0x4e,
+                0x2f, 0xc2, 0x01, 0x89, 0xd9, 0xfc, 0x3d, 0x0d, 0x8a, 0xae, 0xf8, 0x93, 0xfe, 0xed,
+                0xae, 0x57, 0x26, 0x29,
             ],
             internal_ovk: [
-                0x81, 0xc1, 0xe2, 0xde, 0x44, 0xcb, 0xd6, 0xd5, 0xdd, 0x87, 0x6c, 0x87, 0xb5, 0xf8,
-                0x28, 0x0b, 0xec, 0xa7, 0xfa, 0x77, 0x97, 0x76, 0x54, 0x73, 0xf5, 0x92, 0xd5, 0xfa,
-                0xe3, 0xf7, 0xda, 0x9f,
+                0xb5, 0xea, 0x50, 0xd3, 0xe5, 0xcd, 0x42, 0x99, 0x63, 0x30, 0xfb, 0xa6, 0xb8, 0x52,
+                0x3e, 0xf8, 0x12, 0x26, 0x5b, 0x4b, 0xa4, 0x32, 0x58, 0x1c, 0x21, 0x03, 0xe3, 0x52,
+                0xd1, 0x6d, 0xbb, 0x90,
             ],
             internal_dk: [
-                0x2b, 0x04, 0xdc, 0x9d, 0xed, 0xc2, 0xd0, 0x5e, 0x16, 0x37, 0x1b, 0xcb, 0x8a, 0x17,
-                0x85, 0x44, 0x98, 0x53, 0xf0, 0xed, 0xaf, 0xeb, 0x09, 0xfd, 0xd4, 0x48, 0x3f, 0x42,
-                0xec, 0x7a, 0xc1, 0xb6,
+                0xdd, 0x13, 0xbb, 0x22, 0x13, 0x80, 0x96, 0xc7, 0xaf, 0x9a, 0x16, 0x98, 0x88, 0x4d,
+                0x3d, 0xe8, 0x96, 0x06, 0x48, 0xf8, 0x74, 0xf9, 0x42, 0x22, 0xbd, 0x76, 0xb7, 0x67,
+                0x82, 0x5e, 0x5d, 0xb6,
             ],
             asset: [
-                0xcc, 0x73, 0x29, 0xf3, 0xe9, 0xb4, 0xe5, 0x4c, 0x23, 0x6c, 0x29, 0xaf, 0x39, 0x23,
-                0x10, 0x17, 0x56, 0xd9, 0xfa, 0x4b, 0xd0, 0xf7, 0xd2, 0xdd, 0xaa, 0xcb, 0x6b, 0x0f,
-                0x86, 0xa2, 0x65, 0x8e,
+                0x0c, 0x3a, 0x90, 0xb4, 0x9a, 0xd4, 0xbb, 0xc6, 0x8e, 0x37, 0xc0, 0xaa, 0x7d, 0x9b,
+                0x3f, 0xe1, 0x77, 0x99, 0xd7, 0x3b, 0x84, 0x1e, 0x75, 0x17, 0x13, 0xa0, 0x29, 0x43,
+                0x90, 0x5a, 0xae, 0x08,
             ],
             note_v: 1456989545392107075,
             note_rho: [
@@ -653,438 +653,438 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x0d, 0xc0, 0xb7, 0x16,
             ],
             note_cmx: [
-                0x26, 0xc0, 0xb4, 0x92, 0xe5, 0x6c, 0xf6, 0xc5, 0xdd, 0x67, 0x9c, 0x84, 0x66, 0x7b,
-                0x74, 0x41, 0x83, 0x63, 0xc7, 0xd9, 0x15, 0xed, 0x6b, 0x72, 0x50, 0xde, 0xa9, 0xd9,
-                0xe7, 0xeb, 0x51, 0x39,
+                0x38, 0x14, 0x8e, 0x9e, 0x3b, 0x05, 0x3a, 0x6d, 0x8f, 0xa7, 0x86, 0x07, 0xed, 0x57,
+                0x64, 0x75, 0x83, 0xa7, 0xf9, 0x37, 0x55, 0x38, 0x84, 0x7b, 0x8c, 0x4a, 0xa0, 0xb4,
+                0xeb, 0x43, 0xa7, 0x32,
             ],
             note_nf: [
-                0x7e, 0xec, 0xa6, 0x5c, 0xbd, 0xc5, 0x01, 0x18, 0x2f, 0x6e, 0x1b, 0x11, 0xa2, 0x3b,
-                0x0f, 0xaa, 0x80, 0xfc, 0x26, 0xca, 0x16, 0xbc, 0x4c, 0xd0, 0x97, 0x33, 0xab, 0x0e,
-                0x1d, 0x10, 0x8d, 0x16,
+                0x37, 0x57, 0x49, 0xa6, 0xa1, 0xd6, 0x44, 0xa4, 0x83, 0xc7, 0x09, 0xee, 0xc4, 0xaa,
+                0x87, 0xb8, 0x58, 0xba, 0x0f, 0x71, 0x1b, 0x76, 0x5b, 0xbf, 0xfa, 0x97, 0xa9, 0x3f,
+                0x57, 0x4f, 0x29, 0x23,
             ],
         },
         TestVector {
             sk: [
-                0xc4, 0x8f, 0xbd, 0x46, 0x7f, 0x75, 0xb7, 0x80, 0x14, 0x9a, 0xe8, 0x80, 0x8f, 0x4e,
-                0x68, 0xf5, 0x0c, 0x05, 0x36, 0xac, 0xdd, 0xf6, 0xf1, 0xae, 0xab, 0x01, 0x6b, 0x6b,
-                0xc1, 0xec, 0x14, 0x4b,
+                0x03, 0xfd, 0x69, 0x44, 0x2e, 0xb7, 0x68, 0x1e, 0xc2, 0xa0, 0x56, 0x00, 0x05, 0x4e,
+                0x92, 0xee, 0xd5, 0x55, 0x02, 0x8f, 0x21, 0xb6, 0xa1, 0x55, 0x26, 0x8a, 0x2d, 0xd6,
+                0x64, 0x0a, 0x69, 0x30,
             ],
             ask: [
-                0xb1, 0xc5, 0x78, 0x06, 0x79, 0xa6, 0x48, 0x9f, 0x79, 0x78, 0xd0, 0x2d, 0x12, 0xb9,
-                0xcf, 0x78, 0xe9, 0x18, 0x25, 0x6d, 0xfa, 0xae, 0xbe, 0xe5, 0xd8, 0x9d, 0x71, 0xe5,
-                0xc1, 0xdc, 0x0e, 0x3b,
+                0xd0, 0xa8, 0x8e, 0x38, 0xe2, 0xd6, 0x67, 0x96, 0xf4, 0x9f, 0x9f, 0x39, 0x48, 0x44,
+                0xa3, 0x1e, 0x29, 0x02, 0xa4, 0x14, 0x0a, 0xbf, 0x96, 0x9d, 0x5a, 0x6a, 0x39, 0xd0,
+                0xbe, 0x92, 0x16, 0x21,
             ],
             ak: [
-                0x95, 0x99, 0x81, 0xe9, 0x29, 0xa7, 0x15, 0xa3, 0x4e, 0x5b, 0x05, 0xc0, 0xc1, 0x23,
-                0x1e, 0x52, 0x25, 0x96, 0xb9, 0x44, 0xd5, 0x24, 0xf6, 0x2c, 0x2a, 0x4b, 0xd6, 0x95,
-                0x3e, 0x5a, 0x84, 0x13,
+                0xb6, 0xd5, 0x12, 0x34, 0xfe, 0xf8, 0x7c, 0xaf, 0x48, 0x38, 0x54, 0x07, 0xeb, 0x1d,
+                0x32, 0x71, 0xf9, 0xad, 0xc7, 0x1d, 0xe7, 0xc0, 0x81, 0xca, 0x6a, 0xae, 0xc0, 0xf9,
+                0x18, 0x4f, 0x0c, 0x2a,
             ],
             isk: [
-                0x4e, 0x55, 0x3a, 0xcf, 0xd6, 0x70, 0xf7, 0x7e, 0x75, 0x5f, 0xc8, 0x8e, 0x06, 0x77,
-                0xe3, 0x1b, 0xa4, 0x59, 0xb4, 0x4e, 0x30, 0x77, 0x68, 0x95, 0x8f, 0xe3, 0x78, 0x9d,
-                0x41, 0xc2, 0xb1, 0xff,
+                0xc9, 0x9b, 0x71, 0x41, 0xac, 0x62, 0x6a, 0xb4, 0x76, 0x1f, 0xd3, 0xf4, 0x1e, 0x72,
+                0x8e, 0x1a, 0x28, 0xf8, 0x9d, 0xb8, 0x9f, 0xfd, 0xec, 0xa3, 0x64, 0xdd, 0x2f, 0x0f,
+                0x07, 0x39, 0xf0, 0x53,
             ],
             ik: [
-                0xbf, 0xfe, 0xa0, 0x0a, 0xf9, 0x2b, 0x81, 0xbc, 0x57, 0x2b, 0xea, 0x4a, 0x26, 0x73,
-                0x5a, 0x34, 0x9f, 0x4d, 0x76, 0xd1, 0x69, 0x68, 0xe5, 0x6c, 0x56, 0x5f, 0xd9, 0x2b,
-                0xeb, 0x46, 0x08, 0x48,
+                0x03, 0xd8, 0x30, 0x92, 0xd7, 0x09, 0xcb, 0x92, 0x8f, 0xf1, 0x50, 0xf0, 0x8e, 0xa2,
+                0x68, 0xe8, 0x45, 0x41, 0x80, 0xcd, 0xc4, 0x9f, 0x07, 0xf5, 0xa3, 0xd9, 0xb2, 0x03,
+                0x90, 0x68, 0xc9, 0x09,
             ],
             nk: [
-                0x7c, 0xf5, 0xe1, 0x97, 0xb7, 0x7a, 0x3c, 0xe4, 0xb6, 0x69, 0x61, 0x5b, 0x78, 0xd3,
-                0x19, 0x65, 0x9a, 0x90, 0x46, 0x3e, 0x45, 0x93, 0x32, 0x47, 0x44, 0xb9, 0xb4, 0x19,
-                0x35, 0xa9, 0xfd, 0x3a,
+                0x0d, 0x47, 0x60, 0xf0, 0xe9, 0x3d, 0x2c, 0x4b, 0x67, 0x6e, 0x88, 0xfa, 0x40, 0xfa,
+                0x8d, 0xb7, 0x1b, 0xb6, 0x5d, 0x49, 0xa3, 0xa0, 0xc4, 0x6f, 0xa7, 0xa2, 0xef, 0x14,
+                0x68, 0x42, 0x2b, 0x01,
             ],
             rivk: [
-                0x61, 0xf7, 0x39, 0x8a, 0x70, 0x07, 0x07, 0x95, 0x94, 0xad, 0xa8, 0xc8, 0x37, 0x0d,
-                0xd8, 0xa9, 0xe4, 0x90, 0x66, 0xee, 0xf2, 0xd6, 0x05, 0x9b, 0x02, 0xa1, 0x67, 0x68,
-                0x26, 0xaa, 0x4a, 0x2d,
+                0xd4, 0x2b, 0x9a, 0x02, 0x8a, 0xbb, 0xe3, 0x86, 0x43, 0x77, 0x48, 0xdb, 0x20, 0x9f,
+                0xdb, 0xa8, 0x40, 0xf3, 0xf6, 0x82, 0xa5, 0x0c, 0x1e, 0xf0, 0xaf, 0xa4, 0xa9, 0xfe,
+                0x7b, 0xa3, 0x3f, 0x2b,
             ],
             ivk: [
-                0xcc, 0xb2, 0x24, 0x66, 0xf1, 0xa3, 0xda, 0x33, 0xc2, 0xfd, 0xab, 0x63, 0x19, 0xde,
-                0x82, 0x71, 0xff, 0xd9, 0xc7, 0xc7, 0xba, 0xfa, 0x24, 0x06, 0x8e, 0x72, 0x32, 0x1c,
-                0x87, 0x67, 0x76, 0x2b,
+                0xec, 0x8d, 0x1b, 0x93, 0x18, 0x3d, 0x20, 0x33, 0xc2, 0x7b, 0x18, 0xe8, 0xc8, 0xbc,
+                0xe1, 0xa0, 0xc2, 0xcd, 0x49, 0x7a, 0x35, 0x84, 0xf1, 0x6e, 0x3b, 0x90, 0x79, 0xc9,
+                0xa9, 0x33, 0x50, 0x27,
             ],
             ovk: [
-                0x12, 0xac, 0xb4, 0xf9, 0xf0, 0xb2, 0xcc, 0x5d, 0xfa, 0x03, 0x15, 0x46, 0x73, 0xd7,
-                0xf3, 0x0c, 0x7f, 0x1c, 0xb1, 0x84, 0xa7, 0xce, 0x4e, 0xd8, 0x4b, 0x9d, 0x0b, 0x3d,
-                0x8e, 0x68, 0x63, 0xd3,
+                0x2f, 0x84, 0x6f, 0xbb, 0x28, 0xfb, 0x64, 0x2c, 0x43, 0x0a, 0x2b, 0xef, 0x8c, 0xb1,
+                0xde, 0x58, 0x95, 0x2d, 0xa6, 0x22, 0xe5, 0x89, 0x38, 0xab, 0xaf, 0x10, 0xa6, 0x92,
+                0x9a, 0x7f, 0xa1, 0xee,
             ],
             dk: [
-                0x51, 0xba, 0x5e, 0x4e, 0x4b, 0x8f, 0xbe, 0xf0, 0xd0, 0x1e, 0xf3, 0x8c, 0x77, 0xb4,
-                0xba, 0x7f, 0xfa, 0x26, 0x72, 0xfa, 0x7a, 0xde, 0x50, 0x4f, 0xdb, 0x85, 0x91, 0x05,
-                0x46, 0x7d, 0x0a, 0x91,
+                0x7b, 0xf1, 0x6e, 0xcf, 0x21, 0x0e, 0xb5, 0x19, 0x02, 0xb4, 0x99, 0xd6, 0xbc, 0x5c,
+                0xab, 0xb0, 0x77, 0x17, 0x64, 0x1a, 0xd4, 0xb0, 0x1a, 0xa5, 0x08, 0xac, 0x93, 0x11,
+                0x0b, 0x36, 0x0c, 0x2c,
             ],
             default_d: [
-                0x7f, 0xd2, 0x1b, 0xf0, 0xf5, 0xf3, 0x2f, 0x7d, 0xf2, 0xec, 0x7f,
+                0x49, 0xa0, 0xd1, 0xfa, 0x5b, 0x94, 0x5d, 0xd7, 0xb6, 0xc6, 0x64,
             ],
             default_pk_d: [
-                0x54, 0x92, 0x6e, 0xd8, 0xd4, 0xbc, 0x4c, 0xcd, 0xed, 0xc9, 0x91, 0xaa, 0x62, 0x19,
-                0xc3, 0xf6, 0xb4, 0x58, 0xd6, 0x78, 0xc6, 0xd6, 0xc3, 0xc9, 0x0d, 0x57, 0xfc, 0x08,
-                0x71, 0xc3, 0x50, 0xbe,
+                0x56, 0xfd, 0x76, 0xdd, 0x5b, 0xb7, 0x44, 0xa9, 0x49, 0x4c, 0x08, 0xed, 0x92, 0xda,
+                0x2c, 0xf3, 0xd7, 0x48, 0x44, 0x34, 0xc9, 0x54, 0x59, 0x23, 0xf3, 0x82, 0x1a, 0xcc,
+                0x01, 0x32, 0x17, 0x1a,
             ],
             internal_rivk: [
-                0xd6, 0x2f, 0x96, 0x87, 0x62, 0x35, 0x26, 0x2b, 0x7e, 0x75, 0x5a, 0x3f, 0x1d, 0x4e,
-                0x79, 0x99, 0x7e, 0xec, 0x6d, 0x46, 0x60, 0x39, 0x8f, 0xe0, 0x7e, 0x29, 0x0a, 0x31,
-                0xac, 0xf0, 0xdb, 0x2c,
+                0xcb, 0x53, 0x0d, 0x7b, 0x34, 0xfb, 0x08, 0x9c, 0x92, 0x72, 0x1c, 0x3e, 0xa0, 0xd2,
+                0x14, 0x4d, 0x87, 0xb8, 0x9c, 0xa0, 0xc0, 0x6a, 0x9d, 0x44, 0x6d, 0x88, 0x1f, 0x4a,
+                0x99, 0xa1, 0xf9, 0x33,
             ],
             internal_ivk: [
-                0x6e, 0x03, 0xa4, 0xfd, 0xba, 0x1e, 0xc7, 0xcd, 0xcf, 0x05, 0x09, 0x97, 0x60, 0xbb,
-                0xb9, 0xa7, 0x0f, 0x42, 0x4d, 0xcb, 0x20, 0x88, 0x01, 0xd1, 0xe2, 0x7f, 0x12, 0xbd,
-                0x4f, 0x14, 0x91, 0x1f,
+                0xda, 0x1d, 0x87, 0xca, 0x7d, 0xf0, 0xf3, 0x9b, 0x24, 0xfc, 0x8f, 0x50, 0xa3, 0x05,
+                0xd8, 0x3a, 0x03, 0xce, 0xba, 0x2a, 0x59, 0xd2, 0x7a, 0x7d, 0xd4, 0x01, 0x34, 0x05,
+                0x18, 0x40, 0x18, 0x25,
             ],
             internal_ovk: [
-                0xba, 0xe4, 0x5d, 0xdd, 0xa9, 0xfe, 0x68, 0x60, 0xe7, 0xc8, 0x70, 0x09, 0x38, 0xb1,
-                0x32, 0x4e, 0x6f, 0xe0, 0xe9, 0x88, 0x6e, 0xd8, 0xb0, 0xe2, 0xf9, 0xeb, 0x46, 0xe0,
-                0x53, 0x1d, 0x2a, 0x5f,
+                0x87, 0x66, 0x9c, 0x4e, 0x89, 0xf6, 0x8e, 0x3c, 0xe9, 0x60, 0x6e, 0xe7, 0x26, 0x52,
+                0xb3, 0x89, 0x3d, 0xff, 0x01, 0x3f, 0x71, 0x89, 0x8f, 0x77, 0x82, 0x40, 0x4f, 0xba,
+                0x8c, 0xef, 0x40, 0x3a,
             ],
             internal_dk: [
-                0xc1, 0xcf, 0x55, 0xea, 0xc9, 0xa8, 0x94, 0x18, 0x77, 0x6b, 0x9e, 0xfc, 0x67, 0xef,
-                0xe9, 0x0b, 0xf3, 0x61, 0xee, 0xb0, 0x96, 0xed, 0x61, 0x86, 0xc4, 0x1a, 0x60, 0xc4,
-                0x29, 0xa5, 0xb5, 0xa9,
+                0x24, 0x5c, 0xf8, 0xf2, 0xe0, 0x54, 0xb1, 0xc0, 0x3b, 0x5f, 0x19, 0xf6, 0xd2, 0x9d,
+                0x15, 0x69, 0x6f, 0x0f, 0x1d, 0x39, 0x21, 0xf6, 0xcf, 0x1d, 0x6f, 0x5f, 0x8f, 0xd5,
+                0xd6, 0x61, 0x46, 0x50,
             ],
             asset: [
-                0xbc, 0x6b, 0xc2, 0x30, 0x7b, 0x48, 0x8d, 0x25, 0x56, 0xd7, 0xb7, 0x38, 0x0e, 0xa4,
-                0xff, 0xd7, 0x12, 0xf6, 0xb0, 0x2f, 0xe8, 0x06, 0xb9, 0x45, 0x69, 0xcd, 0x40, 0x59,
-                0xf3, 0x96, 0xbf, 0x29,
+                0xb3, 0x25, 0xcd, 0xab, 0x95, 0x40, 0x4f, 0xc7, 0xae, 0xd7, 0x05, 0x25, 0xcd, 0xdb,
+                0x41, 0x87, 0x2c, 0xfc, 0xc2, 0x14, 0xb1, 0x32, 0x32, 0xed, 0xc7, 0x86, 0x09, 0x75,
+                0x3d, 0xbf, 0xf9, 0x30,
             ],
-            note_v: 94453636825041987,
+            note_v: 10781511188385845786,
             note_rho: [
-                0xb9, 0x9d, 0x0a, 0x40, 0xe5, 0xe1, 0x71, 0x1c, 0xa9, 0x44, 0xf7, 0x2d, 0x43, 0x6a,
-                0x10, 0x2f, 0xca, 0x4b, 0x97, 0x69, 0x3d, 0xa0, 0xb0, 0x86, 0xfe, 0x9d, 0x2e, 0x71,
-                0x62, 0x47, 0x0d, 0x02,
+                0x7a, 0xe3, 0x5a, 0xf7, 0x16, 0x71, 0x18, 0x14, 0x1c, 0xe4, 0xc9, 0xbe, 0x0a, 0x6a,
+                0x49, 0x2f, 0xe7, 0x9f, 0x15, 0x81, 0xa1, 0x55, 0xfa, 0x3a, 0x2b, 0x9d, 0xaf, 0xd8,
+                0x2e, 0x65, 0x0b, 0x38,
             ],
             note_rseed: [
-                0xe0, 0xf0, 0x5d, 0x4b, 0xec, 0x95, 0x12, 0xbf, 0xb3, 0xf3, 0x83, 0x27, 0x29, 0x6e,
-                0xfa, 0xa7, 0x43, 0x28, 0xb1, 0x18, 0xc2, 0x74, 0x02, 0xc7, 0x0c, 0x3a, 0x90, 0xb4,
-                0x9a, 0xd4, 0xbb, 0xc6,
+                0x6a, 0xd3, 0xa0, 0x8c, 0xb6, 0xb8, 0x31, 0x31, 0xac, 0x30, 0x0b, 0x08, 0x46, 0x35,
+                0x4a, 0x7e, 0xef, 0x9c, 0x41, 0x0e, 0x4b, 0x62, 0xc4, 0x7c, 0x54, 0x26, 0x90, 0x7d,
+                0xfc, 0x66, 0x85, 0xc5,
             ],
             note_cmx: [
-                0x98, 0xfc, 0x4e, 0x7f, 0x1d, 0xb8, 0x5a, 0xe6, 0x42, 0x14, 0xd8, 0x30, 0x06, 0xd8,
-                0xac, 0xa8, 0xc2, 0x48, 0x73, 0x53, 0x2c, 0x22, 0x1b, 0x06, 0xd1, 0x8d, 0xf2, 0xb7,
-                0xeb, 0x5f, 0xe5, 0x00,
+                0xbe, 0xe1, 0xae, 0x8e, 0x13, 0xef, 0x9b, 0xda, 0x15, 0x3f, 0xa2, 0xde, 0xf1, 0xf7,
+                0x23, 0x97, 0xa1, 0xce, 0xd9, 0x5f, 0x1d, 0x2a, 0x9f, 0x96, 0xfb, 0x09, 0x77, 0x5f,
+                0x86, 0x7f, 0x7c, 0x32,
             ],
             note_nf: [
-                0x37, 0xd7, 0xe9, 0x3c, 0xec, 0xfc, 0x62, 0x08, 0x8c, 0xde, 0x33, 0x41, 0x47, 0x88,
-                0xfe, 0xab, 0x15, 0x8a, 0x40, 0xb4, 0xe9, 0x4a, 0x51, 0x11, 0xa7, 0x07, 0xaf, 0x3a,
-                0x44, 0x3b, 0xd1, 0x3a,
+                0x46, 0xca, 0xbd, 0x45, 0x05, 0xe6, 0xf4, 0xf8, 0x6d, 0x2a, 0xa4, 0xbe, 0x6b, 0x14,
+                0x61, 0x3a, 0xca, 0xa4, 0x13, 0x33, 0x34, 0x44, 0xcf, 0x3e, 0x48, 0x5e, 0x6b, 0xeb,
+                0x39, 0xf2, 0xa7, 0x27,
             ],
         },
         TestVector {
             sk: [
-                0x8e, 0x37, 0xc0, 0xaa, 0x7d, 0x9b, 0x3f, 0xe1, 0x77, 0x99, 0xd7, 0x3b, 0x84, 0x1e,
-                0x75, 0x17, 0x13, 0xa0, 0x29, 0x43, 0x90, 0x5a, 0xae, 0x08, 0x03, 0xfd, 0x69, 0x44,
-                0x2e, 0xb7, 0x68, 0x1e,
+                0xeb, 0x0d, 0xc1, 0x56, 0x61, 0x2b, 0x9c, 0xb4, 0x34, 0xbc, 0x4b, 0x69, 0x33, 0x92,
+                0xde, 0xb8, 0x7c, 0x53, 0x04, 0x35, 0x31, 0x2e, 0xdc, 0xed, 0xc6, 0xa9, 0x61, 0x13,
+                0x33, 0x38, 0xd7, 0x86,
             ],
             ask: [
-                0xfb, 0x9c, 0xa6, 0xa7, 0xf2, 0x49, 0x20, 0x67, 0xaa, 0x19, 0x42, 0x01, 0xaa, 0xbc,
-                0xd5, 0xc0, 0xce, 0xe9, 0x9f, 0x6d, 0x65, 0x0f, 0x0f, 0x10, 0x44, 0x96, 0xac, 0xc5,
-                0x88, 0x34, 0x89, 0x2b,
+                0x71, 0x37, 0xb4, 0x05, 0xf0, 0x52, 0x86, 0xe8, 0xf2, 0x77, 0x0c, 0xd2, 0x1e, 0x2f,
+                0x2c, 0x15, 0x28, 0x76, 0x4d, 0x4a, 0xad, 0x93, 0x85, 0x04, 0x0e, 0xa2, 0xec, 0x74,
+                0xaa, 0x6e, 0xa6, 0x31,
             ],
             ak: [
-                0xa0, 0xb2, 0x52, 0xde, 0x9e, 0x88, 0xee, 0xc0, 0x36, 0x2e, 0x43, 0x6f, 0x58, 0x52,
-                0xf7, 0x4f, 0x7e, 0x3c, 0x74, 0x94, 0xe4, 0xa6, 0x65, 0x2f, 0xbf, 0xa7, 0x44, 0xdb,
-                0xa3, 0xa9, 0x23, 0x14,
+                0x78, 0xdb, 0xcc, 0x02, 0x0e, 0x1b, 0xbc, 0xe5, 0x4d, 0x0f, 0x54, 0x76, 0xa6, 0x64,
+                0x3b, 0xc8, 0x2d, 0xae, 0x3e, 0x61, 0x4a, 0xc5, 0x8d, 0x05, 0x7f, 0xfc, 0x5d, 0x3c,
+                0x60, 0xd7, 0x5e, 0x3e,
             ],
             isk: [
-                0xc2, 0xa0, 0x56, 0x00, 0x05, 0x4e, 0x92, 0xee, 0xd5, 0x55, 0x02, 0x8f, 0x21, 0xb6,
-                0xa1, 0x55, 0x26, 0x8a, 0x2d, 0xd6, 0x64, 0x0a, 0x69, 0x30, 0x1a, 0x52, 0xa3, 0x8d,
-                0x4d, 0x9f, 0x9f, 0x95,
+                0x60, 0xfe, 0x49, 0xe3, 0x7e, 0x4f, 0x66, 0x69, 0x31, 0x67, 0x73, 0x19, 0xed, 0x89,
+                0xf8, 0x55, 0x88, 0x74, 0x1b, 0x31, 0x28, 0x90, 0x1a, 0x93, 0xbd, 0x78, 0xe4, 0xbe,
+                0x02, 0x25, 0xa9, 0xe2,
             ],
             ik: [
-                0x3e, 0x34, 0xea, 0xa1, 0x93, 0x26, 0x04, 0x49, 0xf3, 0xe8, 0x83, 0xfd, 0x5f, 0xbd,
-                0x84, 0xfd, 0x99, 0xbf, 0x10, 0xa1, 0xa4, 0xdf, 0x14, 0x60, 0x98, 0x78, 0x4a, 0xe2,
-                0xc3, 0xc2, 0xdb, 0xf7,
+                0x78, 0xfe, 0x62, 0x0f, 0xc5, 0x91, 0x3f, 0xc1, 0x8a, 0xa2, 0x09, 0x36, 0x40, 0x9d,
+                0x38, 0x8f, 0x0f, 0x10, 0x88, 0x14, 0xa7, 0x5e, 0x93, 0x1b, 0xea, 0xcb, 0x61, 0x83,
+                0xa9, 0xbe, 0x18, 0xc4,
             ],
             nk: [
-                0xfe, 0x7d, 0xda, 0x8a, 0x42, 0xb1, 0x49, 0x04, 0xad, 0x4f, 0xf1, 0x14, 0xae, 0x3a,
-                0x97, 0xd2, 0x01, 0xb6, 0x17, 0xf5, 0xd5, 0xd0, 0x2e, 0xe0, 0xde, 0x77, 0x4b, 0xb4,
-                0x6e, 0xd0, 0x56, 0x37,
+                0x88, 0xc5, 0xc9, 0x2d, 0x1c, 0xd0, 0xe5, 0x01, 0xc9, 0x1d, 0x80, 0x1c, 0x50, 0xdf,
+                0x26, 0xd3, 0xbb, 0xbc, 0x5f, 0x7c, 0xc0, 0x49, 0xcb, 0xb2, 0x9d, 0xc3, 0x80, 0x17,
+                0x85, 0x6f, 0xbb, 0x10,
             ],
             rivk: [
-                0xf8, 0xbf, 0x8f, 0x4f, 0x71, 0x88, 0x90, 0x67, 0xcb, 0x99, 0xf2, 0xec, 0xc5, 0x41,
-                0x50, 0x6c, 0x23, 0x0a, 0xff, 0x88, 0x64, 0x26, 0x68, 0x59, 0xf0, 0x15, 0xdf, 0xf4,
-                0xc4, 0x89, 0x5e, 0x32,
+                0x7e, 0xc2, 0xbb, 0xc2, 0xe8, 0x1c, 0x38, 0x95, 0xe2, 0x3c, 0x74, 0x14, 0x3c, 0x52,
+                0xce, 0x83, 0xde, 0xf8, 0x7d, 0xb0, 0xa7, 0x03, 0x94, 0xf7, 0xba, 0xa0, 0x70, 0x0f,
+                0xce, 0x23, 0x43, 0x11,
             ],
             ivk: [
-                0x4b, 0x22, 0xa9, 0x1d, 0xfe, 0xa9, 0x16, 0x81, 0x91, 0x48, 0xb8, 0x3d, 0x80, 0x5d,
-                0xe3, 0xc7, 0xc6, 0x3f, 0xe3, 0x58, 0x11, 0x41, 0xec, 0xdc, 0x26, 0x43, 0x28, 0xe5,
-                0x7c, 0x0b, 0x43, 0x2b,
+                0xdd, 0x92, 0x93, 0xed, 0x12, 0x10, 0x4c, 0x31, 0xd7, 0xa1, 0x2a, 0xbd, 0xd3, 0xcf,
+                0x19, 0x56, 0x93, 0x93, 0x66, 0x84, 0x4c, 0x8a, 0x07, 0xf5, 0x08, 0x34, 0xa5, 0x86,
+                0x15, 0x5b, 0xc2, 0x1a,
             ],
             ovk: [
-                0x12, 0xe5, 0xa1, 0x7f, 0x89, 0x12, 0xd9, 0x6b, 0xfd, 0xc7, 0xd3, 0x75, 0x3c, 0xe2,
-                0xa8, 0x3a, 0xca, 0x2b, 0xc6, 0x45, 0x38, 0x3b, 0xc4, 0x54, 0x51, 0x11, 0x5e, 0xd5,
-                0xb3, 0xf5, 0xbe, 0xaa,
+                0xb5, 0xfc, 0x70, 0xd4, 0xee, 0x1b, 0x52, 0x8e, 0x20, 0xd0, 0xee, 0x81, 0x6e, 0x84,
+                0x5e, 0xf8, 0x9c, 0x2c, 0xf4, 0x31, 0xa3, 0x18, 0x27, 0x22, 0xfd, 0xe8, 0xbb, 0x37,
+                0x39, 0xc6, 0xd6, 0xac,
             ],
             dk: [
-                0xc6, 0xa0, 0xdc, 0x04, 0x56, 0xbc, 0x4c, 0x39, 0x9e, 0x20, 0x2d, 0x00, 0xd3, 0x2e,
-                0xaf, 0xc9, 0xa8, 0xc0, 0xe2, 0x65, 0xa4, 0xae, 0xb1, 0x07, 0xa9, 0xa6, 0x4d, 0x93,
-                0x8b, 0x14, 0xc0, 0x0f,
+                0xc8, 0x57, 0x68, 0x3f, 0xfd, 0xc4, 0x6f, 0x1e, 0xf4, 0x01, 0xc0, 0x72, 0xae, 0xa0,
+                0x23, 0x49, 0xa7, 0x75, 0xee, 0xe5, 0x5a, 0x5a, 0xad, 0x7b, 0x39, 0xda, 0xc9, 0xb1,
+                0x07, 0x1f, 0x78, 0x2c,
             ],
             default_d: [
-                0x07, 0xd3, 0x0c, 0x15, 0x5a, 0x71, 0x0a, 0x2d, 0x03, 0x28, 0x25,
+                0x2b, 0xc6, 0x0b, 0xe6, 0x02, 0x99, 0x36, 0x8b, 0x00, 0x6b, 0xf1,
             ],
             default_pk_d: [
-                0xd7, 0x8b, 0x08, 0x60, 0xbb, 0xf7, 0x82, 0x52, 0x83, 0x79, 0x8e, 0xa7, 0xa6, 0x62,
-                0x98, 0x14, 0xed, 0xe8, 0x14, 0x8a, 0x53, 0x8d, 0xe6, 0x30, 0x0e, 0x0f, 0x88, 0x90,
-                0x4f, 0x01, 0x4c, 0x19,
+                0x88, 0x44, 0x53, 0xc6, 0x20, 0x2f, 0x5b, 0xda, 0x5b, 0x3c, 0xb7, 0xc1, 0x19, 0x35,
+                0x1a, 0x4b, 0x7d, 0x27, 0x77, 0x7a, 0xf3, 0x75, 0x1b, 0xe6, 0x93, 0x33, 0x4a, 0x7d,
+                0xcd, 0x62, 0x86, 0x14,
             ],
             internal_rivk: [
-                0xc4, 0x35, 0x16, 0x37, 0x67, 0x71, 0xad, 0xca, 0x2b, 0x7b, 0xeb, 0xe3, 0xe6, 0xa7,
-                0x1c, 0xb6, 0x5c, 0xa8, 0xcf, 0x1f, 0xfb, 0x16, 0xc9, 0xc4, 0xf0, 0x48, 0x19, 0x86,
-                0x87, 0x9e, 0xee, 0x28,
+                0x7a, 0x20, 0x92, 0x16, 0xf7, 0x8a, 0x6d, 0xd5, 0x0d, 0x5a, 0xc2, 0x20, 0x8a, 0x39,
+                0xa7, 0x0b, 0xa2, 0x80, 0x71, 0xd1, 0xdf, 0x72, 0x62, 0xb6, 0x27, 0x93, 0x44, 0x49,
+                0x10, 0x24, 0xa3, 0x31,
             ],
             internal_ivk: [
-                0xaf, 0x6a, 0xbb, 0xb5, 0xde, 0x71, 0x0f, 0x0f, 0xb4, 0x0f, 0xa5, 0xa2, 0xe2, 0x7e,
-                0x8c, 0x83, 0x2c, 0x69, 0x9c, 0x2b, 0x7f, 0x58, 0xbd, 0xa6, 0xbc, 0x9a, 0xd5, 0xb9,
-                0x11, 0xc1, 0xf0, 0x20,
+                0xf9, 0xb9, 0xd0, 0xd3, 0xe5, 0x30, 0xe2, 0x69, 0x9a, 0xdc, 0x7b, 0x3e, 0xbf, 0xd8,
+                0x13, 0x9f, 0x0e, 0xf2, 0x1e, 0x5c, 0x10, 0x03, 0xc0, 0xd1, 0x1b, 0x8a, 0x8b, 0x47,
+                0x93, 0xce, 0x00, 0x24,
             ],
             internal_ovk: [
-                0x08, 0x6a, 0x61, 0x0d, 0x50, 0x7d, 0xb9, 0xaa, 0x4f, 0x34, 0x90, 0x40, 0xd4, 0xf4,
-                0xbf, 0x35, 0x58, 0x05, 0x68, 0xcf, 0x36, 0xe9, 0x3f, 0x40, 0x57, 0x5f, 0x7f, 0x2a,
-                0x50, 0xb6, 0xa1, 0xde,
+                0xa9, 0x6e, 0x11, 0xc5, 0x27, 0x11, 0xbf, 0x38, 0xee, 0x29, 0xd1, 0xc4, 0xb5, 0xa4,
+                0x20, 0xbf, 0x83, 0x7c, 0x2a, 0x95, 0xc0, 0xaf, 0x5e, 0xa8, 0x83, 0xfb, 0x74, 0x74,
+                0xca, 0xe6, 0xad, 0x9f,
             ],
             internal_dk: [
-                0xfa, 0xae, 0xd1, 0xb9, 0xd7, 0xee, 0x7b, 0x90, 0xb4, 0xa4, 0x70, 0xfd, 0x49, 0xdc,
-                0xd2, 0x8c, 0x76, 0xe6, 0x0e, 0xfc, 0xb8, 0x0f, 0x4d, 0x9e, 0x40, 0xe6, 0x6f, 0xa7,
-                0x76, 0xc7, 0x07, 0x1f,
+                0x73, 0x7f, 0xae, 0x39, 0x10, 0xf9, 0x06, 0x3f, 0x60, 0x1e, 0x89, 0x02, 0x1b, 0x08,
+                0xfa, 0x41, 0x40, 0x49, 0x1a, 0xfc, 0x55, 0xf7, 0x48, 0x66, 0x0e, 0x40, 0x73, 0x73,
+                0xe8, 0x22, 0xd2, 0xfb,
             ],
             asset: [
-                0x1c, 0xe4, 0xc9, 0xbe, 0x0a, 0x6a, 0x49, 0x2f, 0xe7, 0x9f, 0x15, 0x81, 0xa1, 0x55,
-                0xfa, 0x3a, 0x2b, 0x9d, 0xaf, 0xd8, 0x2e, 0x65, 0x0b, 0x38, 0x6a, 0xd3, 0xa0, 0x8c,
-                0xb6, 0xb8, 0x31, 0x31,
+                0x09, 0x07, 0x54, 0x17, 0xfc, 0xc0, 0x06, 0x2e, 0x49, 0xf0, 0x08, 0xc5, 0x1a, 0xd4,
+                0x22, 0x74, 0x39, 0xc1, 0xb4, 0x47, 0x6c, 0xcd, 0x8e, 0x97, 0x86, 0x2d, 0xab, 0x7b,
+                0xe1, 0xe8, 0xd3, 0x99,
             ],
-            note_v: 1448031623652762490,
+            note_v: 11605778395872469956,
             note_rho: [
-                0x76, 0x1f, 0xd3, 0xf4, 0x1e, 0x72, 0x8e, 0x1a, 0x28, 0xf8, 0x9d, 0xb8, 0x9f, 0xfd,
-                0xec, 0xa3, 0x64, 0xdd, 0x2f, 0x0f, 0x07, 0x39, 0xf0, 0x53, 0x45, 0x56, 0x48, 0x31,
-                0x99, 0xc7, 0x1f, 0x18,
+                0x9a, 0x7c, 0x23, 0xa9, 0x96, 0x94, 0x1d, 0x88, 0x9e, 0x46, 0x22, 0xa9, 0xb9, 0xb1,
+                0xd5, 0x9d, 0x5e, 0x31, 0x90, 0x94, 0x31, 0x8c, 0xd4, 0x05, 0xba, 0x27, 0xb7, 0xe2,
+                0xc0, 0x84, 0x76, 0x2d,
             ],
             note_rseed: [
-                0x93, 0x41, 0xac, 0x9b, 0x78, 0xa2, 0x69, 0x16, 0x42, 0x06, 0xa0, 0xea, 0x1c, 0xe7,
-                0x3b, 0xfb, 0x2a, 0x94, 0x2e, 0x73, 0x70, 0xb2, 0x47, 0xc0, 0x46, 0xf8, 0xe7, 0x5e,
-                0xf8, 0xe3, 0xf8, 0xbd,
+                0x31, 0x45, 0x3e, 0xc4, 0x54, 0x9a, 0x4d, 0x97, 0x72, 0x9d, 0x03, 0x34, 0x60, 0xfc,
+                0xf8, 0x9d, 0x64, 0x94, 0xf2, 0xff, 0xd7, 0x89, 0xe9, 0x80, 0x82, 0xea, 0x5c, 0xe9,
+                0x53, 0x4b, 0x3a, 0xcd,
             ],
             note_cmx: [
-                0xdf, 0x72, 0x6a, 0x0e, 0x47, 0xd8, 0xb7, 0xd9, 0xcc, 0xa2, 0x6a, 0x1f, 0x74, 0x55,
-                0x4a, 0x81, 0x52, 0x5b, 0x1b, 0x7a, 0xf1, 0x6e, 0xfb, 0x52, 0xb9, 0x27, 0x8b, 0x7c,
-                0x8a, 0xbf, 0x8c, 0x22,
+                0x48, 0xda, 0xaa, 0xc9, 0x22, 0x2d, 0xe0, 0x05, 0x2d, 0x34, 0xd3, 0x21, 0xc5, 0x89,
+                0x7f, 0x86, 0x18, 0xee, 0xfb, 0xd5, 0xd5, 0x69, 0x91, 0x84, 0x30, 0x54, 0x94, 0x5a,
+                0x55, 0x9c, 0x39, 0x1c,
             ],
             note_nf: [
-                0x6a, 0xfb, 0x25, 0xb0, 0x7d, 0x0d, 0x60, 0xa3, 0x28, 0xef, 0x22, 0xd9, 0x06, 0xf3,
-                0x53, 0x1d, 0x8b, 0x50, 0xc4, 0x10, 0x7b, 0xd1, 0xc7, 0x66, 0x2c, 0xd6, 0x7b, 0x5d,
-                0xb2, 0x0a, 0x05, 0x28,
+                0x3a, 0xe6, 0x3f, 0xcb, 0x97, 0xb0, 0x79, 0xfd, 0x66, 0xd9, 0x72, 0x80, 0xec, 0xbc,
+                0x9f, 0xd2, 0x84, 0xfb, 0x09, 0x35, 0x99, 0x36, 0x90, 0x24, 0x1c, 0xd9, 0x26, 0x41,
+                0x66, 0xe3, 0x03, 0x07,
             ],
         },
         TestVector {
             sk: [
-                0x82, 0x1c, 0xf5, 0x77, 0x49, 0x18, 0x64, 0xe2, 0x0e, 0x6d, 0x08, 0xfd, 0x2e, 0x32,
-                0xb5, 0x55, 0xc9, 0x2c, 0x66, 0x1f, 0x19, 0x58, 0x8b, 0x72, 0xa8, 0x95, 0x99, 0x71,
-                0x0a, 0x88, 0x06, 0x12,
+                0xc0, 0x5e, 0xf2, 0x7c, 0x6e, 0x22, 0xee, 0x27, 0x3e, 0x15, 0x78, 0x6e, 0x39, 0x4c,
+                0x8f, 0x1b, 0xe3, 0x16, 0x82, 0xa3, 0x01, 0x47, 0x96, 0x3a, 0xc8, 0xda, 0x8d, 0x41,
+                0xd8, 0x04, 0x25, 0x84,
             ],
             ask: [
-                0xf5, 0x90, 0xaa, 0x36, 0x24, 0x9c, 0x92, 0xdb, 0x3c, 0xb8, 0x45, 0x9e, 0x7c, 0x0a,
-                0x19, 0xd9, 0x22, 0xa7, 0x5e, 0x78, 0x3f, 0xf3, 0x6e, 0x7d, 0x08, 0x10, 0x55, 0xcd,
-                0x5f, 0xf2, 0x1c, 0x38,
+                0xed, 0x13, 0xf6, 0x49, 0x3a, 0x75, 0x3e, 0x17, 0xed, 0xc2, 0xbe, 0x5e, 0xdc, 0xfb,
+                0xf5, 0x84, 0x33, 0x50, 0x0d, 0x44, 0x39, 0xf0, 0xf7, 0x9e, 0xee, 0xa3, 0xfc, 0xc5,
+                0x15, 0x8a, 0x94, 0x0f,
             ],
             ak: [
-                0x66, 0x38, 0xf1, 0x69, 0x63, 0x2d, 0xd9, 0x4d, 0x3b, 0x0c, 0x21, 0x4e, 0xac, 0xc8,
-                0x52, 0xc1, 0xe4, 0xe0, 0x70, 0xcb, 0xdf, 0xb6, 0xe6, 0x2d, 0x08, 0x0f, 0x57, 0x68,
-                0xa6, 0xaa, 0xd4, 0x23,
+                0xfb, 0x04, 0x81, 0x83, 0xeb, 0x36, 0xaa, 0x92, 0xe0, 0x12, 0x52, 0xd7, 0xf7, 0x7d,
+                0x5f, 0xf6, 0x6b, 0xed, 0xf7, 0xe2, 0x70, 0x2e, 0xf7, 0x96, 0x72, 0x8f, 0x7e, 0x2a,
+                0x5f, 0xb3, 0x14, 0x18,
             ],
             isk: [
-                0x53, 0xca, 0x28, 0x5b, 0x63, 0x04, 0xb3, 0x7d, 0xa2, 0xb5, 0x29, 0x4f, 0x5c, 0xb3,
-                0x54, 0xa8, 0x94, 0x32, 0x28, 0x48, 0xcc, 0xbd, 0xc7, 0xc2, 0x54, 0x5b, 0x7d, 0xa5,
-                0x68, 0xaf, 0xac, 0x87,
+                0xd7, 0xc1, 0x11, 0xa6, 0x8e, 0xf4, 0x4b, 0xcd, 0x0c, 0x15, 0x13, 0xad, 0x47, 0xca,
+                0x61, 0xc6, 0x59, 0xcc, 0x5d, 0x32, 0x5b, 0x44, 0x0f, 0x6b, 0x9f, 0x59, 0xaf, 0xf6,
+                0x68, 0x79, 0xbb, 0x66,
             ],
             ik: [
-                0x5e, 0x8e, 0x92, 0x06, 0x37, 0x1f, 0xe4, 0xa0, 0x1d, 0x1c, 0x8a, 0x2c, 0x36, 0xe2,
-                0x1a, 0x22, 0x6b, 0x12, 0xb2, 0xf6, 0x56, 0xfc, 0xcc, 0x0e, 0x9c, 0x43, 0x22, 0x27,
-                0x69, 0x31, 0x09, 0x91,
+                0x0c, 0x40, 0xa2, 0x9b, 0xdb, 0xe3, 0xe4, 0x5d, 0x2c, 0xb7, 0xc1, 0x41, 0xed, 0xe0,
+                0xce, 0x2c, 0xe9, 0x2c, 0xa6, 0xbf, 0x9f, 0x6b, 0xc0, 0x42, 0xb0, 0xe7, 0x25, 0x24,
+                0xf4, 0x19, 0x5c, 0xa6,
             ],
             nk: [
-                0x64, 0x02, 0x41, 0x63, 0x14, 0x5b, 0x68, 0x66, 0x8d, 0x1c, 0x3f, 0x9c, 0x0f, 0x76,
-                0xd3, 0x92, 0xd3, 0x71, 0x8f, 0x01, 0x75, 0x18, 0x1b, 0xa1, 0x4a, 0x0f, 0xc9, 0x5b,
-                0x7f, 0xec, 0x65, 0x35,
+                0x2c, 0x5c, 0xc2, 0x37, 0x14, 0xa6, 0x22, 0xa0, 0xb9, 0xe2, 0x0a, 0x1f, 0x0f, 0x23,
+                0x07, 0x26, 0x90, 0xd3, 0x4e, 0x1e, 0xd2, 0x75, 0xfd, 0x22, 0x9b, 0xca, 0x65, 0x46,
+                0x96, 0x5c, 0xf6, 0x3d,
             ],
             rivk: [
-                0x4a, 0x61, 0xd4, 0x32, 0x0d, 0x12, 0xdd, 0x47, 0xa6, 0xc2, 0x2d, 0x00, 0xd8, 0xb0,
-                0x52, 0xb4, 0x83, 0xd0, 0x40, 0xda, 0xd3, 0x79, 0xbb, 0x29, 0x0b, 0x40, 0xd5, 0x0d,
-                0x36, 0x71, 0xcd, 0x0c,
+                0x7e, 0x13, 0x20, 0x87, 0x56, 0x5e, 0xe9, 0xc5, 0x5b, 0x6d, 0x6f, 0xea, 0x16, 0xba,
+                0xee, 0xdc, 0xfb, 0x61, 0xa6, 0xed, 0xc3, 0xce, 0xc3, 0xb0, 0x5a, 0x96, 0x0d, 0x20,
+                0x1d, 0xd1, 0xa4, 0x2a,
             ],
             ivk: [
-                0x2c, 0x2b, 0x90, 0xc8, 0x3c, 0x30, 0xc2, 0x71, 0x64, 0xce, 0x4d, 0xd9, 0x14, 0xe6,
-                0xb8, 0x9e, 0x99, 0x50, 0xe4, 0xf9, 0xa7, 0xa2, 0x4a, 0xfb, 0xcf, 0x11, 0xfe, 0x0d,
-                0x86, 0xb1, 0x36, 0x1d,
+                0x4d, 0x73, 0x82, 0x9c, 0x52, 0x03, 0x47, 0x9f, 0x58, 0x44, 0xf8, 0xa5, 0x8f, 0x3c,
+                0xef, 0xa9, 0xde, 0x8e, 0xaa, 0x95, 0xfa, 0x84, 0x22, 0x7b, 0xf7, 0xa8, 0xed, 0x69,
+                0x08, 0xb3, 0xb7, 0x35,
             ],
             ovk: [
-                0x30, 0xe0, 0xa4, 0x48, 0xa6, 0x1e, 0x75, 0xa2, 0x5b, 0xd5, 0x89, 0x61, 0x12, 0x5a,
-                0x8e, 0xae, 0x84, 0x45, 0x24, 0xde, 0x0d, 0x91, 0x22, 0xa1, 0x2a, 0x4d, 0x59, 0x6c,
-                0xfe, 0xdf, 0xab, 0xc1,
+                0xde, 0xf9, 0x9b, 0x97, 0x9d, 0xb5, 0x59, 0x7b, 0x55, 0x72, 0xa8, 0x43, 0x5b, 0x6d,
+                0x00, 0xab, 0xe1, 0xbb, 0x84, 0x74, 0x67, 0xf3, 0x3c, 0xcb, 0x0b, 0x9d, 0x0c, 0xa3,
+                0xdd, 0x11, 0xee, 0xa6,
             ],
             dk: [
-                0x33, 0xe4, 0x2c, 0x50, 0xa6, 0x37, 0xe9, 0xdb, 0x68, 0xbe, 0x33, 0x11, 0xbf, 0x5d,
-                0x7f, 0xc4, 0x77, 0x4b, 0xe6, 0x19, 0x26, 0xc8, 0x7e, 0xe4, 0xc7, 0xef, 0x36, 0xf1,
-                0x87, 0xbb, 0x8c, 0xea,
+                0xb0, 0x84, 0xe4, 0x86, 0x25, 0x45, 0x43, 0x7e, 0x11, 0x7e, 0x7a, 0x7b, 0xa9, 0x67,
+                0xa3, 0xfd, 0xa7, 0x2e, 0x9b, 0x0a, 0x1d, 0x82, 0x9a, 0xaa, 0x6d, 0x63, 0x8b, 0xb5,
+                0x22, 0x1a, 0xe9, 0x41,
             ],
             default_d: [
-                0xc8, 0xa8, 0x3e, 0x75, 0xb1, 0x29, 0x1e, 0x29, 0x59, 0x00, 0xa5,
+                0xda, 0x61, 0x78, 0xe2, 0x65, 0xc7, 0xbc, 0xe8, 0x7d, 0x3e, 0xca,
             ],
             default_pk_d: [
-                0xc5, 0xc1, 0x1c, 0x61, 0x37, 0xce, 0x83, 0x92, 0x69, 0xee, 0x46, 0xc7, 0x97, 0xeb,
-                0xc4, 0x6c, 0x10, 0x53, 0x1c, 0x11, 0xc7, 0x51, 0xa7, 0xda, 0xab, 0xa6, 0x62, 0x2a,
-                0x43, 0xe5, 0xaf, 0x35,
+                0x14, 0xba, 0x11, 0x2b, 0x9e, 0xb9, 0xa8, 0xb8, 0x48, 0x55, 0x52, 0xbf, 0xf6, 0x77,
+                0x36, 0x4c, 0x8b, 0x8d, 0x37, 0x2c, 0xc2, 0x98, 0x96, 0x00, 0xe9, 0x8a, 0x53, 0xa6,
+                0xbe, 0xd1, 0xdc, 0x3a,
             ],
             internal_rivk: [
-                0x69, 0xa9, 0x4e, 0x8c, 0x99, 0x82, 0x59, 0xfe, 0x6e, 0x54, 0x6c, 0x83, 0x32, 0x8b,
-                0x72, 0xf6, 0xf8, 0x3e, 0x80, 0x11, 0x70, 0x6a, 0x5e, 0x31, 0xc2, 0x0c, 0xf8, 0x85,
-                0x1e, 0x13, 0x94, 0x37,
+                0xab, 0x1b, 0x90, 0x4f, 0xb6, 0x34, 0x09, 0x39, 0x84, 0xbf, 0x42, 0x9f, 0xeb, 0x53,
+                0x3f, 0x22, 0x5d, 0xa0, 0xad, 0x22, 0xb8, 0x85, 0x64, 0x4f, 0x0b, 0xec, 0x49, 0x2e,
+                0xc6, 0x3f, 0x48, 0x18,
             ],
             internal_ivk: [
-                0x14, 0xb4, 0xf4, 0x27, 0xd3, 0x39, 0xd1, 0xba, 0x26, 0xae, 0xcd, 0x57, 0x6f, 0x65,
-                0x60, 0x9f, 0x18, 0xd9, 0xfc, 0x35, 0xb5, 0xf6, 0xdb, 0x5a, 0xf4, 0xc2, 0xa4, 0x32,
-                0x09, 0x5b, 0x88, 0x28,
+                0x70, 0xf2, 0x2d, 0x49, 0x0e, 0x62, 0xb3, 0x3e, 0x39, 0xa9, 0xfe, 0x06, 0x50, 0xa6,
+                0x0e, 0x09, 0x13, 0x1d, 0x77, 0xd9, 0xb9, 0x4a, 0x61, 0x52, 0xc1, 0x63, 0x9d, 0xa6,
+                0xe7, 0xaa, 0x01, 0x1c,
             ],
             internal_ovk: [
-                0x01, 0xdb, 0x0e, 0x1d, 0x57, 0x47, 0x62, 0xfd, 0xf3, 0x18, 0xa4, 0xf0, 0x48, 0x57,
-                0xcf, 0x3b, 0x35, 0x7e, 0xeb, 0xd7, 0xad, 0x92, 0x9e, 0xb9, 0xf8, 0xf1, 0x37, 0x33,
-                0xda, 0x8f, 0x2d, 0x69,
+                0x73, 0xa9, 0x08, 0x2e, 0x80, 0xd8, 0x5e, 0x44, 0x58, 0x54, 0xef, 0xb4, 0xdf, 0x15,
+                0x89, 0xcf, 0xbf, 0x72, 0x5b, 0xe3, 0xf7, 0xa7, 0x77, 0xb6, 0xa5, 0x1a, 0x35, 0xea,
+                0x5d, 0x74, 0xc3, 0xd9,
             ],
             internal_dk: [
-                0xf7, 0x6c, 0xb8, 0x2a, 0x6f, 0xe2, 0x49, 0xaf, 0xda, 0x87, 0xa7, 0xb5, 0xd8, 0xf7,
-                0x7c, 0x4f, 0xba, 0x4d, 0x62, 0x73, 0xd8, 0x0e, 0xe4, 0x5a, 0x3d, 0xd5, 0xb6, 0x37,
-                0xa4, 0x30, 0x5f, 0xdb,
+                0x3f, 0x4b, 0xa3, 0xf2, 0x3c, 0x10, 0x3e, 0x92, 0x3e, 0x39, 0x26, 0xd0, 0x9d, 0xc0,
+                0x10, 0xab, 0x08, 0xb3, 0x9c, 0x90, 0x8a, 0x61, 0x89, 0x7f, 0xa1, 0x27, 0x27, 0xa2,
+                0x0b, 0xd6, 0x27, 0xbd,
             ],
             asset: [
-                0x57, 0xf4, 0xb4, 0x5d, 0x64, 0x19, 0xf0, 0xd2, 0xe2, 0xc5, 0xaf, 0x33, 0xae, 0x24,
-                0x37, 0x85, 0xb3, 0x25, 0xcd, 0xab, 0x95, 0x40, 0x4f, 0xc7, 0xae, 0xd7, 0x05, 0x25,
-                0xcd, 0xdb, 0x41, 0x87,
+                0x88, 0xfd, 0x28, 0x59, 0x36, 0x2b, 0x18, 0x2f, 0x20, 0x7b, 0x31, 0x75, 0x96, 0x1f,
+                0x64, 0x11, 0xa4, 0x93, 0xbf, 0xfd, 0x04, 0x8e, 0x7d, 0x0d, 0x87, 0xd8, 0x2f, 0xe6,
+                0xf9, 0x90, 0xa2, 0xb0,
             ],
-            note_v: 3250512694054592767,
+            note_v: 1850337920518955814,
             note_rho: [
-                0xbd, 0xf9, 0x55, 0x59, 0x48, 0xcb, 0xd5, 0xa3, 0x32, 0xd0, 0x45, 0xde, 0x6b, 0xa6,
-                0xbf, 0x44, 0x90, 0xad, 0xfe, 0x74, 0x44, 0xcd, 0x46, 0x7a, 0x09, 0x07, 0x54, 0x17,
-                0xfc, 0xc0, 0x06, 0x2e,
+                0x1e, 0x11, 0xbc, 0x33, 0xab, 0x75, 0xdd, 0x6c, 0xa0, 0x67, 0xfb, 0x73, 0xa0, 0x43,
+                0xb6, 0x46, 0xa7, 0xcf, 0x39, 0xca, 0xb4, 0x92, 0x83, 0x86, 0x78, 0x6d, 0x2f, 0x24,
+                0x14, 0x1e, 0xe1, 0x20,
             ],
             note_rseed: [
-                0x49, 0xf0, 0x08, 0xc5, 0x1a, 0xd4, 0x22, 0x74, 0x39, 0xc1, 0xb4, 0x47, 0x6c, 0xcd,
-                0x8e, 0x97, 0x86, 0x2d, 0xab, 0x7b, 0xe1, 0xe8, 0xd3, 0x99, 0xc0, 0x5e, 0xf2, 0x7c,
-                0x6e, 0x22, 0xee, 0x27,
+                0xfd, 0xc3, 0x4d, 0x67, 0x64, 0xea, 0xfc, 0x66, 0x88, 0x0e, 0xe0, 0x20, 0x4f, 0x53,
+                0xcc, 0x11, 0x67, 0xed, 0x20, 0xb4, 0x3a, 0x52, 0xde, 0xa3, 0xca, 0x7c, 0xff, 0x8e,
+                0xf3, 0x5c, 0xd8, 0xe6,
             ],
             note_cmx: [
-                0x83, 0xc0, 0x41, 0xba, 0x80, 0x64, 0x27, 0x9b, 0x24, 0x02, 0xae, 0x1e, 0x60, 0x30,
-                0xcb, 0x89, 0xc5, 0x0d, 0x96, 0x6e, 0x03, 0x93, 0x73, 0x5c, 0x45, 0x81, 0xd4, 0x98,
-                0x11, 0x38, 0x8d, 0x01,
+                0x2d, 0x50, 0xf6, 0x82, 0x85, 0x0c, 0x72, 0x2b, 0x5f, 0x26, 0x15, 0x7e, 0x9c, 0xe8,
+                0x4d, 0x12, 0x63, 0x3c, 0xc1, 0x93, 0x02, 0x5e, 0x13, 0x0c, 0x0f, 0xf5, 0xf0, 0xde,
+                0xf6, 0x8d, 0x84, 0x21,
             ],
             note_nf: [
-                0x1c, 0xe7, 0x2d, 0x48, 0x1c, 0xd5, 0x9e, 0x6c, 0x89, 0x5d, 0x2c, 0x65, 0x85, 0xe9,
-                0x77, 0x27, 0x9d, 0x99, 0x27, 0x2e, 0x66, 0xa6, 0xda, 0xa4, 0x74, 0x20, 0xed, 0xbb,
-                0xa7, 0xf8, 0x9f, 0x27,
+                0xc7, 0x87, 0x80, 0x17, 0xd9, 0x2f, 0x36, 0xe3, 0xae, 0x78, 0x60, 0xeb, 0x0a, 0x8c,
+                0x32, 0x3b, 0xa7, 0x4b, 0x23, 0xa7, 0x04, 0x48, 0x97, 0x84, 0x11, 0x77, 0xa6, 0x4d,
+                0x50, 0x8a, 0x67, 0x20,
             ],
         },
         TestVector {
             sk: [
-                0x3e, 0x15, 0x78, 0x6e, 0x39, 0x4c, 0x8f, 0x1b, 0xe3, 0x16, 0x82, 0xa3, 0x01, 0x47,
-                0x96, 0x3a, 0xc8, 0xda, 0x8d, 0x41, 0xd8, 0x04, 0x25, 0x84, 0x26, 0xa3, 0xf7, 0x02,
-                0x89, 0xb8, 0xad, 0x19,
+                0xa2, 0x5f, 0x5a, 0xa0, 0x11, 0x1a, 0x6e, 0x68, 0xf3, 0x7b, 0xf6, 0xf3, 0xac, 0x2d,
+                0x26, 0xb8, 0x46, 0x86, 0xe5, 0x69, 0xd5, 0x8d, 0x99, 0xc1, 0x38, 0x35, 0x97, 0xfa,
+                0xd8, 0x11, 0x93, 0xc4,
             ],
             ask: [
-                0xd4, 0x21, 0xad, 0x5b, 0x18, 0x0c, 0x34, 0x4b, 0x93, 0xb4, 0xcf, 0x3c, 0xe9, 0x55,
-                0x49, 0x1e, 0x00, 0x58, 0x45, 0xd9, 0x2e, 0x6f, 0xd6, 0xe9, 0xeb, 0x27, 0x6d, 0xfd,
-                0xe6, 0xea, 0x89, 0x0c,
+                0x91, 0xcb, 0x55, 0x3a, 0x4b, 0xfd, 0x80, 0xa0, 0x65, 0xbc, 0x32, 0xca, 0x6f, 0x8a,
+                0x5d, 0xe1, 0xd7, 0x15, 0x99, 0xdb, 0x52, 0x7d, 0xb7, 0x04, 0x30, 0xee, 0x81, 0xc2,
+                0x1e, 0x29, 0x05, 0x1a,
             ],
             ak: [
-                0x91, 0x34, 0xed, 0x63, 0xae, 0xe1, 0x94, 0xb4, 0xb5, 0x58, 0xf5, 0xf6, 0x55, 0xba,
-                0xb5, 0x39, 0x39, 0x6b, 0x99, 0x67, 0x8e, 0xf9, 0x1f, 0x44, 0x5b, 0x51, 0x7c, 0x79,
-                0xc5, 0x82, 0x18, 0x0e,
+                0xf6, 0x5c, 0x7d, 0xf2, 0x87, 0x16, 0x69, 0xbd, 0x0d, 0x82, 0xaa, 0xfe, 0x1f, 0x89,
+                0xfe, 0xfd, 0xaf, 0xd6, 0x28, 0x17, 0x65, 0x3c, 0x38, 0xc2, 0x4a, 0xda, 0xe0, 0xfc,
+                0x62, 0xe0, 0xc0, 0x0f,
             ],
             isk: [
-                0xd8, 0xde, 0x13, 0xbe, 0x4e, 0xeb, 0xe3, 0xbd, 0x4c, 0x8a, 0x6f, 0x55, 0xd6, 0xe0,
-                0xc3, 0x73, 0xd4, 0x56, 0x85, 0x18, 0x79, 0xf5, 0xfb, 0xc2, 0x82, 0xdb, 0x9e, 0x13,
-                0x48, 0x06, 0xbf, 0xf7,
+                0x90, 0x3f, 0x5d, 0x98, 0x48, 0xf1, 0x4f, 0xcb, 0xeb, 0x18, 0x37, 0x57, 0x0f, 0x54,
+                0x4d, 0x63, 0x59, 0xeb, 0x23, 0xfa, 0xf3, 0x8a, 0x08, 0x22, 0xda, 0x36, 0xce, 0x42,
+                0x6c, 0x4a, 0x2f, 0xbe,
             ],
             ik: [
-                0xb7, 0x47, 0x4b, 0x65, 0x52, 0xdf, 0xc5, 0xe1, 0xe2, 0x57, 0xca, 0xbf, 0xee, 0x40,
-                0xe6, 0x08, 0x85, 0x7a, 0x2f, 0xbd, 0x48, 0xfd, 0xa6, 0x6e, 0x9c, 0x71, 0x31, 0x17,
-                0x11, 0x58, 0x24, 0xa8,
+                0x6c, 0xc4, 0x46, 0x5c, 0x0a, 0x64, 0xa5, 0xec, 0x41, 0x96, 0x8a, 0x80, 0x9f, 0x71,
+                0x3d, 0xf6, 0xf3, 0x45, 0x1c, 0x5e, 0xec, 0xff, 0xf5, 0x31, 0x7a, 0x21, 0x0c, 0xc7,
+                0xc8, 0x50, 0xbd, 0x51,
             ],
             nk: [
-                0x1b, 0x7d, 0x9f, 0x63, 0x24, 0x9b, 0x96, 0xe7, 0xde, 0x1e, 0xe9, 0xfc, 0xf9, 0x3b,
-                0xbd, 0xa4, 0xeb, 0xe7, 0xe8, 0xe4, 0xc2, 0x1a, 0x6f, 0xe4, 0x24, 0xe9, 0x0b, 0x1d,
-                0x72, 0x4f, 0x58, 0x39,
+                0x5c, 0x39, 0x80, 0xe1, 0x5d, 0xba, 0xd3, 0x67, 0xf4, 0xa1, 0xd3, 0x89, 0x15, 0x78,
+                0x30, 0x61, 0xe2, 0x87, 0x98, 0x17, 0x3f, 0x14, 0x7f, 0xaf, 0xb4, 0xcb, 0x2c, 0x6d,
+                0x1f, 0x44, 0xc0, 0x06,
             ],
             rivk: [
-                0x60, 0x2b, 0x39, 0xb7, 0xca, 0xff, 0x4e, 0x65, 0x6d, 0x1e, 0x2e, 0x50, 0x87, 0xbf,
-                0x19, 0xec, 0x40, 0x93, 0x92, 0x5b, 0x99, 0x36, 0xb2, 0x72, 0x70, 0x74, 0x8e, 0x1b,
-                0x16, 0xe0, 0x2f, 0x05,
+                0x1c, 0x91, 0x40, 0xc9, 0x47, 0x8f, 0x3a, 0x2b, 0xaf, 0xa6, 0x69, 0x0a, 0xbc, 0x5d,
+                0x9e, 0x0d, 0x5e, 0x06, 0x01, 0xb3, 0x89, 0x4d, 0xb8, 0x3a, 0xb9, 0x9e, 0xe7, 0xe8,
+                0x66, 0x4e, 0xab, 0x13,
             ],
             ivk: [
-                0x5c, 0xb0, 0x1e, 0x28, 0x3d, 0x8b, 0x9e, 0xb1, 0x39, 0xe7, 0x4d, 0x4a, 0x72, 0xca,
-                0x45, 0x14, 0x6b, 0xa7, 0xdd, 0x5e, 0x33, 0xe2, 0x79, 0xd3, 0x59, 0xd0, 0xc2, 0x75,
-                0x01, 0x5a, 0xc1, 0x18,
+                0xcd, 0xdb, 0xbc, 0xe7, 0xf9, 0x62, 0x50, 0x76, 0x5a, 0x84, 0x60, 0xbb, 0x7a, 0xf1,
+                0xa6, 0x4f, 0x2b, 0x9e, 0x9e, 0x62, 0x37, 0x67, 0x28, 0x0e, 0x41, 0x0f, 0x80, 0x1a,
+                0xa8, 0x67, 0x81, 0x38,
             ],
             ovk: [
-                0x92, 0x13, 0x53, 0x2c, 0x80, 0xac, 0x0c, 0x31, 0x00, 0x1c, 0x08, 0x29, 0x67, 0x89,
-                0x8c, 0xe1, 0x5e, 0xc6, 0x7e, 0xd5, 0xe6, 0x89, 0x65, 0x34, 0xb3, 0x3f, 0xc3, 0x4a,
-                0x80, 0xda, 0x82, 0x83,
+                0x6f, 0x31, 0x6e, 0x8e, 0x63, 0x21, 0x24, 0xdb, 0xf8, 0x99, 0x27, 0x54, 0x40, 0xea,
+                0x2e, 0xb0, 0x5a, 0xb2, 0x07, 0xc1, 0x85, 0x06, 0x99, 0xf8, 0xe7, 0x9a, 0x3f, 0xa2,
+                0x2d, 0x62, 0x9f, 0xc1,
             ],
             dk: [
-                0x54, 0x72, 0xf9, 0x27, 0x27, 0x9e, 0xd7, 0xce, 0xc0, 0x9e, 0x60, 0xe7, 0x13, 0xd9,
-                0xaf, 0x82, 0xe6, 0x79, 0x6f, 0x60, 0x9b, 0x83, 0xe7, 0xff, 0xdf, 0x2e, 0xbf, 0x16,
-                0x4a, 0xd8, 0xa2, 0xb6,
+                0x48, 0x4d, 0xee, 0x22, 0x4f, 0xff, 0x5d, 0x93, 0xcf, 0x60, 0x47, 0x1c, 0xc3, 0x59,
+                0xd0, 0x11, 0xb2, 0x25, 0x09, 0x34, 0x6d, 0x24, 0xc5, 0x24, 0x19, 0xae, 0x8e, 0x59,
+                0x4f, 0x6b, 0x69, 0x51,
             ],
             default_d: [
-                0xac, 0xfb, 0x8d, 0xbc, 0x78, 0x27, 0x95, 0xb0, 0x21, 0xa1, 0xaf,
+                0xd9, 0xf7, 0x9c, 0xe9, 0xb0, 0xd6, 0x41, 0x19, 0x27, 0x1b, 0xe0,
             ],
             default_pk_d: [
-                0x5c, 0x9e, 0xac, 0x4a, 0x26, 0x36, 0xef, 0x27, 0x0b, 0xd8, 0x98, 0x6b, 0x72, 0xb7,
-                0x01, 0x45, 0x5d, 0x40, 0x14, 0xbb, 0x83, 0xe8, 0x31, 0xa7, 0x04, 0x01, 0x75, 0x3d,
-                0xc7, 0xf5, 0x58, 0x3b,
+                0x98, 0x58, 0xd5, 0x94, 0x2c, 0x7d, 0xea, 0xef, 0xf9, 0xc5, 0x41, 0xd5, 0x0f, 0x18,
+                0x10, 0x66, 0xc5, 0x57, 0xe6, 0xc7, 0xdc, 0xf0, 0x5b, 0x31, 0x25, 0xc7, 0xcd, 0x3a,
+                0x67, 0x67, 0x3e, 0xbd,
             ],
             internal_rivk: [
-                0x52, 0x22, 0xd7, 0x35, 0x07, 0x6e, 0x53, 0x15, 0x2a, 0x3d, 0x00, 0x33, 0x19, 0x6e,
-                0xe7, 0x3c, 0x7f, 0x6b, 0xf6, 0x08, 0xce, 0x1a, 0x7d, 0x54, 0xac, 0xfc, 0x04, 0x54,
-                0x91, 0x87, 0xe7, 0x02,
+                0xe6, 0xff, 0x0f, 0xd9, 0xbf, 0xb9, 0xf8, 0x44, 0x9c, 0xa3, 0xf2, 0x76, 0x9b, 0x9d,
+                0x32, 0x46, 0xd9, 0x6b, 0xd8, 0x1b, 0x57, 0xa4, 0xef, 0xaf, 0x78, 0xce, 0x77, 0xee,
+                0xd5, 0x8d, 0x9c, 0x31,
             ],
             internal_ivk: [
-                0x44, 0xff, 0x25, 0xf6, 0xbd, 0x3e, 0xfc, 0xc1, 0x4a, 0x12, 0xdb, 0x7e, 0x2d, 0x2a,
-                0xdd, 0xce, 0xe4, 0x84, 0x86, 0x22, 0xa9, 0x98, 0xb7, 0x83, 0x60, 0x88, 0x78, 0x36,
-                0x0a, 0xb8, 0xd7, 0x24,
+                0xd6, 0x50, 0xa5, 0x8d, 0xcb, 0x1f, 0x01, 0x53, 0x7e, 0x64, 0x81, 0xa1, 0x9b, 0xc6,
+                0x84, 0x65, 0xa2, 0xd3, 0x70, 0x13, 0xb2, 0xc3, 0xd6, 0x33, 0x77, 0x19, 0xd1, 0x8c,
+                0xc0, 0xa7, 0x87, 0x38,
             ],
             internal_ovk: [
-                0x21, 0x1d, 0x5c, 0x4e, 0x72, 0x3f, 0x62, 0xfc, 0xdd, 0x7f, 0x90, 0xe9, 0x54, 0xd1,
-                0xba, 0x14, 0xe5, 0x9f, 0xb6, 0x0c, 0xdd, 0x7e, 0x44, 0xb7, 0xb9, 0x4a, 0x58, 0xcc,
-                0x48, 0xfa, 0x96, 0x67,
+                0x0f, 0x03, 0xa8, 0xda, 0x4c, 0x6a, 0x0a, 0x3a, 0xe6, 0xd2, 0x18, 0xf0, 0x36, 0xce,
+                0x95, 0x33, 0x24, 0x13, 0xe3, 0x4e, 0x31, 0x92, 0xfd, 0xe2, 0x99, 0x03, 0x34, 0x63,
+                0x21, 0x15, 0xd7, 0x8b,
             ],
             internal_dk: [
-                0xa6, 0xc2, 0x25, 0xd5, 0xac, 0xd0, 0x8e, 0x27, 0xb9, 0x46, 0x80, 0x71, 0x19, 0xc5,
-                0xb0, 0x46, 0xb6, 0x97, 0x5c, 0xb1, 0xa0, 0x3a, 0xac, 0xf0, 0x89, 0x76, 0x39, 0xb0,
-                0x65, 0x4c, 0x7e, 0x20,
+                0x06, 0x14, 0x5a, 0x2e, 0xe8, 0xbb, 0xe0, 0x91, 0x31, 0xce, 0x4b, 0xfe, 0x10, 0x53,
+                0x23, 0x9c, 0x1b, 0xbf, 0xb3, 0xec, 0xb1, 0x4f, 0x73, 0xa8, 0x4b, 0x8f, 0x11, 0xf2,
+                0x39, 0x4f, 0xac, 0xc9,
             ],
             asset: [
-                0x0c, 0x15, 0x13, 0xad, 0x47, 0xca, 0x61, 0xc6, 0x59, 0xcc, 0x5d, 0x32, 0x5b, 0x44,
-                0x0f, 0x6b, 0x9f, 0x59, 0xaf, 0xf6, 0x68, 0x79, 0xbb, 0x66, 0x88, 0xfd, 0x28, 0x59,
-                0x36, 0x2b, 0x18, 0x2f,
+                0xff, 0xeb, 0x0a, 0x8a, 0x2e, 0x29, 0x7a, 0x9d, 0x19, 0xba, 0x15, 0x02, 0x45, 0x90,
+                0xe3, 0x32, 0x9d, 0x9f, 0xa9, 0x26, 0x1f, 0x99, 0x38, 0xa4, 0x03, 0x2d, 0xd3, 0x46,
+                0x06, 0xc9, 0xcf, 0x9f,
             ],
-            note_v: 7844555504117092638,
+            note_v: 564606438193672641,
             note_rho: [
-                0xf3, 0x7b, 0xf6, 0xf3, 0xac, 0x2d, 0x26, 0xb8, 0x46, 0x86, 0xe5, 0x69, 0xd5, 0x8d,
-                0x99, 0xc1, 0x38, 0x35, 0x97, 0xfa, 0xd8, 0x11, 0x93, 0xc4, 0xc1, 0xb1, 0x6e, 0x6a,
-                0x90, 0xe2, 0xd5, 0x07,
+                0x58, 0x6f, 0x69, 0x17, 0x34, 0x46, 0xd8, 0xe4, 0x8b, 0xf8, 0x4c, 0xbc, 0x00, 0x0a,
+                0x80, 0x78, 0x99, 0x97, 0x3e, 0xb9, 0x3c, 0x5e, 0x81, 0x9a, 0xad, 0x66, 0x94, 0x13,
+                0xf8, 0x38, 0x79, 0x33,
             ],
             note_rseed: [
-                0xcd, 0xfe, 0x6f, 0xbd, 0xaa, 0x86, 0x16, 0x3e, 0x9c, 0xf5, 0xde, 0x31, 0x00, 0xfb,
-                0xca, 0x7e, 0x8d, 0xa0, 0x47, 0xb0, 0x90, 0xdb, 0x9f, 0x37, 0x95, 0x2f, 0xbf, 0xee,
-                0x76, 0xaf, 0x61, 0x66,
+                0xad, 0x15, 0x84, 0xaa, 0x35, 0xe4, 0x3f, 0x4e, 0xcd, 0x1e, 0x2d, 0x04, 0x07, 0xc0,
+                0xb1, 0xb8, 0x99, 0x20, 0xff, 0xdf, 0xdb, 0x9b, 0xea, 0x51, 0xac, 0x95, 0xb5, 0x57,
+                0xaf, 0x71, 0xb8, 0x9f,
             ],
             note_cmx: [
-                0x2e, 0xc3, 0xc2, 0x5f, 0xed, 0x4b, 0x55, 0xf2, 0x3a, 0xef, 0xd4, 0x2a, 0x69, 0x61,
-                0x59, 0x72, 0x69, 0x87, 0x74, 0xe6, 0x6c, 0xe2, 0x7f, 0x1b, 0x25, 0x6a, 0xce, 0x16,
-                0x51, 0x7f, 0xc0, 0x3c,
+                0x6c, 0x90, 0x39, 0xd8, 0xb1, 0x63, 0x00, 0x14, 0x9e, 0xe7, 0x27, 0x3e, 0x5e, 0xef,
+                0x5e, 0xdb, 0x90, 0x87, 0xd8, 0x6c, 0x11, 0xfa, 0xf7, 0xab, 0xaf, 0xcd, 0x21, 0xad,
+                0x0a, 0x76, 0xf8, 0x11,
             ],
             note_nf: [
-                0xaf, 0x67, 0xf7, 0xdf, 0x55, 0x93, 0xc3, 0x90, 0x80, 0x60, 0xb0, 0x50, 0x35, 0x96,
-                0xef, 0x32, 0x0b, 0xad, 0x21, 0x30, 0x20, 0xa8, 0x44, 0x7b, 0x69, 0x38, 0x81, 0xf2,
-                0xfd, 0x35, 0x9f, 0x11,
+                0x20, 0xc9, 0x4a, 0x43, 0xa7, 0xcf, 0xdc, 0x63, 0xd7, 0x07, 0x01, 0xf5, 0xad, 0xcc,
+                0x79, 0x5a, 0x31, 0x08, 0x7d, 0x5e, 0xc3, 0x9a, 0x73, 0x6f, 0x81, 0xd8, 0x6e, 0x84,
+                0x9a, 0xb2, 0xd6, 0x3b,
             ],
         },
     ]
diff --git a/src/test_vectors/note_encryption_vanilla.rs b/src/test_vectors/note_encryption_vanilla.rs
index 3011538f6..72e88042c 100644
--- a/src/test_vectors/note_encryption_vanilla.rs
+++ b/src/test_vectors/note_encryption_vanilla.rs
@@ -96,36 +96,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x42, 0xc2, 0x38, 0x51, 0x38, 0x15, 0x30, 0x2d, 0xf0, 0xf4, 0x83, 0x04, 0x21, 0xa6,
                 0xc1, 0x3e, 0x71, 0x01,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0xc5, 0x96, 0xfb, 0xd3, 0x2e, 0xbb, 0xcb, 0xad, 0xae, 0x60, 0xd2, 0x85, 0xc7, 0xd7,
-                0x5f, 0xa8, 0x36, 0xf9, 0xd2, 0xfa, 0x86, 0x10, 0x0a, 0xb8, 0x58, 0xea, 0x2d, 0xe1,
-                0xf1, 0x1c, 0x83, 0x06,
+                0xca, 0x1f, 0xeb, 0x30, 0xca, 0x11, 0x17, 0x76, 0xc0, 0x41, 0x74, 0x66, 0xbd, 0x69,
+                0xb3, 0xd2, 0x13, 0x88, 0x2e, 0xef, 0x55, 0xe6, 0x0b, 0x6d, 0x9e, 0x2a, 0x98, 0xe7,
+                0x05, 0xee, 0xf3, 0x27,
             ],
             cmx: [
-                0xa5, 0x70, 0x6f, 0x3d, 0x1b, 0x68, 0x8e, 0x9d, 0xc6, 0x34, 0xee, 0xe4, 0xe6, 0x5b,
-                0x02, 0x8a, 0x43, 0xee, 0xae, 0xd2, 0x43, 0x5b, 0xea, 0x2a, 0xe3, 0xd5, 0x16, 0x05,
-                0x75, 0xc1, 0x1a, 0x3b,
+                0x23, 0x75, 0x7c, 0x51, 0x58, 0x21, 0xcb, 0xc1, 0x84, 0x3c, 0x9a, 0x45, 0x7b, 0x7e,
+                0x6a, 0xe6, 0x01, 0xad, 0xd2, 0xea, 0x10, 0xb9, 0xc8, 0x6d, 0x6b, 0x31, 0x7c, 0xe2,
+                0xf1, 0x7b, 0xd9, 0x21,
             ],
             esk: [
-                0x56, 0x66, 0x9d, 0x64, 0x3f, 0x78, 0x0b, 0x6a, 0xd8, 0xb3, 0xd3, 0x5a, 0xd7, 0x46,
-                0x8a, 0xaa, 0x73, 0x27, 0x66, 0x57, 0x5f, 0x84, 0xa9, 0x5d, 0x20, 0xa6, 0x25, 0xff,
-                0x38, 0x77, 0xea, 0x3f,
+                0x5b, 0xfe, 0x46, 0x9c, 0x33, 0xe4, 0x47, 0xba, 0x45, 0x6b, 0x8b, 0xfe, 0x9b, 0x38,
+                0x5b, 0x39, 0x31, 0xb4, 0xba, 0xeb, 0x8f, 0x70, 0x23, 0xfe, 0x8e, 0x33, 0x35, 0x4f,
+                0xff, 0xf1, 0xbd, 0x1a,
             ],
             ephemeral_key: [
-                0xad, 0xdb, 0x47, 0xb6, 0xac, 0x5d, 0xfc, 0x16, 0x55, 0x89, 0x23, 0xd3, 0xa8, 0xf3,
-                0x76, 0x09, 0x5c, 0x69, 0x5c, 0x04, 0x7c, 0x4e, 0x32, 0x66, 0xae, 0x67, 0x69, 0x87,
-                0xf7, 0xe3, 0x13, 0x81,
+                0x8a, 0x5e, 0x13, 0x2c, 0x3a, 0x07, 0x04, 0xf2, 0x45, 0x6f, 0xbd, 0x77, 0x7a, 0x13,
+                0xd6, 0xec, 0x57, 0x65, 0x56, 0x71, 0xdb, 0x07, 0x2a, 0x7d, 0x27, 0x6a, 0xd9, 0x69,
+                0xf5, 0xec, 0x45, 0x17,
             ],
             shared_secret: [
-                0x30, 0x3c, 0x1c, 0x3f, 0x2b, 0xcb, 0xb9, 0xd8, 0x49, 0x70, 0x15, 0xa6, 0xdf, 0xca,
-                0x95, 0x4e, 0xce, 0x0d, 0x3b, 0x6c, 0xf1, 0x0a, 0xb9, 0xf7, 0x19, 0xeb, 0x89, 0x19,
-                0x9e, 0xdf, 0xe9, 0x89,
+                0x36, 0xd5, 0x4c, 0xab, 0xc6, 0x7f, 0x6c, 0xc7, 0x26, 0xa7, 0x30, 0xf3, 0xa0, 0xce,
+                0xed, 0x58, 0x53, 0xf0, 0x8c, 0xd3, 0x81, 0x46, 0xc8, 0x34, 0x25, 0x98, 0x98, 0x7c,
+                0x21, 0x50, 0x48, 0xa5,
             ],
             k_enc: [
-                0xef, 0x9d, 0x62, 0x25, 0x68, 0x7c, 0x2c, 0x91, 0x7b, 0x5c, 0xad, 0xa1, 0x75, 0x23,
-                0xe8, 0xfb, 0xdb, 0x08, 0x82, 0x25, 0xaf, 0x2d, 0xb5, 0x72, 0xbb, 0x40, 0x0e, 0x44,
-                0x8b, 0x5e, 0xa8, 0x71,
+                0x82, 0xc4, 0x32, 0x65, 0x33, 0x7f, 0x1a, 0xb3, 0x7b, 0x18, 0xdf, 0x27, 0x75, 0x48,
+                0x61, 0x82, 0x63, 0xb8, 0x02, 0x4d, 0x9b, 0x14, 0x5a, 0x05, 0xad, 0xe2, 0xeb, 0x54,
+                0x79, 0x18, 0x03, 0x20,
             ],
             p_enc: [
                 0x02, 0x56, 0xe8, 0x4b, 0x1a, 0xdc, 0x94, 0x23, 0xc3, 0x67, 0x6c, 0x04, 0x8d, 0x5f,
@@ -171,68 +170,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xee, 0xcc, 0x40, 0xa9,
             ],
             c_enc: [
-                0x1a, 0x9a, 0xdb, 0x14, 0x24, 0x98, 0xe3, 0xdc, 0xc7, 0x6f, 0xed, 0x77, 0x86, 0x14,
-                0xdd, 0x31, 0x6c, 0x02, 0xfb, 0xb8, 0xba, 0x92, 0x44, 0xae, 0x4c, 0x2e, 0x32, 0xa0,
-                0x7d, 0xae, 0xec, 0xa4, 0x12, 0x26, 0xb9, 0x8b, 0xfe, 0x74, 0xf9, 0xfc, 0xb2, 0x28,
-                0xcf, 0xc1, 0x00, 0xf3, 0x18, 0x0f, 0x57, 0x75, 0xec, 0xe3, 0x8b, 0xe7, 0xed, 0x45,
-                0xd9, 0x40, 0x21, 0xf4, 0x40, 0x1b, 0x2a, 0x4d, 0x75, 0x82, 0xb4, 0x28, 0xd4, 0x9e,
-                0xc7, 0xf5, 0xb5, 0xa4, 0x98, 0x97, 0x3e, 0x60, 0xe3, 0x8e, 0x74, 0xf5, 0xc3, 0xe5,
-                0x77, 0x82, 0x7c, 0x38, 0x28, 0x57, 0xd8, 0x16, 0x6b, 0x54, 0xe6, 0x4f, 0x66, 0xef,
-                0x5c, 0x7e, 0x8c, 0x9b, 0xaa, 0x2a, 0x3f, 0xa9, 0xe3, 0x7d, 0x08, 0x77, 0x17, 0xd5,
-                0xe9, 0x6b, 0xc2, 0xf7, 0x3d, 0x03, 0x14, 0x50, 0xdc, 0x24, 0x32, 0xba, 0x49, 0xd8,
-                0xb7, 0x4d, 0xb2, 0x13, 0x09, 0x9e, 0xa9, 0xba, 0x04, 0xeb, 0x63, 0xb6, 0x57, 0x4d,
-                0x46, 0xc0, 0x3c, 0xe7, 0x90, 0x0d, 0x4a, 0xc4, 0xbb, 0x18, 0x8e, 0xe9, 0x03, 0x0d,
-                0x7f, 0x69, 0xc8, 0x95, 0xa9, 0x4f, 0xc1, 0x82, 0xf2, 0x25, 0xa9, 0x4f, 0x0c, 0xde,
-                0x1b, 0x49, 0x88, 0x68, 0x71, 0xa3, 0x76, 0x34, 0x1e, 0xa9, 0x41, 0x71, 0xbe, 0xfd,
-                0x95, 0xa8, 0x30, 0xfa, 0x18, 0x40, 0x70, 0x97, 0xdc, 0xa5, 0x11, 0x02, 0x54, 0x63,
-                0xd4, 0x37, 0xe9, 0x69, 0x5c, 0xaa, 0x07, 0x9a, 0x2f, 0x68, 0xcd, 0xc7, 0xf2, 0xc1,
-                0x32, 0x67, 0xbf, 0xf4, 0x19, 0x51, 0x37, 0xfa, 0x89, 0x53, 0x25, 0x2a, 0x81, 0xb2,
-                0xaf, 0xa1, 0x58, 0x2b, 0x9b, 0xfb, 0x4a, 0xc9, 0x60, 0x37, 0xed, 0x29, 0x91, 0xd3,
-                0xcb, 0xc7, 0xd5, 0x4a, 0xff, 0x6e, 0x62, 0x1b, 0x06, 0xa7, 0xb2, 0xb9, 0xca, 0xf2,
-                0x95, 0x5e, 0xfa, 0xf4, 0xea, 0x8e, 0xfc, 0xfd, 0x02, 0x3a, 0x3c, 0x17, 0x48, 0xdf,
-                0x3c, 0xbd, 0x43, 0xe0, 0xb9, 0xa8, 0xb0, 0x94, 0x56, 0x88, 0xd5, 0x20, 0x56, 0xc1,
-                0xd1, 0x6e, 0xea, 0x37, 0xe7, 0x98, 0xba, 0x31, 0xdc, 0x3e, 0x5d, 0x49, 0x52, 0xbd,
-                0x51, 0xec, 0x76, 0x9d, 0x57, 0x88, 0xb6, 0xe3, 0x5f, 0xe9, 0x04, 0x2b, 0x95, 0xd4,
-                0xd2, 0x17, 0x81, 0x40, 0x0e, 0xaf, 0xf5, 0x86, 0x16, 0xad, 0x56, 0x27, 0x96, 0x63,
-                0x6a, 0x50, 0xb8, 0xed, 0x6c, 0x7f, 0x98, 0x1d, 0xc7, 0xba, 0x81, 0x4e, 0xff, 0x15,
-                0x2c, 0xb2, 0x28, 0xa2, 0xea, 0xd2, 0xf8, 0x32, 0x66, 0x2f, 0xa4, 0xa4, 0xa5, 0x07,
-                0x97, 0xb0, 0xf8, 0x5b, 0x62, 0xd0, 0x8b, 0x1d, 0xd2, 0xd8, 0xe4, 0x3b, 0x4a, 0x5b,
-                0xfb, 0xb1, 0x59, 0xed, 0x57, 0x8e, 0xf7, 0x47, 0x5d, 0xe0, 0xad, 0xa1, 0x3e, 0x17,
-                0xad, 0x87, 0xcc, 0x23, 0x05, 0x67, 0x2b, 0xcc, 0x55, 0xa8, 0x88, 0x13, 0x17, 0xfd,
-                0xc1, 0xbf, 0xc4, 0x59, 0xb6, 0x8b, 0x2d, 0xf7, 0x0c, 0xad, 0x37, 0x70, 0xed, 0x0f,
-                0xd0, 0x2d, 0x64, 0xb9, 0x6f, 0x2b, 0xbf, 0x6f, 0x8f, 0x63, 0x2e, 0x86, 0x6c, 0xa5,
-                0xd1, 0x96, 0xd2, 0x48, 0xad, 0x05, 0xc3, 0xde, 0x64, 0x41, 0x48, 0xa8, 0x0b, 0x51,
-                0xad, 0xa9, 0x5b, 0xd0, 0x8d, 0x73, 0xcd, 0xbb, 0x45, 0x26, 0x4f, 0x3b, 0xd1, 0x13,
-                0x83, 0x5b, 0x46, 0xf9, 0xbe, 0x7b, 0x6d, 0x23, 0xa4, 0x3b, 0xdd, 0xfe, 0x1e, 0x74,
-                0x08, 0xc9, 0x70, 0x31, 0xe1, 0xa8, 0x21, 0x4b, 0xab, 0x46, 0x39, 0x10, 0x44, 0xb7,
-                0x00, 0xd3, 0x8f, 0x51, 0x92, 0xc5, 0x7f, 0xe6, 0xf8, 0x71, 0x59, 0xb5, 0x55, 0x12,
-                0x09, 0x4e, 0x29, 0xd2, 0xce, 0xba, 0xb8, 0x68, 0xc8, 0xf1, 0xad, 0xba, 0xd5, 0x70,
-                0x77, 0xcb, 0xeb, 0x5e, 0x69, 0x65, 0x85, 0x82, 0xbf, 0x98, 0xd1, 0x9d, 0x64, 0xf4,
-                0x4b, 0x0d, 0x50, 0xc7, 0xe2, 0x20, 0x9a, 0xb3, 0xfc, 0x56, 0xb4, 0xf4, 0x09, 0x12,
-                0x3a, 0xae, 0xb0, 0x26, 0x3a, 0x22, 0x45, 0x1b, 0xc1, 0x4e, 0xd7, 0x56, 0xd0, 0x48,
-                0x38, 0x5a, 0xed, 0xbb, 0x86, 0xa8, 0x46, 0x77, 0xbb, 0x2d, 0x21, 0xc5, 0x2c, 0xc9,
-                0x49, 0x41, 0x47, 0xbf, 0x0f, 0xb1, 0x02, 0x74, 0x52, 0x82, 0x99, 0x09, 0x09, 0x72,
-                0x62, 0x28, 0x18, 0x6e, 0x02, 0xc8,
+                0x93, 0xe0, 0x48, 0x74, 0xb5, 0x83, 0x7c, 0x26, 0x1d, 0xaf, 0x1a, 0x27, 0xb7, 0x83,
+                0xec, 0x48, 0x65, 0xd3, 0xbb, 0x72, 0x8e, 0xb1, 0x61, 0xda, 0xed, 0xb8, 0x44, 0x6a,
+                0xb3, 0x8f, 0x07, 0x8e, 0xa8, 0x66, 0x2e, 0x4d, 0x2e, 0x9d, 0x00, 0xa3, 0x95, 0x27,
+                0xdc, 0xde, 0x51, 0x7a, 0xc3, 0xdb, 0xf9, 0xd2, 0x7e, 0x3c, 0x79, 0xfa, 0x88, 0x1a,
+                0xbb, 0x48, 0xb7, 0x0d, 0xbc, 0x28, 0xdd, 0xf4, 0xaf, 0x81, 0xae, 0xed, 0x2a, 0x29,
+                0x86, 0x00, 0x51, 0x08, 0x48, 0xed, 0xbd, 0xc4, 0x2e, 0x88, 0x95, 0x48, 0x70, 0xd5,
+                0xd6, 0x01, 0xcd, 0xf2, 0x90, 0x18, 0x1b, 0x53, 0x91, 0x05, 0xb9, 0xf6, 0x13, 0x86,
+                0xcb, 0x07, 0x84, 0x6b, 0xc8, 0xe3, 0x19, 0xdf, 0xab, 0x8e, 0x10, 0x97, 0x66, 0xa2,
+                0x8c, 0x1e, 0x0b, 0xbf, 0x91, 0x32, 0x02, 0xce, 0xcd, 0x1b, 0x48, 0x17, 0xa2, 0x28,
+                0x2f, 0xc2, 0x9e, 0xd4, 0x4d, 0x9b, 0x04, 0x04, 0x9d, 0xe5, 0x5a, 0xcf, 0x54, 0x99,
+                0xe5, 0xf5, 0x65, 0xd4, 0x8b, 0x8f, 0x19, 0x72, 0xc0, 0x43, 0x84, 0x77, 0x96, 0x23,
+                0x0d, 0xc6, 0x8f, 0x32, 0x57, 0xc0, 0x85, 0x29, 0x14, 0x8c, 0x8e, 0x0c, 0x32, 0x7b,
+                0x25, 0xb4, 0x59, 0x87, 0x7c, 0xde, 0xd9, 0x8f, 0xf7, 0x8e, 0x81, 0xfa, 0x69, 0x2e,
+                0x14, 0xf8, 0xfd, 0xa1, 0xfe, 0x52, 0x4f, 0xf1, 0x50, 0x18, 0x1f, 0x73, 0x6e, 0xd3,
+                0xa8, 0x8e, 0xc7, 0x89, 0xdc, 0x15, 0x95, 0x4a, 0x02, 0x63, 0x9a, 0x8a, 0x20, 0xca,
+                0x38, 0xd8, 0x99, 0xbf, 0xd1, 0xc5, 0x73, 0xb0, 0x41, 0xee, 0x7b, 0xf2, 0x2b, 0x96,
+                0x75, 0xbd, 0xa8, 0xc4, 0xb0, 0x58, 0xa0, 0x5a, 0x49, 0x33, 0x03, 0xb1, 0x1f, 0x35,
+                0x81, 0xc1, 0x9d, 0x2d, 0xa9, 0x96, 0x6a, 0x71, 0x06, 0x6e, 0xc1, 0x7d, 0xcc, 0xd3,
+                0x48, 0x20, 0x7e, 0xb3, 0x14, 0xf6, 0xcf, 0xc9, 0xd0, 0x6a, 0x62, 0x14, 0xc6, 0x72,
+                0x10, 0x97, 0xa5, 0x2e, 0x27, 0x76, 0x66, 0x7c, 0x6b, 0xe9, 0xc8, 0x86, 0x2b, 0x17,
+                0x3d, 0xb0, 0xe8, 0x04, 0xb1, 0x2c, 0xaa, 0xe9, 0xd9, 0xfa, 0x09, 0xf3, 0xf4, 0x8c,
+                0xaf, 0x4b, 0xf7, 0x56, 0xa2, 0x78, 0x95, 0x0a, 0x25, 0x4e, 0xc4, 0x14, 0x76, 0x77,
+                0xaa, 0xca, 0x21, 0x42, 0x96, 0x08, 0x1a, 0x2f, 0x62, 0x4a, 0x92, 0x78, 0x94, 0x6e,
+                0x68, 0x9d, 0xd9, 0x14, 0x02, 0x90, 0x92, 0xe7, 0xfa, 0x8f, 0xbc, 0x8a, 0x04, 0x46,
+                0x7d, 0x60, 0xed, 0xff, 0x5d, 0x97, 0xcb, 0x65, 0x09, 0xa0, 0xc7, 0x2c, 0xed, 0x77,
+                0xac, 0xa8, 0x71, 0x30, 0x8e, 0x7d, 0xe2, 0xbe, 0xb1, 0x52, 0x0a, 0x34, 0x17, 0xd7,
+                0x21, 0x3a, 0x9a, 0xbd, 0x47, 0x35, 0x8c, 0x4f, 0x32, 0x9f, 0x0f, 0x64, 0x41, 0x92,
+                0x10, 0xa9, 0x9d, 0xb2, 0xde, 0x6e, 0x6d, 0x89, 0x21, 0xb0, 0xf4, 0xf9, 0x9f, 0xd6,
+                0x45, 0xfa, 0xe0, 0xd6, 0x29, 0xce, 0x22, 0x11, 0x90, 0x5f, 0x25, 0xf4, 0x0d, 0x12,
+                0x0b, 0x63, 0x27, 0x93, 0x75, 0xb5, 0x43, 0xc3, 0x1e, 0x3b, 0x55, 0x7e, 0x57, 0xa7,
+                0xa8, 0x7c, 0x61, 0x79, 0xeb, 0xd3, 0x4f, 0x6d, 0xbb, 0x92, 0x0e, 0xc5, 0xe0, 0x5d,
+                0x6a, 0x77, 0xec, 0xdf, 0x36, 0xb4, 0x57, 0xba, 0xb4, 0x56, 0x6c, 0x40, 0x8f, 0xb5,
+                0x7d, 0xfc, 0xdd, 0xda, 0xa4, 0x2c, 0x51, 0x34, 0xaf, 0x3e, 0x97, 0x8d, 0xbf, 0xd0,
+                0xdf, 0xb0, 0xca, 0x4f, 0xfa, 0xf1, 0x65, 0x0a, 0xbe, 0xe1, 0x62, 0x5f, 0x7f, 0x4b,
+                0xf8, 0x25, 0x06, 0x01, 0x00, 0x64, 0x5b, 0x54, 0xc0, 0x04, 0x1f, 0xbf, 0xbd, 0xef,
+                0xf7, 0xb9, 0x38, 0x04, 0xe9, 0xcc, 0x0c, 0xcd, 0x6f, 0x27, 0xbe, 0x40, 0x01, 0x6c,
+                0x32, 0xd4, 0x2f, 0xe3, 0x66, 0xfa, 0xaa, 0x86, 0x87, 0xc2, 0xd1, 0x92, 0x61, 0x9f,
+                0x56, 0x5b, 0x0c, 0x70, 0xea, 0x6a, 0x3f, 0x79, 0xd5, 0x3a, 0x52, 0x41, 0xe6, 0x9c,
+                0x3c, 0xa6, 0x87, 0xa1, 0x12, 0xfb, 0x16, 0xc2, 0x5c, 0xc0, 0x83, 0x17, 0xdb, 0xa4,
+                0x23, 0x97, 0x0c, 0x32, 0xdf, 0xb4, 0xbd, 0x69, 0x22, 0xe3, 0x36, 0xab, 0xf2, 0xfd,
+                0xe2, 0xc3, 0xaa, 0x5d, 0xb2, 0x93, 0xef, 0x27, 0x47, 0x87, 0x6c, 0x8b, 0xd8, 0x6e,
+                0xa1, 0x87, 0xcb, 0x60, 0x1a, 0xf7,
             ],
             ock: [
-                0x4e, 0x9d, 0x45, 0x94, 0x6b, 0x3e, 0xea, 0xe7, 0xfe, 0x30, 0x5d, 0x5b, 0x90, 0x50,
-                0x36, 0x14, 0x1f, 0x9f, 0x40, 0x09, 0xa6, 0x29, 0x4b, 0x96, 0xc7, 0x22, 0xa4, 0xa0,
-                0xbe, 0x68, 0x5d, 0xff,
+                0xb3, 0x25, 0xeb, 0xe5, 0x7a, 0x2c, 0x40, 0xa8, 0xb2, 0x11, 0xcf, 0xdf, 0x72, 0xa1,
+                0xa2, 0x44, 0xf1, 0x53, 0x42, 0x85, 0x98, 0x88, 0xa3, 0x64, 0x52, 0x3e, 0xfd, 0x2a,
+                0xc6, 0x6a, 0x1a, 0xd6,
             ],
             op: [
                 0x63, 0xf7, 0x12, 0x5d, 0xf4, 0x83, 0x6f, 0xd2, 0x81, 0x6b, 0x02, 0x4e, 0xe7, 0x0e,
                 0xfe, 0x09, 0xfb, 0x9a, 0x7b, 0x38, 0x63, 0xc6, 0xea, 0xcd, 0xf9, 0x5e, 0x03, 0x89,
-                0x49, 0x50, 0x69, 0x2c, 0x56, 0x66, 0x9d, 0x64, 0x3f, 0x78, 0x0b, 0x6a, 0xd8, 0xb3,
-                0xd3, 0x5a, 0xd7, 0x46, 0x8a, 0xaa, 0x73, 0x27, 0x66, 0x57, 0x5f, 0x84, 0xa9, 0x5d,
-                0x20, 0xa6, 0x25, 0xff, 0x38, 0x77, 0xea, 0x3f,
+                0x49, 0x50, 0x69, 0x2c, 0x5b, 0xfe, 0x46, 0x9c, 0x33, 0xe4, 0x47, 0xba, 0x45, 0x6b,
+                0x8b, 0xfe, 0x9b, 0x38, 0x5b, 0x39, 0x31, 0xb4, 0xba, 0xeb, 0x8f, 0x70, 0x23, 0xfe,
+                0x8e, 0x33, 0x35, 0x4f, 0xff, 0xf1, 0xbd, 0x1a,
             ],
             c_out: [
-                0xcb, 0xdf, 0x68, 0xa5, 0x7f, 0xb4, 0xa4, 0x6f, 0x34, 0x60, 0xff, 0x22, 0x7b, 0xc6,
-                0x18, 0xda, 0xe1, 0x12, 0x29, 0x45, 0xb3, 0x80, 0xc7, 0xe5, 0x49, 0xcf, 0x4a, 0x6e,
-                0x8b, 0xf3, 0x75, 0x49, 0xba, 0xe1, 0x89, 0x1f, 0xd8, 0xd1, 0xa4, 0x94, 0x4f, 0xdf,
-                0x41, 0x0f, 0x07, 0x02, 0xed, 0xa5, 0x44, 0x2f, 0x0e, 0xa0, 0x1a, 0x5d, 0xf0, 0x12,
-                0xa0, 0xae, 0x4d, 0x84, 0xed, 0x79, 0x80, 0x33, 0x28, 0xbd, 0x1f, 0xd5, 0xfa, 0xc7,
-                0x19, 0x21, 0x6a, 0x77, 0x6d, 0xe6, 0x4f, 0xd1, 0x67, 0xdb,
+                0x55, 0xb8, 0x90, 0x7c, 0x6d, 0x45, 0x4b, 0x83, 0x63, 0x4f, 0x1b, 0x9a, 0x1a, 0xa3,
+                0xc3, 0xc9, 0x8a, 0xdc, 0x77, 0xd9, 0x6c, 0x2f, 0x62, 0x49, 0xec, 0x66, 0xdb, 0xae,
+                0x4d, 0x0c, 0xc9, 0x40, 0xd7, 0x26, 0xbc, 0xd1, 0xec, 0x91, 0x18, 0x9f, 0xd3, 0x04,
+                0x9a, 0x33, 0xf2, 0xea, 0x7d, 0x8b, 0x74, 0xaa, 0xc1, 0x7c, 0xda, 0x38, 0x83, 0x80,
+                0x2d, 0xb5, 0x96, 0x9d, 0x8d, 0x2f, 0x32, 0x25, 0x91, 0x9c, 0xe3, 0x88, 0x26, 0x41,
+                0x5c, 0xc6, 0xb3, 0x38, 0x94, 0x4b, 0x48, 0x99, 0x54, 0x8b,
             ],
         },
         TestVector {
@@ -306,36 +305,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xa2, 0x17, 0x64, 0x10, 0x4a, 0x23, 0xea, 0xf6, 0xba, 0x49, 0x6c, 0xb9, 0xb8, 0xe8,
                 0x25, 0x7a, 0xd8, 0xb3,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0x33, 0x88, 0xda, 0x05, 0x06, 0xda, 0x9e, 0xa2, 0xd5, 0x16, 0x73, 0x9b, 0x95, 0x1c,
-                0x7c, 0xc0, 0x58, 0x53, 0x36, 0xb4, 0x4d, 0xf9, 0xb3, 0xb5, 0x0e, 0x48, 0x93, 0xe4,
-                0xb1, 0x84, 0x92, 0x11,
+                0xc1, 0xe1, 0x59, 0x5b, 0x8d, 0xe7, 0x55, 0x97, 0x66, 0xe5, 0xa6, 0x72, 0x5f, 0x5b,
+                0xe5, 0x74, 0x2f, 0x43, 0xbf, 0x40, 0x62, 0x3b, 0x71, 0x49, 0xca, 0xe2, 0x67, 0x5c,
+                0x4d, 0xb2, 0xc7, 0x31,
             ],
             cmx: [
-                0x9e, 0x04, 0x32, 0xb2, 0xb3, 0x33, 0xcd, 0xe8, 0xce, 0x92, 0x1b, 0x77, 0xca, 0x7e,
-                0x9e, 0x41, 0x51, 0xe3, 0x74, 0xd5, 0x16, 0xcd, 0xa1, 0x17, 0x63, 0x83, 0x6a, 0xf3,
-                0xb6, 0x6f, 0x5b, 0x15,
+                0x59, 0xb6, 0xf3, 0xd4, 0x03, 0x22, 0x3d, 0x6c, 0xe4, 0x3d, 0xed, 0xae, 0xe2, 0x35,
+                0xfc, 0xa9, 0x5c, 0xc8, 0xb2, 0x49, 0x94, 0x1c, 0xcd, 0xb6, 0x6f, 0x3f, 0x61, 0x1c,
+                0xc5, 0xe9, 0xf9, 0x0f,
             ],
             esk: [
-                0x68, 0x65, 0x87, 0xce, 0x53, 0xc3, 0x39, 0xf9, 0xce, 0xcf, 0x4d, 0x80, 0x4a, 0x17,
-                0x09, 0x39, 0x2b, 0x6a, 0xb1, 0x08, 0xea, 0x2c, 0x57, 0x79, 0x92, 0x1c, 0xd5, 0xda,
-                0x8a, 0x6e, 0x1a, 0x08,
+                0x10, 0x87, 0x4a, 0x74, 0x22, 0x7a, 0xc7, 0x99, 0x5e, 0xdd, 0xdd, 0x73, 0x4d, 0x0e,
+                0x00, 0xdc, 0xc9, 0xf4, 0x8a, 0x01, 0xdd, 0x5c, 0x4c, 0xb1, 0x22, 0xc0, 0x61, 0xe0,
+                0xbd, 0xc9, 0xce, 0x14,
             ],
             ephemeral_key: [
-                0x91, 0x92, 0x3e, 0xd8, 0x2b, 0x76, 0xd7, 0x97, 0x30, 0x7c, 0xaa, 0x23, 0x02, 0xc0,
-                0xcf, 0x75, 0x56, 0x12, 0x17, 0x24, 0x98, 0x67, 0x53, 0x2a, 0xe5, 0x1c, 0x2e, 0xa0,
-                0x05, 0xed, 0xad, 0xb6,
+                0xd2, 0x9e, 0x0d, 0x00, 0x1e, 0xe7, 0x1e, 0x05, 0x99, 0x08, 0x65, 0x04, 0xd8, 0x62,
+                0xc7, 0xf5, 0x2b, 0x08, 0x60, 0x77, 0x0d, 0x8a, 0x4b, 0x42, 0xa8, 0x68, 0x11, 0xac,
+                0x31, 0x69, 0x85, 0x8c,
             ],
             shared_secret: [
-                0x53, 0xd7, 0xe4, 0x84, 0x3a, 0x36, 0xd5, 0x79, 0xb5, 0xa7, 0xc1, 0x04, 0x11, 0x96,
-                0xbd, 0x4c, 0x85, 0x80, 0x5c, 0xcd, 0x0a, 0x3f, 0x95, 0xbc, 0x9e, 0x71, 0x06, 0x90,
-                0xd1, 0x1b, 0x7a, 0xaa,
+                0x11, 0xa0, 0xac, 0x79, 0x9a, 0x29, 0xb0, 0xed, 0x19, 0x5e, 0xd8, 0x7b, 0x13, 0x83,
+                0x22, 0x26, 0x3b, 0xbb, 0x9c, 0x31, 0x00, 0x8c, 0x29, 0x59, 0xaf, 0x2f, 0xc6, 0x36,
+                0x68, 0x7e, 0xd9, 0xb0,
             ],
             k_enc: [
-                0xc2, 0xe3, 0x38, 0x9d, 0x6f, 0xc3, 0xcd, 0x06, 0x7f, 0x59, 0x0a, 0x93, 0x73, 0x05,
-                0x04, 0xad, 0x9b, 0x63, 0xc4, 0x55, 0x45, 0x69, 0xb9, 0x62, 0x0f, 0x3e, 0xf0, 0xb0,
-                0x65, 0x94, 0xde, 0xd6,
+                0x4b, 0xbf, 0x80, 0xe7, 0xa1, 0x70, 0x3a, 0xc1, 0x4a, 0xd7, 0xb5, 0x44, 0x8a, 0x2e,
+                0x8e, 0x79, 0x49, 0x30, 0x49, 0xd1, 0x9a, 0x6a, 0x51, 0x31, 0x67, 0xd5, 0x5b, 0xdd,
+                0x58, 0x6a, 0xc0, 0xd9,
             ],
             p_enc: [
                 0x02, 0x55, 0x6e, 0x5e, 0x1b, 0xf5, 0x1b, 0xc6, 0xa6, 0x11, 0x58, 0xf7, 0x40, 0x50,
@@ -381,68 +379,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x8b, 0x1e, 0x88, 0x6f,
             ],
             c_enc: [
-                0x6d, 0x21, 0x18, 0x0a, 0xc4, 0x74, 0x94, 0x57, 0x8a, 0x90, 0x06, 0xaf, 0x5b, 0xeb,
-                0x4e, 0x34, 0x55, 0x59, 0xab, 0xdb, 0x0e, 0x23, 0xed, 0x52, 0x65, 0xaf, 0x79, 0xce,
-                0x0c, 0xc5, 0x96, 0x71, 0xea, 0x31, 0x7b, 0x3e, 0xb1, 0x52, 0x93, 0xd1, 0xe0, 0x4a,
-                0x9a, 0xd8, 0x39, 0x69, 0xab, 0x9e, 0x17, 0x08, 0xf2, 0x28, 0x85, 0x3a, 0x28, 0x1f,
-                0xcf, 0x6c, 0x97, 0x60, 0xae, 0x71, 0x96, 0x5b, 0xb1, 0xd4, 0x45, 0x2e, 0x5e, 0xd0,
-                0x06, 0x00, 0xab, 0x58, 0x94, 0x27, 0x75, 0xb7, 0x4e, 0x12, 0x62, 0xb4, 0x22, 0x5d,
-                0x3b, 0x61, 0x9c, 0x31, 0x65, 0x96, 0xd7, 0xcf, 0x9c, 0x93, 0xbd, 0xb5, 0x2a, 0xfa,
-                0x77, 0x8a, 0xa1, 0x20, 0x8d, 0x56, 0xd0, 0x69, 0xe5, 0x6e, 0x27, 0x79, 0x61, 0x4d,
-                0x56, 0xf4, 0x36, 0x10, 0x72, 0xbc, 0x15, 0x16, 0xa9, 0xb4, 0x56, 0x2a, 0x4f, 0x54,
-                0x63, 0xa5, 0x13, 0xc4, 0x59, 0x42, 0x15, 0x70, 0xf3, 0x34, 0xef, 0xb6, 0xbc, 0xd2,
-                0x08, 0xf8, 0xf8, 0x05, 0x0e, 0x15, 0x3d, 0x4e, 0x61, 0xf3, 0x1e, 0xdd, 0xbb, 0x5a,
-                0x98, 0xf1, 0x70, 0xd3, 0xd0, 0x80, 0xe8, 0xec, 0x3f, 0x65, 0x20, 0xb6, 0xa2, 0xd6,
-                0x08, 0x83, 0xa5, 0x87, 0xff, 0x0e, 0x98, 0x21, 0x1c, 0x73, 0x45, 0x16, 0xb5, 0xdc,
-                0xc7, 0x5e, 0xf2, 0x3c, 0xfb, 0x9f, 0x55, 0xf1, 0xde, 0xed, 0xf1, 0x26, 0xc2, 0xce,
-                0x17, 0x27, 0x3f, 0x41, 0xdb, 0xbb, 0xbd, 0x2f, 0x49, 0xe3, 0x55, 0x77, 0x6e, 0xc0,
-                0x46, 0x98, 0x35, 0xf7, 0x9d, 0x94, 0x80, 0x42, 0xf8, 0x42, 0x0f, 0x11, 0xe1, 0xab,
-                0xd7, 0x45, 0x06, 0xb7, 0x8b, 0x5e, 0x41, 0xcb, 0xe0, 0xc7, 0x07, 0x17, 0xf4, 0x6e,
-                0x7e, 0xb9, 0xac, 0xdc, 0x35, 0x1c, 0x94, 0x98, 0x83, 0x3a, 0xfd, 0xed, 0x93, 0x06,
-                0xa0, 0x43, 0x5b, 0x10, 0xb8, 0x3a, 0xe3, 0x95, 0xd5, 0x7f, 0x5b, 0x0a, 0x5d, 0x41,
-                0xa9, 0x34, 0x2d, 0x02, 0xec, 0x58, 0xb6, 0xee, 0x16, 0x87, 0x77, 0x50, 0x16, 0xb8,
-                0x74, 0x9b, 0x28, 0x7a, 0xbd, 0xd3, 0xed, 0x1a, 0x83, 0x5e, 0xa8, 0xf3, 0xb1, 0x4d,
-                0x08, 0x18, 0xfe, 0x0d, 0x5d, 0x9a, 0x48, 0xeb, 0x02, 0x13, 0x64, 0x0e, 0xec, 0xc1,
-                0x9a, 0x5d, 0x16, 0x61, 0xdb, 0x82, 0x2b, 0x77, 0x9b, 0x08, 0x0c, 0xd8, 0xba, 0x7f,
-                0x3a, 0x27, 0x23, 0x21, 0xee, 0x5d, 0xa2, 0x27, 0x8c, 0x53, 0x85, 0x67, 0xd0, 0xd9,
-                0xbb, 0x28, 0xce, 0x64, 0x21, 0x31, 0x15, 0x03, 0xa4, 0xa0, 0x17, 0x14, 0xcf, 0x91,
-                0x01, 0x55, 0x2b, 0xa5, 0xef, 0xc8, 0x5c, 0x94, 0xd5, 0xe5, 0x09, 0x72, 0x7e, 0x5e,
-                0x01, 0x1c, 0x15, 0xb1, 0xb2, 0xec, 0xdf, 0xf3, 0x99, 0xc0, 0xbe, 0x33, 0x42, 0xab,
-                0x6e, 0xdd, 0xa8, 0xe3, 0xed, 0x81, 0x1a, 0x7d, 0x9c, 0x9c, 0xa4, 0xbb, 0x71, 0xa5,
-                0x63, 0xe1, 0x59, 0x78, 0xbf, 0x8e, 0x64, 0x04, 0xac, 0x79, 0x6e, 0xb7, 0x81, 0xfd,
-                0x2c, 0xf2, 0x19, 0x1b, 0x2f, 0x4d, 0x40, 0x76, 0xd9, 0x3c, 0xcc, 0x80, 0xf7, 0xe5,
-                0x92, 0xfa, 0x66, 0x9b, 0x72, 0x26, 0x57, 0x82, 0xee, 0x8f, 0x5c, 0xe3, 0x03, 0x12,
-                0xd3, 0x51, 0x2b, 0x35, 0x49, 0x0a, 0xfe, 0x00, 0x6b, 0xad, 0xb1, 0x62, 0x0d, 0x1b,
-                0x0c, 0x79, 0xfb, 0xc4, 0xbe, 0xc5, 0x65, 0xd7, 0x46, 0x1d, 0x68, 0xef, 0x72, 0x27,
-                0x79, 0x11, 0x77, 0x6c, 0xd5, 0xa7, 0xb5, 0xfc, 0x6f, 0xa8, 0xb3, 0xee, 0xfd, 0x7a,
-                0x39, 0xe8, 0xe5, 0xb4, 0xf6, 0xa5, 0x0c, 0x7d, 0x58, 0xd9, 0xeb, 0x08, 0x38, 0x0d,
-                0x32, 0x0b, 0x36, 0xea, 0x04, 0x37, 0x00, 0xac, 0xa7, 0x64, 0xb4, 0x8c, 0x3d, 0xa4,
-                0x93, 0x67, 0xfa, 0x93, 0x35, 0x6a, 0xaa, 0x4f, 0x87, 0x08, 0xea, 0x6e, 0x34, 0x59,
-                0x81, 0x84, 0x5b, 0xe7, 0x37, 0x6d, 0xa7, 0x98, 0x40, 0x53, 0xef, 0x7d, 0xd4, 0xb6,
-                0xa7, 0x27, 0x92, 0x35, 0x6a, 0x6c, 0x34, 0x62, 0x68, 0x88, 0xcc, 0x70, 0xde, 0x49,
-                0x9e, 0xf9, 0x10, 0x26, 0x95, 0xd9, 0xdb, 0x12, 0xaf, 0x29, 0x62, 0xfc, 0x75, 0xd4,
-                0x36, 0x56, 0x19, 0xdb, 0x0e, 0x87, 0x6c, 0xdb, 0x82, 0x02, 0xe8, 0x16, 0xfd, 0xc2,
-                0xcd, 0xf3, 0x7a, 0xd3, 0xbe, 0x3b,
+                0x1b, 0x42, 0x34, 0x80, 0xbf, 0x37, 0x67, 0xf5, 0xeb, 0xfc, 0x40, 0xb8, 0xc8, 0x9c,
+                0xc5, 0x34, 0xf1, 0x65, 0xc3, 0x5d, 0x19, 0xc8, 0xda, 0x6c, 0x32, 0x10, 0xe9, 0x52,
+                0xca, 0xd8, 0x23, 0xa7, 0x84, 0x60, 0x21, 0xc3, 0xde, 0x4a, 0x86, 0x93, 0xb7, 0x1e,
+                0x28, 0x7f, 0x46, 0x86, 0xac, 0x0a, 0xdd, 0xce, 0xd9, 0x4e, 0xba, 0x81, 0x0a, 0x99,
+                0x8b, 0x82, 0x3a, 0x4a, 0xd2, 0x41, 0xaa, 0x9f, 0x4a, 0x3a, 0xe4, 0x82, 0x5d, 0xe9,
+                0x95, 0xdd, 0x58, 0x73, 0x56, 0x62, 0x44, 0xbb, 0xd8, 0x75, 0xd0, 0x1b, 0xf3, 0x28,
+                0xe8, 0x22, 0xca, 0xfd, 0xb8, 0x3e, 0xd7, 0x75, 0x3a, 0x88, 0x85, 0xd7, 0xae, 0xf2,
+                0x45, 0x5a, 0x15, 0x2e, 0x23, 0xdf, 0xa2, 0xd6, 0x99, 0xb3, 0x5c, 0x33, 0xd3, 0x61,
+                0x07, 0x2a, 0xe5, 0xc5, 0x12, 0x43, 0x4d, 0x34, 0x6f, 0x6c, 0x56, 0xfb, 0x5f, 0x11,
+                0xb0, 0xb6, 0x47, 0xcb, 0xca, 0xfe, 0x02, 0xd8, 0x84, 0x55, 0xa6, 0x30, 0xa3, 0x50,
+                0x86, 0x2b, 0x3c, 0xd1, 0x51, 0x3b, 0x6d, 0x6e, 0x41, 0x17, 0xc7, 0x5e, 0xc4, 0xb1,
+                0x2f, 0xd7, 0x5a, 0x90, 0xf8, 0x2d, 0xce, 0xa1, 0xc7, 0x71, 0xfd, 0xda, 0x24, 0xec,
+                0xf0, 0xa3, 0xe5, 0xb2, 0xe8, 0xa2, 0x24, 0x23, 0x6e, 0xf0, 0x9a, 0x93, 0xab, 0x59,
+                0xe5, 0x9b, 0xdf, 0xb8, 0x72, 0x86, 0x0c, 0xc2, 0xd9, 0x11, 0x34, 0xca, 0xf2, 0x13,
+                0x98, 0x48, 0xe3, 0x9a, 0xa6, 0x4b, 0xa2, 0xe6, 0xd7, 0x25, 0x20, 0x54, 0xf3, 0x7a,
+                0xd5, 0x5c, 0x2c, 0xe5, 0xf8, 0x1b, 0x33, 0xcc, 0xb6, 0x8a, 0x94, 0x73, 0x71, 0x24,
+                0x3a, 0x77, 0xe8, 0x43, 0x67, 0xd9, 0xd3, 0x5b, 0x11, 0x68, 0x14, 0x10, 0xea, 0x79,
+                0x8b, 0x03, 0x87, 0xb8, 0xf1, 0x0b, 0x1f, 0x89, 0xc6, 0x8a, 0xd1, 0xcc, 0xa9, 0xa3,
+                0xe0, 0x32, 0xf3, 0x49, 0x98, 0x79, 0xc8, 0x9a, 0xe6, 0x38, 0x2f, 0x38, 0x97, 0x22,
+                0x01, 0x1f, 0x49, 0x25, 0x14, 0x3e, 0xa8, 0x50, 0x73, 0xe4, 0xff, 0x0c, 0xcf, 0x6d,
+                0x77, 0x9b, 0xc3, 0xbf, 0x4c, 0x1b, 0x95, 0xfc, 0x7c, 0xf7, 0xf9, 0x91, 0xa2, 0x16,
+                0x2a, 0xb9, 0x45, 0x41, 0xf3, 0x99, 0x8e, 0xf6, 0xbc, 0x3f, 0xe8, 0x02, 0x54, 0xab,
+                0xa4, 0x1f, 0x15, 0x23, 0x15, 0x03, 0x45, 0x1b, 0x15, 0xe1, 0x08, 0x52, 0xf8, 0x5b,
+                0xd2, 0xd1, 0x15, 0x93, 0x53, 0x14, 0xcd, 0x80, 0xc1, 0x23, 0xbe, 0x0b, 0x53, 0x0f,
+                0xaa, 0xd6, 0xb5, 0x07, 0x49, 0x68, 0x22, 0x1d, 0xa0, 0x4b, 0x54, 0x6d, 0x96, 0x21,
+                0x63, 0x29, 0x9d, 0x52, 0xce, 0xf4, 0x1e, 0x29, 0x6d, 0xa5, 0x9c, 0xb0, 0x76, 0xdb,
+                0xe8, 0x99, 0x70, 0x4b, 0x61, 0x73, 0x0c, 0x19, 0xbd, 0x22, 0x1a, 0xd2, 0xbd, 0x29,
+                0x81, 0xea, 0x95, 0x1b, 0xe0, 0x2c, 0x9f, 0x5b, 0xdf, 0x92, 0xd9, 0x87, 0x07, 0x46,
+                0xb2, 0xa5, 0x8c, 0x3d, 0x18, 0xa7, 0xd3, 0xe5, 0xe2, 0xc6, 0x3a, 0xc2, 0x61, 0x58,
+                0x37, 0xbe, 0x1c, 0x6f, 0xe0, 0x03, 0x65, 0x6c, 0x1b, 0x3d, 0x71, 0x50, 0x5f, 0x5e,
+                0x21, 0x88, 0x10, 0x4e, 0x98, 0x91, 0x1b, 0x6a, 0x5e, 0x3f, 0x52, 0x82, 0xfa, 0xc0,
+                0xc8, 0xfa, 0x1b, 0xa3, 0x6f, 0xfc, 0x07, 0xdc, 0x7a, 0x40, 0x9d, 0xf2, 0xeb, 0xa8,
+                0xc7, 0x5f, 0x70, 0xbd, 0x59, 0xa6, 0xf0, 0x65, 0x1d, 0xc1, 0xb1, 0xb5, 0x96, 0xde,
+                0x6a, 0xce, 0xc7, 0x78, 0xe2, 0xe3, 0x2f, 0x1e, 0xd4, 0x6d, 0xf7, 0xa9, 0xae, 0xf5,
+                0x1d, 0xfe, 0x5a, 0xa5, 0x24, 0x36, 0xea, 0x07, 0xf5, 0x05, 0xd3, 0x39, 0xf2, 0x03,
+                0x45, 0x86, 0x61, 0xc8, 0x3a, 0x9a, 0x5a, 0x27, 0xaa, 0x48, 0xb5, 0xec, 0x47, 0xf8,
+                0xd6, 0x0d, 0x2a, 0x41, 0x00, 0x1f, 0xce, 0x30, 0xff, 0x75, 0x3a, 0x8a, 0x8c, 0xe4,
+                0x92, 0xef, 0xcd, 0x1f, 0x75, 0x3b, 0x7f, 0x4a, 0xd7, 0x36, 0x62, 0x64, 0x47, 0xd1,
+                0xb6, 0xf0, 0x7a, 0x61, 0x7d, 0x4b, 0xfc, 0xdb, 0x48, 0xaf, 0xef, 0x08, 0x2d, 0xae,
+                0x1d, 0x76, 0x54, 0x4e, 0x8b, 0x63, 0xad, 0xcb, 0xb6, 0x0e, 0x14, 0x96, 0x69, 0x32,
+                0x60, 0xc7, 0x20, 0xe6, 0x72, 0x1e, 0x00, 0x20, 0xef, 0xa3, 0xf8, 0xd8, 0x8d, 0x15,
+                0xb5, 0xaa, 0x48, 0xa1, 0xb2, 0x2c,
             ],
             ock: [
-                0x91, 0x36, 0x59, 0x30, 0x9e, 0xcf, 0xcd, 0xfd, 0x7e, 0x0c, 0xef, 0x23, 0xf8, 0x80,
-                0xae, 0x4c, 0xf4, 0xd8, 0xcf, 0x67, 0x78, 0xb9, 0xc4, 0xe6, 0xf4, 0xc7, 0x71, 0x7b,
-                0xf5, 0xca, 0xf0, 0x9e,
+                0xab, 0xd0, 0xc2, 0x46, 0x97, 0xe4, 0x5b, 0x8b, 0xc4, 0x83, 0x0f, 0xb1, 0x46, 0x53,
+                0x2e, 0xa0, 0xac, 0x84, 0x55, 0x81, 0xca, 0x35, 0x39, 0xd3, 0x41, 0x24, 0x73, 0x54,
+                0x09, 0xd0, 0x15, 0xac,
             ],
             op: [
                 0xb4, 0xca, 0xc5, 0x6f, 0x06, 0x2b, 0xfb, 0x2e, 0x27, 0x15, 0xea, 0xf9, 0xc8, 0xfc,
                 0xdb, 0xc2, 0x0c, 0x86, 0x79, 0x3f, 0x23, 0x57, 0xdd, 0xd0, 0x4a, 0xad, 0x39, 0xf9,
-                0x4a, 0xd7, 0xc7, 0x84, 0x68, 0x65, 0x87, 0xce, 0x53, 0xc3, 0x39, 0xf9, 0xce, 0xcf,
-                0x4d, 0x80, 0x4a, 0x17, 0x09, 0x39, 0x2b, 0x6a, 0xb1, 0x08, 0xea, 0x2c, 0x57, 0x79,
-                0x92, 0x1c, 0xd5, 0xda, 0x8a, 0x6e, 0x1a, 0x08,
+                0x4a, 0xd7, 0xc7, 0x84, 0x10, 0x87, 0x4a, 0x74, 0x22, 0x7a, 0xc7, 0x99, 0x5e, 0xdd,
+                0xdd, 0x73, 0x4d, 0x0e, 0x00, 0xdc, 0xc9, 0xf4, 0x8a, 0x01, 0xdd, 0x5c, 0x4c, 0xb1,
+                0x22, 0xc0, 0x61, 0xe0, 0xbd, 0xc9, 0xce, 0x14,
             ],
             c_out: [
-                0x4d, 0xf8, 0xda, 0x22, 0xec, 0x17, 0xf4, 0x16, 0xe0, 0x59, 0x1a, 0xac, 0xc1, 0x6b,
-                0x6d, 0xd2, 0xbb, 0xbf, 0x47, 0xbe, 0x04, 0x30, 0x3d, 0xc8, 0x85, 0xd3, 0x5a, 0xc3,
-                0xf9, 0x92, 0x3e, 0xea, 0x41, 0xf3, 0x6b, 0x3a, 0x4a, 0x5c, 0x5e, 0x73, 0x3e, 0x32,
-                0x6e, 0x96, 0xdb, 0xe5, 0x5e, 0xf9, 0xe7, 0xe8, 0x42, 0x27, 0x0c, 0xbf, 0x46, 0x7c,
-                0xdc, 0x16, 0x0e, 0xbf, 0x4f, 0x10, 0x9a, 0xd6, 0x92, 0x0a, 0x6a, 0xed, 0x4a, 0x01,
-                0x71, 0xd9, 0x06, 0xe3, 0xe8, 0x13, 0x32, 0xe6, 0xc5, 0x61,
+                0xea, 0xdf, 0x7e, 0xeb, 0x10, 0x2d, 0xb1, 0x88, 0x58, 0x54, 0xc2, 0x9e, 0xb7, 0xb0,
+                0x5c, 0x7c, 0x96, 0xbb, 0xb8, 0x90, 0x00, 0x2c, 0x4e, 0xd1, 0x14, 0xed, 0x62, 0xf5,
+                0xf9, 0xcc, 0xb4, 0x41, 0x6b, 0x5e, 0xdd, 0xd9, 0xad, 0xb5, 0x5c, 0xe9, 0xc7, 0xa0,
+                0xd8, 0x44, 0x2b, 0xbc, 0x8a, 0xfa, 0x5c, 0x77, 0xb9, 0x90, 0xad, 0x6d, 0x46, 0x12,
+                0x4d, 0xde, 0x70, 0x49, 0x48, 0x72, 0xb2, 0x20, 0x8a, 0x7c, 0x58, 0x02, 0xdf, 0xe9,
+                0xbd, 0x1c, 0xa1, 0x9b, 0xef, 0x4b, 0x37, 0xc6, 0x13, 0xb2,
             ],
         },
         TestVector {
@@ -516,36 +514,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x9d, 0x5e, 0x64, 0x07, 0x19, 0xbc, 0xa5, 0xc8, 0xed, 0x49, 0x99, 0x97, 0x34, 0xe6,
                 0xc5, 0xb3, 0x73, 0x3e,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0xbe, 0xf8, 0xcf, 0x16, 0x98, 0xe4, 0x78, 0x47, 0xd3, 0x8e, 0x1a, 0xaa, 0x88, 0x86,
-                0x10, 0x77, 0xcd, 0xb5, 0xad, 0x4c, 0xf6, 0x6f, 0xe4, 0x2f, 0xd6, 0x52, 0x57, 0x81,
-                0xb6, 0xd3, 0x4f, 0x1e,
+                0xc8, 0x8d, 0x00, 0x84, 0x84, 0xc5, 0xd7, 0x98, 0x20, 0xab, 0x68, 0xc6, 0x7d, 0x08,
+                0x36, 0x72, 0xb0, 0x7f, 0x72, 0x7d, 0x44, 0xd0, 0xcd, 0x14, 0x73, 0x88, 0x00, 0xf8,
+                0x25, 0xb9, 0xff, 0x16,
             ],
             cmx: [
-                0xd8, 0x19, 0xa6, 0x37, 0x7a, 0xce, 0x33, 0xf9, 0x21, 0xf2, 0x29, 0xf9, 0x32, 0x86,
-                0x6d, 0x9f, 0xcd, 0xb9, 0xd0, 0x42, 0x6a, 0xfa, 0xca, 0x9e, 0x60, 0x50, 0xb4, 0x7a,
-                0x83, 0x19, 0xd6, 0x0d,
+                0x0b, 0x74, 0x59, 0x61, 0x6f, 0xc6, 0x93, 0x95, 0xe6, 0x44, 0x36, 0xcf, 0x4a, 0xe9,
+                0x44, 0x1d, 0x37, 0x4b, 0x29, 0x04, 0x9e, 0x4c, 0x86, 0x22, 0x3a, 0x03, 0x83, 0xf4,
+                0xe0, 0x24, 0x69, 0x05,
             ],
             esk: [
-                0x59, 0xd1, 0x0a, 0x5b, 0x94, 0x15, 0x8a, 0x3f, 0x3a, 0x78, 0xb3, 0x5d, 0xa9, 0xc6,
-                0x27, 0xbe, 0xdf, 0x7c, 0xfb, 0x84, 0x7e, 0x3e, 0x59, 0x86, 0xec, 0x8a, 0xd7, 0xf7,
-                0x4c, 0xd9, 0xb2, 0x1b,
+                0xc4, 0x92, 0x42, 0xce, 0xe7, 0xe0, 0x86, 0x8f, 0x2a, 0x75, 0xa1, 0xc4, 0x12, 0xbc,
+                0x44, 0xd5, 0x4c, 0x97, 0x09, 0xf6, 0x59, 0xde, 0xd3, 0x26, 0x95, 0x72, 0x92, 0x93,
+                0x59, 0xe0, 0x4c, 0x3a,
             ],
             ephemeral_key: [
-                0x5b, 0xcb, 0xf9, 0xf1, 0xd7, 0xdd, 0x68, 0xe7, 0xcc, 0x6d, 0x6c, 0x78, 0x49, 0x50,
-                0xd1, 0xc2, 0xe0, 0xbe, 0x6a, 0x84, 0xa7, 0xa8, 0x8d, 0x6f, 0x7a, 0x20, 0x98, 0xc3,
-                0xdc, 0xae, 0x3f, 0x2f,
+                0x0e, 0x04, 0xd8, 0x52, 0x5d, 0xd6, 0x8f, 0x7a, 0xe8, 0x68, 0xca, 0x81, 0x1e, 0x88,
+                0x33, 0xa7, 0xf4, 0x7d, 0x7a, 0xad, 0xd3, 0x76, 0x03, 0xac, 0xe6, 0x07, 0xee, 0x6c,
+                0x86, 0x6b, 0xce, 0x23,
             ],
             shared_secret: [
-                0x37, 0x35, 0x1c, 0xe2, 0x57, 0xb2, 0x79, 0x4d, 0x86, 0xa5, 0x3d, 0x26, 0x8d, 0xc9,
-                0x00, 0x06, 0x40, 0xc2, 0x76, 0xf3, 0xf4, 0x65, 0xe1, 0xaa, 0x70, 0xbf, 0xde, 0xf4,
-                0x99, 0xa3, 0xd7, 0xaa,
+                0x4a, 0x7a, 0x54, 0xac, 0x00, 0x41, 0x95, 0x98, 0xb0, 0x76, 0x01, 0x53, 0xe2, 0x6a,
+                0xcc, 0xd2, 0x15, 0x05, 0x24, 0x16, 0x65, 0x17, 0x13, 0xee, 0xa1, 0x89, 0x19, 0xf3,
+                0xe2, 0x62, 0xd3, 0xb6,
             ],
             k_enc: [
-                0xea, 0x22, 0x99, 0x65, 0x39, 0xd3, 0x74, 0xda, 0x6a, 0x75, 0x34, 0x39, 0x5a, 0xe9,
-                0x23, 0x36, 0xfc, 0xa7, 0x85, 0x11, 0x20, 0xdd, 0x1a, 0xe4, 0x9e, 0x45, 0xb3, 0x3e,
-                0x0b, 0xed, 0xe9, 0xac,
+                0x30, 0x62, 0x6d, 0x92, 0xeb, 0x62, 0x0f, 0xd4, 0xa9, 0x28, 0xb4, 0x3f, 0xd5, 0x50,
+                0x69, 0x74, 0x71, 0x76, 0x7d, 0xe4, 0x49, 0x6c, 0xfd, 0xad, 0xb1, 0xda, 0x18, 0xfc,
+                0x0c, 0xdd, 0x5a, 0xa6,
             ],
             p_enc: [
                 0x02, 0x08, 0xab, 0x2e, 0xe9, 0x9d, 0x4d, 0x9b, 0x98, 0x3d, 0xdd, 0x22, 0x47, 0xee,
@@ -591,68 +588,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x55, 0x21, 0x93, 0xb1,
             ],
             c_enc: [
-                0x12, 0xd6, 0x64, 0xed, 0x05, 0xd6, 0x46, 0x26, 0x89, 0xd4, 0xf2, 0x4a, 0xee, 0x5a,
-                0x4f, 0x0f, 0x32, 0x35, 0xff, 0x11, 0x0b, 0x2d, 0xf9, 0x9f, 0x67, 0xd8, 0xc5, 0xb3,
-                0x68, 0xdd, 0x47, 0x69, 0xd8, 0x44, 0xd3, 0xdd, 0xa0, 0x3f, 0x58, 0xc5, 0x48, 0x63,
-                0x62, 0xe8, 0x90, 0x81, 0xa5, 0xdf, 0xd0, 0xa6, 0x06, 0xa3, 0x91, 0x26, 0x4b, 0x56,
-                0xca, 0x3a, 0xfc, 0x4f, 0xe0, 0xe4, 0xc3, 0x05, 0xf3, 0x07, 0x78, 0x09, 0x4a, 0x00,
-                0xb7, 0x33, 0x4b, 0xdd, 0x82, 0x45, 0xac, 0x56, 0x0e, 0xf3, 0x29, 0xbc, 0x68, 0x97,
-                0xd4, 0xd7, 0xba, 0x31, 0xac, 0x84, 0x54, 0x44, 0x1a, 0x15, 0xc8, 0xd3, 0xce, 0xcc,
-                0x71, 0x32, 0xdf, 0x0d, 0x9d, 0x0e, 0xcf, 0x92, 0x84, 0x34, 0xa0, 0xd2, 0x8c, 0x1b,
-                0x00, 0x48, 0x52, 0x01, 0xec, 0x33, 0xbe, 0x9a, 0x28, 0x74, 0xb4, 0x29, 0x6c, 0x04,
-                0x22, 0xc7, 0xe7, 0xa0, 0xa3, 0xa2, 0x2e, 0xc7, 0xe7, 0x21, 0xa4, 0x79, 0x22, 0x8d,
-                0xa2, 0x8b, 0x47, 0x37, 0xaf, 0x52, 0x06, 0xdf, 0x7d, 0x74, 0xe4, 0x84, 0xc4, 0xf7,
-                0xa8, 0x56, 0xbe, 0x8c, 0xd0, 0x4b, 0x21, 0x26, 0xb5, 0x27, 0x11, 0xe7, 0xb0, 0xaf,
-                0x75, 0xc7, 0x52, 0x84, 0xa1, 0x57, 0x20, 0x40, 0xe8, 0xad, 0xe5, 0x85, 0xe8, 0xa4,
-                0x82, 0x80, 0x03, 0x59, 0x67, 0x46, 0xc4, 0x0c, 0x9d, 0x76, 0x0d, 0x92, 0x74, 0xb1,
-                0x25, 0x42, 0x2b, 0x63, 0x48, 0x1a, 0x17, 0xff, 0xba, 0xb8, 0xc2, 0xde, 0x13, 0xb2,
-                0x19, 0xf5, 0x8a, 0x35, 0x95, 0x2d, 0x88, 0x7a, 0xed, 0xe8, 0xe0, 0x2f, 0x10, 0x33,
-                0x8c, 0x23, 0x98, 0x23, 0xfb, 0x43, 0x49, 0x51, 0x84, 0x47, 0x12, 0xf6, 0x8d, 0x6e,
-                0x4f, 0xef, 0xae, 0x2b, 0x79, 0x5b, 0xa9, 0x78, 0xe9, 0x81, 0xc1, 0x09, 0x27, 0xab,
-                0xbc, 0x16, 0x30, 0x66, 0xa0, 0xe9, 0x60, 0xb3, 0xb8, 0xa3, 0x26, 0xc0, 0x39, 0x85,
-                0x81, 0x10, 0x93, 0x99, 0xf6, 0xed, 0x60, 0x44, 0x9a, 0xa8, 0x58, 0xd5, 0xdd, 0x27,
-                0xdb, 0xf8, 0x89, 0x9f, 0x9c, 0x9a, 0x50, 0x20, 0x5f, 0x25, 0xd0, 0xcc, 0x50, 0xb2,
-                0xde, 0xe3, 0x63, 0x54, 0xc5, 0xe4, 0x48, 0x4d, 0x36, 0xf6, 0x3c, 0x97, 0x63, 0xd8,
-                0x41, 0xad, 0x5e, 0x00, 0x21, 0x63, 0x6a, 0x85, 0x7c, 0xfb, 0x79, 0xa5, 0x12, 0x3c,
-                0x3d, 0xfb, 0x77, 0x3d, 0x0c, 0x1b, 0xeb, 0x9f, 0x90, 0xa9, 0x72, 0xd0, 0xfc, 0x80,
-                0x5f, 0x65, 0x5d, 0x69, 0x40, 0x85, 0x23, 0xb9, 0x9b, 0x62, 0xa8, 0xfa, 0xbe, 0xf0,
-                0xc0, 0x24, 0xf2, 0x1f, 0x50, 0xe4, 0xc1, 0x12, 0xe2, 0xfe, 0xdd, 0x58, 0xca, 0xe9,
-                0x60, 0x9a, 0xc6, 0xf7, 0xcc, 0x79, 0x83, 0x86, 0xc9, 0xd9, 0x06, 0x42, 0x1c, 0xa5,
-                0x7c, 0xf8, 0x1b, 0x09, 0x6b, 0xba, 0xda, 0x64, 0xd0, 0xee, 0x76, 0x95, 0x18, 0x9d,
-                0x5f, 0xb1, 0x7a, 0xe2, 0x53, 0x1d, 0xbb, 0x2c, 0x00, 0x58, 0x5a, 0x26, 0xa6, 0x8c,
-                0x27, 0xf9, 0x77, 0x77, 0x84, 0x1a, 0x3e, 0x39, 0x30, 0xc7, 0x0f, 0xc3, 0xfa, 0x8e,
-                0x2b, 0x7f, 0xc2, 0x1e, 0x87, 0xcf, 0x9f, 0x63, 0xb3, 0x63, 0xb8, 0x8d, 0xaa, 0x1f,
-                0xb6, 0x7b, 0xda, 0xe8, 0xe5, 0x5b, 0x68, 0x51, 0x6d, 0x19, 0xdf, 0xef, 0xec, 0x9b,
-                0x3d, 0x38, 0xe6, 0xe1, 0xd0, 0xa6, 0xe4, 0x51, 0xd6, 0xd1, 0xf5, 0x2d, 0x1f, 0x96,
-                0xdd, 0x0d, 0x53, 0x6d, 0x68, 0xd2, 0x69, 0x86, 0x70, 0x9f, 0x41, 0xe7, 0x60, 0x74,
-                0x05, 0x5b, 0xf7, 0x52, 0xbf, 0x38, 0x86, 0x92, 0xc8, 0x2c, 0xfd, 0xa1, 0xeb, 0xb0,
-                0x17, 0x8b, 0x8e, 0x0c, 0x85, 0xad, 0x7b, 0x15, 0x99, 0x14, 0x42, 0x8e, 0x30, 0x21,
-                0xda, 0xe3, 0x01, 0x0d, 0x65, 0x6c, 0x10, 0x36, 0xf4, 0xa5, 0x7e, 0x7f, 0xad, 0xe0,
-                0xfc, 0x32, 0x2a, 0xa6, 0xfd, 0xde, 0x71, 0x4a, 0x8c, 0x53, 0x78, 0x79, 0xe7, 0x04,
-                0x41, 0x6f, 0x51, 0x04, 0xdb, 0xbc, 0x8f, 0xf2, 0x42, 0xc1, 0x6d, 0x2d, 0xf4, 0xa8,
-                0x41, 0xeb, 0x6b, 0x45, 0x3a, 0x12, 0x83, 0xf6, 0x5f, 0xe1, 0x0d, 0x70, 0xc8, 0x76,
-                0x41, 0x8e, 0x44, 0x4a, 0xb3, 0x1b, 0x93, 0x71, 0xa2, 0x7d, 0x36, 0xd8, 0x6e, 0x8f,
-                0x1c, 0x32, 0x77, 0xca, 0xfd, 0xf8,
+                0x81, 0x56, 0x2d, 0xbe, 0xf7, 0xbb, 0x35, 0x3a, 0x62, 0xe7, 0xc8, 0x1e, 0xbe, 0x68,
+                0x15, 0x6c, 0xb7, 0x5c, 0x5c, 0x7e, 0x3d, 0x96, 0xbb, 0xcd, 0x7d, 0xaf, 0xf5, 0x0c,
+                0xb0, 0x95, 0x7d, 0x33, 0xdd, 0x99, 0x77, 0x9f, 0x7d, 0x3d, 0x72, 0xb1, 0x8d, 0xeb,
+                0x7a, 0x69, 0x75, 0x10, 0xe0, 0x13, 0x5b, 0x8d, 0xf4, 0x83, 0xa4, 0xd7, 0x1d, 0x1a,
+                0xb1, 0x08, 0x09, 0x6e, 0x76, 0x08, 0x91, 0xd5, 0x31, 0x07, 0xf0, 0x3d, 0xea, 0x4a,
+                0xe8, 0xe4, 0xd3, 0xfe, 0xbd, 0x98, 0x77, 0xf8, 0x57, 0x0a, 0xa3, 0x09, 0xd0, 0x97,
+                0xd4, 0x23, 0xbb, 0x76, 0x3f, 0xb3, 0xe7, 0xe9, 0xbe, 0x3c, 0x8f, 0xa0, 0x34, 0xc0,
+                0x1d, 0x66, 0x4f, 0x47, 0xa0, 0xe7, 0x13, 0x3c, 0xa1, 0x1a, 0x48, 0xcd, 0x0e, 0xea,
+                0x46, 0x35, 0xfa, 0x77, 0x25, 0x0a, 0x17, 0xbd, 0xf7, 0xb7, 0x32, 0xc8, 0x98, 0x46,
+                0x51, 0x57, 0x4f, 0xd4, 0xf9, 0x9f, 0x7a, 0xa0, 0xdb, 0x28, 0xc2, 0x97, 0x31, 0x52,
+                0xbf, 0x42, 0x6e, 0xe9, 0xa4, 0xd8, 0x41, 0xa9, 0x1d, 0x5d, 0x33, 0x57, 0x18, 0xee,
+                0xcb, 0xc9, 0xc8, 0xb2, 0xa2, 0x00, 0x15, 0x70, 0xfe, 0x8b, 0x77, 0x91, 0x43, 0xdf,
+                0x22, 0x95, 0x98, 0xa5, 0xbe, 0x25, 0x48, 0xcf, 0x35, 0x84, 0x25, 0x18, 0xcc, 0x1d,
+                0xbc, 0x78, 0xcc, 0x2f, 0x0f, 0xc8, 0xea, 0x35, 0x7c, 0xe6, 0xc1, 0x7e, 0xb9, 0x7c,
+                0x61, 0x38, 0xd5, 0x3e, 0x6c, 0x8e, 0x00, 0xf0, 0x7f, 0x80, 0x01, 0x25, 0x18, 0x2b,
+                0x25, 0xa5, 0xe8, 0x75, 0xc5, 0x37, 0x72, 0x09, 0x52, 0x72, 0x22, 0x37, 0x1f, 0x72,
+                0xbf, 0xbd, 0x46, 0x28, 0x44, 0xab, 0x06, 0xf3, 0xb3, 0xa1, 0xeb, 0xa3, 0x44, 0x23,
+                0xb6, 0x9a, 0xbf, 0x5d, 0xe6, 0x64, 0xba, 0x83, 0xcd, 0x43, 0xb6, 0xa8, 0xe9, 0xd5,
+                0xb7, 0xc5, 0x2a, 0xdb, 0x86, 0x15, 0x04, 0x1b, 0x90, 0xd9, 0x08, 0x83, 0x1a, 0x6f,
+                0xf9, 0x2d, 0xb4, 0x8a, 0x14, 0xac, 0x4d, 0xfa, 0x67, 0xd0, 0x2c, 0x72, 0xe0, 0xc8,
+                0x63, 0x15, 0x7d, 0x98, 0xf8, 0xf5, 0x45, 0x37, 0x92, 0x97, 0x43, 0xc9, 0x69, 0xbc,
+                0x91, 0xc2, 0xc1, 0x37, 0x52, 0x04, 0x98, 0x3c, 0x99, 0x99, 0x97, 0x5f, 0xfa, 0x5e,
+                0xe5, 0xfe, 0x1f, 0x69, 0x71, 0x99, 0x40, 0x5f, 0x09, 0x66, 0xe3, 0x1f, 0x34, 0xe1,
+                0x52, 0x38, 0x44, 0x38, 0x18, 0x44, 0x98, 0x2b, 0x2c, 0x3b, 0x49, 0xa2, 0x09, 0xff,
+                0xa3, 0xce, 0xe9, 0x79, 0xa8, 0x5b, 0x19, 0xb8, 0x50, 0xf4, 0x1d, 0xcc, 0xc4, 0x63,
+                0xe2, 0x2e, 0x24, 0xa3, 0x04, 0x9d, 0x37, 0xb1, 0xfb, 0x37, 0x0d, 0xeb, 0xdd, 0xf4,
+                0xde, 0x05, 0x46, 0x24, 0x5e, 0x4f, 0x02, 0xa9, 0x84, 0x98, 0xaf, 0x53, 0x2e, 0x27,
+                0xac, 0xae, 0x5c, 0x7e, 0xd1, 0x43, 0xe6, 0xe9, 0xcc, 0xfa, 0x74, 0x35, 0x16, 0x02,
+                0x16, 0x57, 0xac, 0xb2, 0x5e, 0x44, 0x47, 0x84, 0x5c, 0x5f, 0x9c, 0x59, 0x64, 0x60,
+                0x7c, 0x4a, 0x78, 0x72, 0x1d, 0x98, 0x1a, 0x7f, 0xf2, 0xfd, 0xf6, 0xc0, 0x33, 0x62,
+                0x8b, 0xff, 0xd6, 0xf0, 0xb8, 0xde, 0x0c, 0xd6, 0x35, 0xec, 0x22, 0xf8, 0xb5, 0x0e,
+                0xd6, 0x37, 0xfe, 0x4e, 0x00, 0xf9, 0xd3, 0xc3, 0xd4, 0xf1, 0x81, 0x0b, 0x09, 0xb7,
+                0x5c, 0x96, 0xe2, 0xfc, 0xf1, 0x11, 0x85, 0x31, 0x7e, 0xdf, 0xa3, 0x9d, 0x19, 0x25,
+                0xde, 0xd8, 0x14, 0xdd, 0xe0, 0xef, 0x00, 0xa3, 0xfb, 0x47, 0xaf, 0x5d, 0x81, 0x20,
+                0x94, 0xaf, 0x13, 0xd0, 0x1c, 0x98, 0x56, 0x9f, 0xf7, 0x73, 0x57, 0x87, 0xfa, 0x9b,
+                0xd0, 0x1f, 0xa0, 0x69, 0x28, 0x27, 0x5f, 0xdd, 0x10, 0x38, 0x96, 0x5f, 0xb0, 0x6f,
+                0xb3, 0x5e, 0xdb, 0x73, 0x80, 0xdd, 0x3c, 0x42, 0x41, 0x9e, 0x0c, 0x0e, 0xde, 0x4c,
+                0x48, 0x6a, 0x9d, 0xb4, 0x95, 0x38, 0x86, 0xae, 0xc6, 0xad, 0x30, 0x70, 0x28, 0xeb,
+                0x26, 0xa3, 0x7e, 0xf4, 0x71, 0x56, 0x7a, 0xd4, 0xbd, 0x4e, 0xaa, 0xb7, 0xa8, 0x2c,
+                0xb0, 0xd6, 0xb5, 0xf0, 0x5e, 0x89, 0x4e, 0x53, 0x25, 0x82, 0x1d, 0x92, 0xbe, 0xd2,
+                0xb8, 0x6f, 0xb2, 0x43, 0x37, 0xd5, 0x79, 0x28, 0x8f, 0x6d, 0xf7, 0x34, 0x77, 0x1d,
+                0x9e, 0xf8, 0x35, 0x8b, 0xa9, 0x1a,
             ],
             ock: [
-                0xca, 0x6f, 0x98, 0xe6, 0xcf, 0x9f, 0xc3, 0x6a, 0xf5, 0xf6, 0x98, 0x82, 0x74, 0x2d,
-                0x06, 0xec, 0x5d, 0x29, 0xac, 0x2a, 0x02, 0x89, 0x44, 0xa2, 0x01, 0x89, 0xd5, 0x1c,
-                0x8a, 0x9b, 0xdc, 0xd6,
+                0xb6, 0x36, 0xc3, 0x9a, 0x6b, 0xad, 0x22, 0x63, 0xb2, 0x44, 0x1e, 0xd5, 0xbb, 0xdb,
+                0x01, 0x35, 0x88, 0xfb, 0x46, 0x27, 0x01, 0xe6, 0xf8, 0x76, 0x64, 0x6c, 0x8c, 0x17,
+                0xfa, 0x2e, 0xfd, 0xe8,
             ],
             op: [
                 0x82, 0xfe, 0xf6, 0x43, 0xdb, 0xf4, 0x2d, 0xca, 0x51, 0x56, 0xfb, 0x51, 0xd4, 0xc4,
                 0xee, 0x00, 0x8a, 0x72, 0xf0, 0xdb, 0xc3, 0xf3, 0x1e, 0xfa, 0xb0, 0x75, 0xf2, 0x75,
-                0x15, 0x37, 0x14, 0x0d, 0x59, 0xd1, 0x0a, 0x5b, 0x94, 0x15, 0x8a, 0x3f, 0x3a, 0x78,
-                0xb3, 0x5d, 0xa9, 0xc6, 0x27, 0xbe, 0xdf, 0x7c, 0xfb, 0x84, 0x7e, 0x3e, 0x59, 0x86,
-                0xec, 0x8a, 0xd7, 0xf7, 0x4c, 0xd9, 0xb2, 0x1b,
+                0x15, 0x37, 0x14, 0x0d, 0xc4, 0x92, 0x42, 0xce, 0xe7, 0xe0, 0x86, 0x8f, 0x2a, 0x75,
+                0xa1, 0xc4, 0x12, 0xbc, 0x44, 0xd5, 0x4c, 0x97, 0x09, 0xf6, 0x59, 0xde, 0xd3, 0x26,
+                0x95, 0x72, 0x92, 0x93, 0x59, 0xe0, 0x4c, 0x3a,
             ],
             c_out: [
-                0xa9, 0x5e, 0x1a, 0x22, 0x45, 0x65, 0x29, 0x5e, 0x9b, 0x55, 0x3a, 0xdd, 0xe8, 0xb0,
-                0x14, 0x47, 0x5c, 0x68, 0x7b, 0x5d, 0x13, 0x49, 0xc1, 0xdf, 0x8a, 0xd4, 0xb7, 0xcf,
-                0xd3, 0xdf, 0xc1, 0x00, 0x6c, 0x7c, 0x37, 0xde, 0x67, 0x6d, 0x6f, 0xde, 0x31, 0x8e,
-                0x2f, 0xdf, 0xcc, 0x2e, 0x2e, 0x23, 0x2c, 0xc5, 0xf8, 0x85, 0x28, 0x39, 0xe7, 0xef,
-                0xab, 0x8b, 0x20, 0x0e, 0xbc, 0x6a, 0x4d, 0xf8, 0x2a, 0x75, 0x21, 0xce, 0x0f, 0x38,
-                0x4f, 0xe2, 0x7a, 0x0d, 0xec, 0x59, 0xe9, 0xd2, 0xc0, 0xe3,
+                0x46, 0xba, 0x14, 0xf8, 0x3f, 0xf5, 0xab, 0x76, 0x0f, 0x14, 0x20, 0xeb, 0xde, 0xd9,
+                0x86, 0xfd, 0x93, 0x78, 0x27, 0xbc, 0x05, 0x69, 0x2e, 0xca, 0xdb, 0x65, 0x2e, 0xbb,
+                0xc8, 0xf6, 0xd9, 0xb5, 0x2e, 0xc3, 0x97, 0x87, 0xd8, 0xeb, 0xdd, 0x50, 0x6c, 0xa1,
+                0xa8, 0x5d, 0xc3, 0xd5, 0xba, 0x4c, 0x5b, 0x41, 0x52, 0x61, 0xb0, 0x75, 0x3a, 0xc1,
+                0x0e, 0x01, 0x86, 0x45, 0x32, 0xa3, 0x57, 0x2c, 0x68, 0xaf, 0xe4, 0x0a, 0xc3, 0xc0,
+                0x95, 0x7b, 0x7a, 0xfc, 0x23, 0xfd, 0x5e, 0x05, 0x17, 0xaa,
             ],
         },
         TestVector {
@@ -726,36 +723,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xfa, 0xde, 0x94, 0xfa, 0x0b, 0x46, 0xe3, 0xb1, 0xa5, 0x73, 0x34, 0x99, 0x34, 0xe2,
                 0x32, 0xb5, 0x0e, 0x96,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0x18, 0x89, 0x8e, 0x75, 0x21, 0x7b, 0x32, 0x9b, 0x3a, 0x56, 0x7b, 0x09, 0x37, 0x89,
-                0xa4, 0xd8, 0x19, 0xcd, 0xb0, 0x34, 0x88, 0xb8, 0x10, 0xda, 0x22, 0x0c, 0x3f, 0x59,
-                0xba, 0x03, 0x39, 0x26,
+                0xa9, 0x0a, 0x9b, 0x8a, 0xb1, 0x35, 0x9d, 0xc9, 0x6b, 0xda, 0xe9, 0x0e, 0x52, 0x74,
+                0x78, 0x8c, 0xb0, 0xc4, 0x26, 0xef, 0xf2, 0x60, 0x43, 0x61, 0x85, 0x39, 0x8b, 0xff,
+                0xf5, 0x0e, 0x92, 0x37,
             ],
             cmx: [
-                0x23, 0xad, 0xc3, 0xbf, 0x35, 0x0e, 0xb0, 0x84, 0xbd, 0x28, 0xbc, 0x2d, 0xcf, 0xb7,
-                0x98, 0x3f, 0xf6, 0xb3, 0xb6, 0xf2, 0xeb, 0x2d, 0x6f, 0x12, 0x4f, 0xfc, 0x46, 0x85,
-                0xab, 0xe8, 0xde, 0x3a,
+                0x05, 0xb5, 0xe3, 0x20, 0x76, 0xda, 0xe0, 0x94, 0x83, 0x35, 0xac, 0x3d, 0x65, 0x1c,
+                0x6d, 0xbe, 0xa6, 0x4c, 0xe9, 0x11, 0x42, 0x3e, 0x2f, 0x2c, 0x7c, 0x1b, 0xdf, 0xa6,
+                0xb1, 0x41, 0x41, 0x30,
             ],
             esk: [
-                0x34, 0x39, 0x22, 0x52, 0xc9, 0xcc, 0x9f, 0x45, 0x4b, 0x54, 0x2c, 0xf1, 0xb8, 0x88,
-                0xb3, 0xab, 0x02, 0xe6, 0x05, 0xa8, 0xda, 0x26, 0x10, 0x7d, 0x98, 0x02, 0xf1, 0x53,
-                0x6a, 0x9e, 0x9f, 0x2b,
+                0x8b, 0x14, 0x62, 0x2d, 0x2f, 0x91, 0xf1, 0x69, 0x8d, 0x53, 0xfe, 0x47, 0x9a, 0x1e,
+                0x5c, 0x00, 0x64, 0x98, 0xb9, 0x8b, 0x85, 0xb4, 0x50, 0xbd, 0x92, 0x3a, 0x5d, 0x00,
+                0xcb, 0x52, 0xa6, 0x13,
             ],
             ephemeral_key: [
-                0x91, 0xaf, 0x13, 0x8e, 0xd9, 0x95, 0x44, 0x66, 0x95, 0x16, 0x1b, 0x14, 0x2d, 0xc2,
-                0xde, 0x59, 0xac, 0x23, 0x05, 0xec, 0xbe, 0xc6, 0x29, 0x33, 0xf5, 0x2f, 0x2a, 0xa1,
-                0xf9, 0xb2, 0x71, 0x86,
+                0x86, 0xee, 0x66, 0xa6, 0xc7, 0xd9, 0xb5, 0xc4, 0xf0, 0xe2, 0xd2, 0xa0, 0xe1, 0x56,
+                0x1e, 0x2a, 0xfa, 0x55, 0x41, 0xa7, 0x24, 0xee, 0x02, 0x7f, 0xc7, 0x0b, 0xb7, 0xe8,
+                0x0a, 0x2c, 0x60, 0x98,
             ],
             shared_secret: [
-                0xe1, 0xd3, 0xaf, 0x73, 0x6a, 0xb9, 0xc6, 0x11, 0x6f, 0x46, 0x8f, 0x91, 0x66, 0x80,
-                0x63, 0x20, 0x35, 0x0f, 0x7e, 0x73, 0x51, 0x3b, 0xa6, 0x05, 0x50, 0xeb, 0x2d, 0xf0,
-                0x1f, 0xf7, 0x83, 0x2d,
+                0x88, 0xd1, 0x38, 0x2c, 0x14, 0x42, 0x02, 0xd0, 0xd7, 0x55, 0x75, 0x87, 0xb0, 0xd5,
+                0xd0, 0x21, 0x69, 0x29, 0x2a, 0x25, 0x05, 0x43, 0xcb, 0x0a, 0x06, 0xc3, 0x4f, 0x45,
+                0x2f, 0x7b, 0x3b, 0x36,
             ],
             k_enc: [
-                0xb4, 0x3e, 0x43, 0x3e, 0x16, 0x45, 0xeb, 0x51, 0x5e, 0x4a, 0x4c, 0x7d, 0x10, 0xc9,
-                0x3d, 0x08, 0xf2, 0xf1, 0xc3, 0x30, 0x95, 0xbf, 0x8c, 0x80, 0x0a, 0x04, 0x17, 0x62,
-                0xab, 0x5c, 0xf8, 0x2c,
+                0xe3, 0x73, 0xd8, 0x6e, 0xc9, 0xdd, 0xdd, 0x64, 0x5d, 0x9a, 0x6d, 0x06, 0xef, 0xce,
+                0x22, 0xb8, 0x96, 0x42, 0x1d, 0x57, 0xa4, 0x4d, 0x37, 0xa6, 0x50, 0x4a, 0x5d, 0x19,
+                0xdf, 0x21, 0x73, 0x73,
             ],
             p_enc: [
                 0x02, 0xaa, 0x14, 0x92, 0x9c, 0x57, 0x89, 0x85, 0x85, 0xce, 0x66, 0x5a, 0xfa, 0x3f,
@@ -801,68 +797,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x72, 0x65, 0x57, 0x53,
             ],
             c_enc: [
-                0x27, 0x62, 0x0d, 0xf5, 0xdb, 0x17, 0x76, 0x6e, 0xbd, 0x9a, 0x99, 0xd6, 0x9a, 0x9a,
-                0x49, 0x38, 0x73, 0x21, 0xf0, 0xc9, 0x47, 0x25, 0x23, 0x57, 0xb5, 0xb7, 0x48, 0x49,
-                0x38, 0xe3, 0xf5, 0xff, 0x9f, 0x32, 0x0e, 0x80, 0x6c, 0x4b, 0x54, 0xc3, 0x6e, 0x41,
-                0x2e, 0x8a, 0x6e, 0xad, 0xe3, 0x5b, 0x83, 0x01, 0xf7, 0x34, 0xf3, 0x71, 0x2e, 0x6a,
-                0xac, 0xe6, 0x99, 0xf5, 0x9e, 0x11, 0x2a, 0x7b, 0xf5, 0x44, 0x59, 0xdc, 0x5d, 0x9f,
-                0x7b, 0xbf, 0x3b, 0x9f, 0x74, 0x6c, 0x45, 0xbb, 0xed, 0x69, 0xa4, 0x25, 0x1b, 0x29,
-                0xf3, 0xd2, 0x15, 0xc2, 0x9f, 0x76, 0x1c, 0x7d, 0x05, 0x88, 0x19, 0xf0, 0xdd, 0x4e,
-                0x70, 0x71, 0xb0, 0x77, 0xcb, 0x00, 0xcb, 0x93, 0x62, 0xa4, 0x98, 0x16, 0x88, 0x0d,
-                0x49, 0xb7, 0x11, 0xf9, 0x20, 0x65, 0xf1, 0x53, 0x2e, 0x58, 0x18, 0x0b, 0xbd, 0xb4,
-                0x91, 0xdb, 0xbb, 0x96, 0x8a, 0x09, 0xb5, 0x63, 0xce, 0x1d, 0x29, 0x87, 0x6f, 0xd0,
-                0x52, 0x6d, 0x65, 0xda, 0x67, 0x27, 0xad, 0x40, 0xf9, 0x64, 0x02, 0xf9, 0x9a, 0xa5,
-                0xac, 0x06, 0x42, 0x51, 0xc4, 0x65, 0xe3, 0xc7, 0xdb, 0x1f, 0xfe, 0xef, 0xac, 0xd7,
-                0xf5, 0x1b, 0xa4, 0xf1, 0x9c, 0x6c, 0x17, 0x87, 0xa0, 0xff, 0xb4, 0x9d, 0xbb, 0x7b,
-                0x0a, 0x2b, 0x15, 0x64, 0x03, 0xd6, 0x6c, 0x22, 0x13, 0xe5, 0x1d, 0x58, 0xea, 0xef,
-                0xe8, 0x6d, 0x5d, 0xef, 0x0d, 0x24, 0xb7, 0xf2, 0xf8, 0xc1, 0x10, 0x32, 0x9a, 0x3a,
-                0x73, 0xcb, 0x33, 0x50, 0x14, 0x0e, 0x6b, 0xf7, 0x2c, 0xb6, 0xaa, 0x22, 0x2d, 0xef,
-                0x5a, 0x47, 0xe2, 0x1a, 0xf0, 0xb9, 0xae, 0xeb, 0x74, 0x8c, 0x01, 0xc6, 0x7a, 0xb6,
-                0xc9, 0xfd, 0x6e, 0x53, 0x6a, 0x0d, 0x92, 0x76, 0x61, 0x51, 0xb1, 0xac, 0x7c, 0xc9,
-                0x85, 0x5c, 0xa9, 0x8d, 0xea, 0x74, 0x85, 0x14, 0xef, 0xee, 0x89, 0xe8, 0x9a, 0x01,
-                0x68, 0xf5, 0xdd, 0xf4, 0xac, 0x2b, 0x7c, 0xe1, 0xc9, 0xc2, 0x92, 0xfb, 0xef, 0x2f,
-                0x45, 0x51, 0xa8, 0x88, 0xc3, 0x34, 0x5c, 0x65, 0x92, 0x30, 0x39, 0xfc, 0x21, 0xf7,
-                0x31, 0x55, 0x9b, 0xd9, 0x24, 0xbc, 0x2c, 0x15, 0x5b, 0xc0, 0xbe, 0x80, 0x38, 0x4a,
-                0x9e, 0x49, 0xbd, 0xa6, 0x9a, 0x70, 0x6b, 0x1a, 0xd6, 0xa2, 0x62, 0xab, 0xc6, 0x26,
-                0x50, 0x77, 0x2f, 0xd7, 0xea, 0xbc, 0x3f, 0x75, 0xa9, 0xac, 0xca, 0xa2, 0x8b, 0xcd,
-                0xea, 0x65, 0xf9, 0x4e, 0x16, 0xcc, 0x3d, 0x05, 0x38, 0xe5, 0x49, 0x86, 0x0a, 0x60,
-                0x12, 0x5b, 0xb4, 0xbc, 0x0c, 0x23, 0xe3, 0x22, 0x27, 0x68, 0x2c, 0x09, 0xb5, 0xaa,
-                0x30, 0x4a, 0x16, 0x09, 0x2a, 0xd4, 0xa3, 0xe2, 0xf6, 0x28, 0x3c, 0x38, 0x51, 0x80,
-                0x6e, 0x72, 0x17, 0x3f, 0x7d, 0x32, 0x97, 0xed, 0x92, 0xe5, 0x32, 0x40, 0x39, 0xa7,
-                0x31, 0x4f, 0x5f, 0xb7, 0x38, 0x6e, 0x09, 0x94, 0xf5, 0x2f, 0x8c, 0xcc, 0xf1, 0x87,
-                0xd6, 0x20, 0x41, 0x0c, 0xce, 0x9d, 0x0b, 0x91, 0x93, 0xac, 0xec, 0x6d, 0x4c, 0x9b,
-                0xd3, 0x4e, 0x08, 0x80, 0x58, 0x0a, 0xbe, 0xae, 0xd9, 0x7c, 0xb7, 0x80, 0x0f, 0x6a,
-                0xbc, 0x67, 0xc2, 0x5c, 0x49, 0x19, 0x2e, 0x37, 0xdc, 0xf3, 0x3d, 0x1a, 0x59, 0x16,
-                0x47, 0x5a, 0xe9, 0x99, 0x90, 0xd8, 0x29, 0xc1, 0xd5, 0x9e, 0x69, 0x2f, 0x47, 0x36,
-                0x93, 0xbc, 0xe3, 0x58, 0x5a, 0xec, 0xd3, 0xc1, 0x3b, 0xae, 0x15, 0xcb, 0xef, 0xf2,
-                0x98, 0x52, 0x2a, 0xab, 0xf4, 0x6b, 0xea, 0x3a, 0xbf, 0x63, 0x30, 0xa5, 0x6e, 0x37,
-                0x24, 0x51, 0x81, 0x32, 0xce, 0x94, 0x39, 0x41, 0x6a, 0x28, 0xe9, 0x52, 0x0d, 0xdf,
-                0x64, 0x17, 0x00, 0xb4, 0x6f, 0x37, 0x49, 0x50, 0xf3, 0x27, 0xaf, 0x3d, 0x0b, 0x3d,
-                0x3b, 0x3f, 0x61, 0xa8, 0x84, 0xcf, 0x4f, 0x82, 0x02, 0x56, 0xfb, 0x91, 0x65, 0xdc,
-                0xa0, 0xe4, 0x32, 0x60, 0xfc, 0xb5, 0x63, 0xef, 0x1a, 0xb4, 0xe7, 0x12, 0xef, 0x07,
-                0x23, 0xd6, 0x75, 0x90, 0xa4, 0xff, 0xc3, 0x66, 0xc4, 0xa7, 0x92, 0x50, 0x29, 0x93,
-                0x1b, 0xf0, 0x87, 0x3d, 0xac, 0xaa, 0xe9, 0x38, 0x5d, 0x9a, 0xd9, 0x1a, 0xed, 0x75,
-                0x93, 0x9d, 0x8b, 0xd1, 0xaf, 0x5d,
+                0xe7, 0x67, 0x81, 0xae, 0x63, 0x84, 0x1f, 0xff, 0xea, 0x30, 0x21, 0x96, 0x15, 0x94,
+                0xc2, 0x2a, 0x87, 0x20, 0xc7, 0xd8, 0xaa, 0x80, 0x8b, 0xc8, 0x6e, 0x71, 0xa3, 0x6a,
+                0xd7, 0xf8, 0x6f, 0xf8, 0x7c, 0x07, 0xd3, 0xc6, 0x50, 0xa0, 0x8e, 0x23, 0xe9, 0xb5,
+                0x4f, 0x00, 0xb4, 0x0b, 0xa0, 0x15, 0x91, 0x69, 0xdf, 0xca, 0x34, 0xc1, 0x40, 0xce,
+                0x93, 0x40, 0x19, 0xb2, 0xea, 0xa8, 0xea, 0x84, 0x35, 0x80, 0xb3, 0x5f, 0x14, 0xea,
+                0x51, 0x92, 0xde, 0x8a, 0x12, 0xf9, 0xab, 0xc9, 0x06, 0x10, 0x15, 0xe1, 0x47, 0x9e,
+                0xf9, 0x8d, 0x19, 0xa5, 0x34, 0xe9, 0xe4, 0x61, 0x64, 0xc3, 0xca, 0xc4, 0xeb, 0x54,
+                0x26, 0x4c, 0xed, 0xcd, 0x83, 0xaf, 0xc2, 0xac, 0x2e, 0x08, 0x7e, 0x39, 0xdf, 0xba,
+                0xe7, 0x6b, 0xd5, 0x50, 0xcc, 0x64, 0xa4, 0x04, 0xd2, 0x0c, 0x22, 0xca, 0x00, 0x3b,
+                0xf7, 0x5b, 0x12, 0xfb, 0xb8, 0xc7, 0x15, 0x13, 0x72, 0x70, 0x0b, 0x43, 0x9b, 0x3e,
+                0x06, 0x57, 0xec, 0xc3, 0x07, 0x70, 0x8f, 0xc3, 0x74, 0x94, 0xbd, 0x06, 0x39, 0xe8,
+                0xe1, 0xea, 0xea, 0x37, 0x8f, 0x27, 0xa1, 0x35, 0x74, 0xb7, 0x1f, 0xa4, 0x88, 0x3b,
+                0x80, 0x71, 0x2c, 0x7b, 0xeb, 0x5c, 0x30, 0x5f, 0x8d, 0x67, 0xe9, 0x19, 0x97, 0xf8,
+                0x03, 0x19, 0xdd, 0xb1, 0x15, 0xb9, 0x51, 0x23, 0x89, 0x7a, 0xae, 0x5f, 0x2d, 0x14,
+                0xff, 0xcf, 0xac, 0x7f, 0x65, 0x49, 0xca, 0x54, 0x8f, 0x6e, 0xab, 0xdf, 0x74, 0x81,
+                0x70, 0x27, 0xd4, 0x2d, 0x92, 0xd5, 0xcd, 0xf8, 0x8e, 0xd8, 0xd5, 0x11, 0xd1, 0xb5,
+                0xc4, 0x32, 0x2f, 0x77, 0x79, 0x74, 0x88, 0x6c, 0x0e, 0xd0, 0x13, 0x99, 0x18, 0x0a,
+                0xfa, 0x59, 0x7d, 0xd2, 0xb7, 0x7c, 0x58, 0xb2, 0x7c, 0x8a, 0x61, 0x20, 0x69, 0xe3,
+                0x86, 0xad, 0x63, 0x4c, 0xb0, 0x17, 0xa8, 0xe9, 0xf4, 0x8e, 0x37, 0xc4, 0x3e, 0xe8,
+                0x73, 0x3a, 0x0a, 0xcb, 0x69, 0xf8, 0xed, 0x9f, 0x6f, 0x30, 0x5f, 0x3b, 0xd1, 0xe9,
+                0x82, 0xb9, 0x4b, 0x1e, 0x51, 0xf4, 0xba, 0x98, 0x5b, 0x20, 0xec, 0x97, 0x4a, 0xc9,
+                0xa7, 0x93, 0xaa, 0x26, 0x4d, 0x61, 0x5b, 0x9d, 0xea, 0x48, 0x59, 0xa4, 0xd4, 0xca,
+                0xa7, 0x0d, 0x7a, 0x6b, 0x65, 0x30, 0x76, 0x85, 0xab, 0x53, 0x4e, 0x54, 0x55, 0x63,
+                0x1f, 0x6d, 0x68, 0xa4, 0x51, 0xd8, 0xaf, 0x2d, 0x41, 0x82, 0x52, 0x80, 0x0f, 0x68,
+                0x42, 0x31, 0xaf, 0xc2, 0x6d, 0x1f, 0xef, 0xc4, 0x03, 0xd7, 0x5f, 0x2e, 0x12, 0x0f,
+                0x5b, 0xe2, 0xb6, 0x74, 0x48, 0x60, 0x09, 0x26, 0x7c, 0xbc, 0x0c, 0xb0, 0x01, 0xbb,
+                0x47, 0xf0, 0xff, 0x46, 0x97, 0xea, 0xf5, 0x3d, 0xc9, 0x9c, 0x10, 0x77, 0x3a, 0x38,
+                0xcd, 0x06, 0xb4, 0x8b, 0xa3, 0x91, 0x19, 0xdb, 0x49, 0x84, 0xd0, 0x9a, 0x5b, 0xde,
+                0x13, 0x89, 0x0e, 0xa0, 0x61, 0x3d, 0x0c, 0xe0, 0x04, 0x3e, 0xae, 0x9a, 0x20, 0x89,
+                0x14, 0x1f, 0xd9, 0x46, 0x59, 0x13, 0xc1, 0xcc, 0x33, 0x27, 0xa5, 0x59, 0x42, 0xb9,
+                0xfd, 0x8f, 0xb8, 0x1c, 0x84, 0x7d, 0x8f, 0xdd, 0xf8, 0xbd, 0xba, 0xcf, 0xa0, 0xfb,
+                0x05, 0x52, 0xc1, 0xfe, 0x4c, 0xc4, 0xc0, 0x7f, 0x4d, 0xcf, 0x15, 0x1c, 0x5e, 0x74,
+                0xe8, 0xd6, 0x9b, 0x2b, 0x8b, 0xf7, 0xfd, 0x95, 0xec, 0xeb, 0x65, 0x5e, 0x00, 0x53,
+                0x58, 0x16, 0xd3, 0x8b, 0x4a, 0x28, 0xd4, 0xa9, 0xae, 0xeb, 0xb6, 0x9a, 0xb4, 0xdd,
+                0x12, 0xbf, 0x13, 0xfd, 0x5a, 0x45, 0x9b, 0x6b, 0xb6, 0x83, 0xff, 0xd9, 0xdd, 0x7b,
+                0x0d, 0x0c, 0xe7, 0x29, 0x67, 0x75, 0x80, 0x8a, 0x84, 0x3f, 0x3b, 0x8c, 0xc7, 0x89,
+                0xfd, 0x5f, 0x43, 0xe0, 0x84, 0xd8, 0x7d, 0x6a, 0xda, 0x8d, 0x1f, 0x28, 0xc2, 0x64,
+                0xe6, 0x44, 0xe9, 0xad, 0x96, 0x5c, 0x28, 0x08, 0x8a, 0x52, 0xe4, 0xb3, 0x56, 0x42,
+                0xf9, 0xb5, 0xe0, 0x66, 0x49, 0x90, 0x96, 0x3b, 0xc2, 0x3b, 0x9b, 0xb4, 0x8f, 0x46,
+                0x74, 0x73, 0x53, 0x58, 0x0e, 0xcc, 0x45, 0x20, 0xcf, 0xf1, 0xfa, 0x7f, 0x8f, 0xbc,
+                0x03, 0x0e, 0x64, 0x7d, 0xf1, 0x44, 0xee, 0x6c, 0xa5, 0xb3, 0x16, 0xb3, 0xaf, 0x90,
+                0x48, 0x9a, 0x80, 0x9d, 0x9c, 0x9f,
             ],
             ock: [
-                0x2a, 0xec, 0x11, 0xd4, 0xae, 0x79, 0x84, 0xe1, 0x69, 0xd1, 0xdf, 0xf1, 0xff, 0x0f,
-                0x9a, 0xf5, 0x19, 0x96, 0x34, 0x51, 0xa4, 0x1c, 0x9f, 0x5a, 0xdc, 0x58, 0xe4, 0xf9,
-                0x0a, 0xf3, 0x8d, 0x47,
+                0x85, 0x6e, 0x1a, 0x97, 0x09, 0xb0, 0xc4, 0x16, 0x93, 0x3f, 0x59, 0x70, 0x71, 0x5c,
+                0x56, 0xe2, 0xe0, 0x5c, 0x2e, 0xa9, 0x7d, 0x81, 0x51, 0x25, 0x70, 0x14, 0x79, 0xc3,
+                0x3a, 0x5d, 0x91, 0xcb,
             ],
             op: [
                 0x78, 0xa4, 0xe3, 0x39, 0x88, 0xd7, 0x1d, 0x71, 0x8e, 0x59, 0x55, 0x55, 0x28, 0x4c,
                 0x24, 0x9a, 0x62, 0xb7, 0x12, 0x88, 0x06, 0xa5, 0x4c, 0x3b, 0x36, 0xa3, 0xaa, 0x57,
-                0x14, 0x93, 0x16, 0x36, 0x34, 0x39, 0x22, 0x52, 0xc9, 0xcc, 0x9f, 0x45, 0x4b, 0x54,
-                0x2c, 0xf1, 0xb8, 0x88, 0xb3, 0xab, 0x02, 0xe6, 0x05, 0xa8, 0xda, 0x26, 0x10, 0x7d,
-                0x98, 0x02, 0xf1, 0x53, 0x6a, 0x9e, 0x9f, 0x2b,
+                0x14, 0x93, 0x16, 0x36, 0x8b, 0x14, 0x62, 0x2d, 0x2f, 0x91, 0xf1, 0x69, 0x8d, 0x53,
+                0xfe, 0x47, 0x9a, 0x1e, 0x5c, 0x00, 0x64, 0x98, 0xb9, 0x8b, 0x85, 0xb4, 0x50, 0xbd,
+                0x92, 0x3a, 0x5d, 0x00, 0xcb, 0x52, 0xa6, 0x13,
             ],
             c_out: [
-                0xe6, 0xeb, 0x22, 0x47, 0xc9, 0x33, 0xe2, 0x4c, 0x9d, 0xf1, 0x28, 0xb1, 0xe0, 0x4e,
-                0x8b, 0xc0, 0x5c, 0x65, 0xeb, 0x31, 0x97, 0xdf, 0x9b, 0xa8, 0x70, 0xd8, 0xa0, 0xa1,
-                0x8d, 0x9c, 0x24, 0xb7, 0xc9, 0x78, 0xc3, 0x4d, 0x3c, 0x7b, 0xbd, 0x21, 0xe8, 0x7b,
-                0x22, 0x39, 0x21, 0x87, 0x54, 0xd9, 0x67, 0x3a, 0x56, 0xa2, 0x73, 0x58, 0x0f, 0x6b,
-                0x41, 0xc6, 0x91, 0xe5, 0xfd, 0x30, 0x9c, 0xd5, 0xd1, 0xd2, 0x6d, 0x57, 0x63, 0xa9,
-                0xe8, 0xd2, 0x71, 0xc9, 0x77, 0x05, 0x0e, 0x05, 0xdc, 0x96,
+                0x72, 0x36, 0xea, 0xb9, 0xf0, 0x12, 0x98, 0xc8, 0x4f, 0x38, 0x28, 0xf6, 0xac, 0x15,
+                0x42, 0x76, 0xb5, 0xb7, 0x64, 0x62, 0xf5, 0x74, 0x2d, 0x69, 0xdc, 0x47, 0x7a, 0x10,
+                0x5d, 0xc2, 0x71, 0x1b, 0x12, 0xe9, 0xb5, 0x82, 0x8c, 0x01, 0x76, 0xfe, 0xf4, 0x4a,
+                0x54, 0x0f, 0x60, 0x95, 0x8e, 0x5a, 0x3e, 0xd6, 0xa2, 0xcc, 0x5e, 0xdd, 0xe9, 0x13,
+                0xd1, 0x4c, 0xf8, 0xe8, 0xe2, 0x8e, 0xa2, 0x5c, 0x18, 0x62, 0x7a, 0x84, 0xa2, 0xbe,
+                0x96, 0x1f, 0x44, 0x72, 0x67, 0x67, 0xe9, 0xf8, 0x43, 0x1b,
             ],
         },
         TestVector {
@@ -936,36 +932,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x72, 0x95, 0x89, 0xbe, 0x69, 0xd8, 0x28, 0xbe, 0x54, 0x30, 0x69, 0x16, 0x41, 0x3c,
                 0xd2, 0x50, 0x21, 0x17,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0x23, 0x39, 0xa8, 0x95, 0x29, 0xcf, 0x35, 0x7b, 0x06, 0x7d, 0xd2, 0x8b, 0xe4, 0x06,
-                0x6e, 0x16, 0x23, 0x6d, 0xc5, 0xd7, 0x87, 0x06, 0x14, 0x9a, 0x72, 0x8c, 0x3e, 0x3d,
-                0x9d, 0xc1, 0x08, 0x1c,
+                0x8d, 0x67, 0xe3, 0xba, 0x4d, 0xbc, 0x9d, 0xa5, 0xe8, 0x38, 0x23, 0xa1, 0x23, 0x11,
+                0x63, 0x96, 0x51, 0xa4, 0xff, 0xa9, 0x5f, 0x27, 0xc1, 0x83, 0x0d, 0x91, 0xd8, 0xb7,
+                0x3c, 0xfb, 0xf1, 0x31,
             ],
             cmx: [
-                0xe3, 0x04, 0xcf, 0x08, 0xc7, 0x86, 0xaf, 0xcb, 0x1d, 0x65, 0x2f, 0x7a, 0x94, 0x17,
-                0x29, 0x32, 0x01, 0x51, 0x71, 0x37, 0x93, 0x82, 0x89, 0x42, 0xcb, 0x88, 0xd0, 0x1f,
-                0x68, 0x60, 0x4e, 0x1f,
+                0xea, 0x7c, 0x13, 0xf7, 0xe1, 0x20, 0x5e, 0x78, 0xc8, 0xce, 0x4e, 0xe4, 0xfd, 0xcd,
+                0xb7, 0xee, 0x76, 0x92, 0x8d, 0xdf, 0x6d, 0xbe, 0x1b, 0x2d, 0x6f, 0x69, 0x81, 0xb7,
+                0xc9, 0x65, 0x79, 0x10,
             ],
             esk: [
-                0x0f, 0xba, 0x68, 0x76, 0xb3, 0x76, 0x5d, 0xff, 0x4f, 0x4c, 0x40, 0xaf, 0x89, 0x3e,
-                0x4b, 0xd1, 0x34, 0x3a, 0x53, 0x4c, 0xdf, 0x50, 0x20, 0x15, 0x6b, 0x5e, 0xd1, 0xf6,
-                0xbf, 0x62, 0xbe, 0x3c,
+                0x85, 0x7b, 0xa2, 0x47, 0xd4, 0x68, 0xe1, 0x8d, 0xfe, 0x96, 0x73, 0xe9, 0x05, 0x99,
+                0x23, 0xc2, 0x2e, 0x9b, 0x70, 0x0d, 0x56, 0x3d, 0xf8, 0xa9, 0x89, 0xcc, 0x63, 0x00,
+                0x06, 0x15, 0xb2, 0x0d,
             ],
             ephemeral_key: [
-                0xdf, 0xe0, 0xf0, 0x0e, 0xb2, 0xb2, 0xf7, 0x08, 0x04, 0x19, 0x1b, 0x5b, 0x2d, 0xdf,
-                0x57, 0x8f, 0x6a, 0xda, 0x21, 0x1b, 0x8b, 0x41, 0x7d, 0x95, 0xd2, 0xb7, 0x34, 0xff,
-                0xa2, 0x2d, 0x81, 0x30,
+                0x89, 0xfd, 0x2c, 0xf3, 0x79, 0x56, 0xba, 0xaf, 0x11, 0x27, 0xbb, 0x0e, 0x33, 0x40,
+                0x01, 0x09, 0xdb, 0x03, 0x50, 0xf4, 0xab, 0xb7, 0xd6, 0xd8, 0x1f, 0xa5, 0x84, 0x8e,
+                0x1b, 0xb1, 0x69, 0x26,
             ],
             shared_secret: [
-                0x0e, 0xc6, 0x82, 0xc8, 0xdc, 0x66, 0x41, 0x41, 0x02, 0x4f, 0x92, 0x9d, 0x1a, 0xe5,
-                0xd3, 0x9c, 0x39, 0x4d, 0x05, 0xa2, 0x4d, 0xad, 0x0e, 0x4a, 0x6f, 0x94, 0x98, 0xed,
-                0x5f, 0x87, 0xd4, 0x88,
+                0xdb, 0xa6, 0x37, 0x94, 0xb6, 0x7c, 0x49, 0x6d, 0x01, 0x1c, 0xfb, 0x6b, 0xba, 0x29,
+                0x7c, 0xa5, 0x7d, 0x18, 0xc7, 0xa9, 0xad, 0xdf, 0xfb, 0xc8, 0x37, 0x17, 0x6a, 0xcf,
+                0x3a, 0x30, 0x1e, 0x23,
             ],
             k_enc: [
-                0xb1, 0x24, 0x5f, 0xb6, 0x37, 0x47, 0xc0, 0x13, 0x39, 0xcd, 0xe8, 0xf9, 0x35, 0x98,
-                0xdf, 0xb2, 0xd3, 0x99, 0xec, 0x5e, 0x03, 0xbe, 0xa1, 0x3f, 0x3d, 0xbf, 0x01, 0xca,
-                0xdb, 0x93, 0xc9, 0xba,
+                0x80, 0xe7, 0x52, 0x2c, 0xb0, 0x32, 0x51, 0xc8, 0x55, 0x34, 0x1f, 0x06, 0xf9, 0x41,
+                0x33, 0x41, 0xe1, 0x6e, 0x83, 0xb4, 0x89, 0xe1, 0x5a, 0x0a, 0x00, 0x65, 0xc3, 0x3b,
+                0xf3, 0x81, 0x58, 0xc4,
             ],
             p_enc: [
                 0x02, 0xe0, 0x66, 0xb5, 0xe7, 0x96, 0x86, 0xe9, 0xf3, 0x6e, 0xce, 0xc7, 0x7e, 0x65,
@@ -1011,68 +1006,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xd7, 0x6b, 0xa4, 0x80,
             ],
             c_enc: [
-                0x31, 0xec, 0x78, 0xd4, 0x02, 0x14, 0xc1, 0xbc, 0x7b, 0x25, 0x94, 0x7b, 0x42, 0xf3,
-                0x54, 0x34, 0x60, 0x72, 0x90, 0x27, 0x7c, 0x44, 0xc4, 0x89, 0xe9, 0x38, 0x72, 0x2f,
-                0x7c, 0x12, 0xff, 0x55, 0xc4, 0xf1, 0xdf, 0xbe, 0x0f, 0x1a, 0x65, 0xb1, 0x5c, 0x0c,
-                0xc4, 0x7a, 0x46, 0xc9, 0xbb, 0x33, 0x5b, 0xd1, 0xa3, 0xe7, 0xe6, 0x62, 0xee, 0x85,
-                0x84, 0x57, 0x6b, 0x6f, 0x42, 0x81, 0x95, 0xc9, 0x8c, 0x72, 0xfb, 0x99, 0x75, 0xc7,
-                0x17, 0x9c, 0x4c, 0xab, 0x58, 0x66, 0xf5, 0xb4, 0x85, 0x42, 0x8b, 0x50, 0x8e, 0x2e,
-                0x05, 0xbe, 0x0c, 0x98, 0x41, 0xa3, 0xa2, 0x91, 0x12, 0x80, 0x2c, 0x52, 0x15, 0xe2,
-                0x51, 0x37, 0xcf, 0xdd, 0x13, 0x8c, 0x99, 0x39, 0x0e, 0xfb, 0xce, 0xb7, 0x52, 0x4e,
-                0x84, 0x7c, 0x36, 0xb4, 0x3f, 0x3e, 0xde, 0x32, 0xf2, 0x3b, 0x39, 0x81, 0xf6, 0xd3,
-                0xc3, 0x2b, 0x17, 0xbb, 0xbe, 0x65, 0xf2, 0xfd, 0x01, 0xab, 0xdd, 0x99, 0x87, 0xf1,
-                0xb8, 0x88, 0xeb, 0xef, 0x41, 0xef, 0x45, 0x55, 0xc9, 0xfb, 0x0c, 0x8a, 0xee, 0x9b,
-                0x6d, 0xd0, 0x85, 0xb9, 0xfb, 0xc7, 0x4f, 0xe4, 0x6a, 0x1e, 0x36, 0x3d, 0x68, 0x32,
-                0xb5, 0x08, 0x20, 0x0e, 0x50, 0x0d, 0xa6, 0x95, 0x13, 0xb7, 0x9e, 0x81, 0xf7, 0x33,
-                0xb6, 0x6c, 0x3f, 0x24, 0x3a, 0x28, 0x5b, 0xf8, 0x6f, 0xfe, 0xef, 0x4f, 0xfd, 0x1c,
-                0xac, 0xa7, 0x83, 0x07, 0x26, 0x63, 0xbf, 0x9b, 0x48, 0x7f, 0xbc, 0x3e, 0x7f, 0x5a,
-                0xd2, 0xf7, 0xac, 0xbf, 0x2b, 0x6e, 0x00, 0x8e, 0x3e, 0x4d, 0x6f, 0x31, 0xe1, 0x14,
-                0x75, 0xe1, 0x96, 0x98, 0x9d, 0xb9, 0x62, 0x8a, 0x5d, 0x56, 0x39, 0x7c, 0x9a, 0x04,
-                0x2a, 0xab, 0x55, 0xe1, 0xec, 0xc4, 0x92, 0xfe, 0x94, 0x27, 0xd4, 0x90, 0xf2, 0x73,
-                0xb6, 0x01, 0xd6, 0x51, 0x05, 0x56, 0x82, 0xd3, 0x5b, 0x30, 0x75, 0xfa, 0xda, 0x85,
-                0x25, 0x84, 0x48, 0x14, 0x95, 0x7f, 0xfc, 0x9b, 0xc7, 0xfb, 0x39, 0x39, 0x73, 0x7b,
-                0x01, 0x50, 0x2e, 0x0b, 0x6f, 0x1f, 0x9b, 0x88, 0xf2, 0x71, 0x54, 0x80, 0xae, 0x42,
-                0x2e, 0x9b, 0xb7, 0xb7, 0x6e, 0x5d, 0x22, 0xde, 0x0d, 0x3d, 0x7a, 0xea, 0x58, 0x10,
-                0x01, 0xdc, 0xf4, 0x6a, 0x62, 0x2f, 0x08, 0x03, 0x10, 0xbe, 0x50, 0xdf, 0x07, 0x75,
-                0x21, 0x92, 0xd4, 0xe4, 0x1a, 0xc5, 0x18, 0xe4, 0x24, 0x1e, 0x06, 0x67, 0x76, 0xa8,
-                0xea, 0xec, 0xc7, 0x42, 0xfd, 0x2c, 0x1b, 0xf0, 0x6f, 0xc5, 0x8b, 0xd2, 0x8d, 0x1d,
-                0x6c, 0x60, 0x1f, 0x91, 0x5d, 0x75, 0x2e, 0x7c, 0xc3, 0xd9, 0x76, 0x3c, 0x8b, 0x9e,
-                0xec, 0x14, 0x2c, 0x84, 0x81, 0xf9, 0xc5, 0x23, 0x59, 0xbf, 0xbf, 0x51, 0x24, 0x36,
-                0x67, 0x84, 0xe1, 0x71, 0xd7, 0xa4, 0xaa, 0x01, 0x5e, 0x85, 0x56, 0x47, 0x4a, 0x6d,
-                0x0f, 0xee, 0x69, 0xb0, 0xd5, 0x3e, 0xe7, 0xf4, 0xed, 0xf5, 0xea, 0x59, 0xfa, 0x55,
-                0x97, 0xf4, 0x8d, 0xd6, 0xaa, 0x88, 0x51, 0x84, 0x29, 0xac, 0x8c, 0x18, 0xc4, 0x73,
-                0x8d, 0xb8, 0x01, 0x09, 0xa5, 0xe4, 0xbc, 0x81, 0xbb, 0x84, 0xb3, 0x7d, 0x9b, 0x2a,
-                0xd4, 0xb1, 0xd2, 0x6b, 0x36, 0x3d, 0x16, 0x60, 0x72, 0xf0, 0x8c, 0x56, 0x70, 0x62,
-                0x27, 0xa9, 0xf8, 0x32, 0x97, 0x03, 0x70, 0x12, 0xd1, 0xf6, 0xda, 0x24, 0xa8, 0x69,
-                0xeb, 0x32, 0x97, 0xbc, 0xbc, 0xcc, 0x8d, 0x7d, 0xed, 0x03, 0x0a, 0x3d, 0x60, 0xdf,
-                0x88, 0x82, 0xe0, 0x62, 0x9e, 0x36, 0x14, 0x3c, 0x09, 0xca, 0x05, 0x21, 0x43, 0xcb,
-                0x56, 0x62, 0x93, 0x8f, 0xa9, 0xf1, 0x15, 0xdd, 0xc0, 0x96, 0x65, 0x4c, 0x0b, 0x40,
-                0x59, 0x4c, 0xba, 0x19, 0xee, 0xd4, 0x99, 0x53, 0x2b, 0x70, 0x8a, 0xde, 0xbe, 0x47,
-                0x72, 0x6a, 0x83, 0xaf, 0x46, 0x3c, 0x80, 0xba, 0x2a, 0x1f, 0xe0, 0x71, 0xe1, 0x66,
-                0xc4, 0x4d, 0x70, 0xdd, 0xbb, 0xba, 0x67, 0x06, 0xa1, 0xdc, 0x43, 0x27, 0x26, 0xfe,
-                0x0f, 0xdb, 0xc6, 0x28, 0x21, 0xb5, 0x04, 0xea, 0x11, 0x66, 0xda, 0x48, 0xa8, 0x1b,
-                0x63, 0x5e, 0x37, 0x63, 0x33, 0xd9, 0xbe, 0xfe, 0xc4, 0x93, 0xa0, 0x7d, 0xf4, 0x7b,
-                0xba, 0x0a, 0x2e, 0x2f, 0x65, 0xe7,
+                0x3f, 0x4e, 0x9b, 0x18, 0x56, 0xe7, 0xbf, 0xba, 0x7a, 0xbb, 0xc9, 0x4a, 0x72, 0xb4,
+                0xab, 0xb1, 0xd8, 0x46, 0x26, 0x79, 0x30, 0x77, 0xe8, 0x37, 0xda, 0xf3, 0x3f, 0xff,
+                0xa2, 0x7c, 0x7a, 0x33, 0x97, 0x8a, 0x54, 0x32, 0x51, 0x0d, 0x99, 0x3c, 0x7d, 0x92,
+                0x24, 0xc0, 0x97, 0xac, 0xc5, 0x25, 0x88, 0x1c, 0x76, 0x08, 0x3c, 0x1b, 0x65, 0x1a,
+                0x9d, 0xe1, 0xb5, 0xc1, 0xa6, 0xe0, 0x48, 0x2f, 0xae, 0x8f, 0x98, 0x6a, 0xb5, 0x9f,
+                0xa7, 0xcd, 0x43, 0x98, 0x99, 0x6e, 0x2b, 0xc0, 0x3a, 0xdc, 0xa9, 0x90, 0x32, 0x3b,
+                0xaa, 0xbd, 0xda, 0xae, 0x40, 0xb0, 0x56, 0xb7, 0xac, 0x17, 0xf8, 0x20, 0xd1, 0x1c,
+                0x0d, 0xec, 0xba, 0x14, 0xf2, 0x57, 0xa6, 0xcf, 0x09, 0x18, 0x19, 0x8f, 0x38, 0x9c,
+                0xdb, 0x29, 0x55, 0x77, 0x25, 0x96, 0x92, 0x7c, 0xbf, 0x55, 0x88, 0x56, 0x13, 0x35,
+                0xe7, 0xd6, 0x2e, 0x6a, 0x8a, 0xf7, 0xbc, 0x33, 0xb9, 0x9a, 0x55, 0xaf, 0xa1, 0xb7,
+                0xef, 0x20, 0xeb, 0x4e, 0xd6, 0xde, 0x89, 0x69, 0xd2, 0x9f, 0x04, 0x21, 0xcd, 0x4d,
+                0x99, 0x06, 0x66, 0xfd, 0xcf, 0x1e, 0xbd, 0x09, 0x06, 0x57, 0x02, 0x13, 0x4d, 0x31,
+                0xc3, 0x29, 0x26, 0xa3, 0x8b, 0x6b, 0x6b, 0x48, 0xfd, 0xc9, 0xb3, 0xc7, 0x64, 0xc3,
+                0xcd, 0x95, 0xb9, 0x72, 0xe7, 0x68, 0xeb, 0xd8, 0xaa, 0xe9, 0x0d, 0x6a, 0x4a, 0x98,
+                0xb2, 0xd9, 0x2f, 0xd9, 0xdf, 0xa2, 0xa2, 0x99, 0xd0, 0x60, 0xe8, 0x5e, 0xf5, 0x68,
+                0x3f, 0x51, 0xd0, 0x51, 0x4a, 0x6e, 0xba, 0x72, 0x57, 0x3f, 0x7b, 0xae, 0x84, 0xa2,
+                0xfd, 0x92, 0xbe, 0x64, 0x24, 0x1c, 0x27, 0xa6, 0xe5, 0xce, 0xac, 0xbf, 0x37, 0xb2,
+                0xd9, 0xa9, 0x75, 0xdf, 0x7a, 0xee, 0xbb, 0xa1, 0x4d, 0x8c, 0x81, 0x15, 0x8e, 0xcf,
+                0x5a, 0x0a, 0x25, 0xe1, 0x2f, 0x98, 0x5d, 0x08, 0xfb, 0xb4, 0xa1, 0xc1, 0x3f, 0x76,
+                0x1f, 0x3f, 0xfe, 0xe8, 0xd5, 0x38, 0xe3, 0x93, 0xf3, 0x58, 0x0b, 0x73, 0x82, 0xcd,
+                0x0b, 0xf5, 0x17, 0xce, 0x78, 0x87, 0x1c, 0x19, 0xac, 0xf8, 0xca, 0x06, 0x5d, 0x7c,
+                0x83, 0x87, 0xce, 0xcd, 0x0d, 0x37, 0xae, 0x21, 0x7f, 0x44, 0x06, 0x94, 0x77, 0x2a,
+                0xbd, 0x4b, 0x36, 0x55, 0x56, 0x85, 0x4b, 0xaa, 0x8b, 0xcc, 0xa9, 0xc4, 0xfe, 0xf7,
+                0x18, 0x99, 0x12, 0xf9, 0x8a, 0x25, 0x27, 0x68, 0x92, 0x76, 0xa4, 0x00, 0x8c, 0x83,
+                0x8f, 0xe7, 0x4f, 0x7c, 0x2b, 0x75, 0x9f, 0xc2, 0xab, 0x7a, 0xfe, 0x37, 0x82, 0x80,
+                0x6e, 0x31, 0xb1, 0xc5, 0x30, 0xcc, 0x46, 0x20, 0x3b, 0xb3, 0xa5, 0x66, 0xca, 0xf4,
+                0xd1, 0x5b, 0x99, 0x40, 0xb4, 0x3f, 0x33, 0xa8, 0x6a, 0x65, 0xd4, 0x9d, 0xa8, 0xb6,
+                0x78, 0x7d, 0xe0, 0x96, 0x38, 0xb4, 0x81, 0xf3, 0xa8, 0x10, 0x8a, 0x96, 0x9e, 0xca,
+                0xdf, 0x90, 0x98, 0xbf, 0xf2, 0x14, 0x0c, 0x4b, 0x42, 0xe2, 0xb0, 0xfb, 0x10, 0xb9,
+                0x02, 0x89, 0xb0, 0xc6, 0xdb, 0x8b, 0xc0, 0x85, 0xe8, 0xaf, 0xe9, 0x5d, 0xd3, 0x6a,
+                0x45, 0x36, 0xea, 0xd7, 0xe9, 0x5c, 0x99, 0x66, 0x2c, 0xd9, 0x28, 0xc2, 0x2c, 0x3e,
+                0xbf, 0x39, 0x79, 0x15, 0x78, 0xbc, 0x66, 0xfe, 0xa3, 0x01, 0x4d, 0x22, 0x92, 0x94,
+                0x30, 0x83, 0xe7, 0x46, 0x81, 0x24, 0x52, 0xb0, 0x0b, 0xc2, 0xf3, 0xe4, 0x7c, 0x49,
+                0x47, 0x46, 0xce, 0xd5, 0x57, 0xb1, 0x3a, 0xe3, 0x03, 0x0d, 0x8a, 0x95, 0x78, 0x10,
+                0x2b, 0xba, 0xd2, 0xfc, 0x3b, 0x84, 0x5f, 0x31, 0xae, 0x16, 0xf8, 0xd8, 0x0b, 0x77,
+                0xf8, 0x43, 0x15, 0x84, 0xa3, 0x7e, 0x8f, 0x30, 0xb0, 0xb9, 0x5c, 0xc4, 0x55, 0x5a,
+                0xbc, 0x05, 0x3a, 0x0b, 0x4f, 0xf9, 0x13, 0xb0, 0x03, 0x69, 0xf1, 0x74, 0x7b, 0x1f,
+                0x1c, 0x0a, 0xc8, 0x75, 0x4f, 0x01, 0x7e, 0x99, 0x47, 0xca, 0x63, 0x25, 0x5b, 0x3c,
+                0x23, 0xf4, 0x56, 0xe2, 0x3f, 0x96, 0x76, 0x13, 0x99, 0x60, 0x1f, 0xd8, 0xda, 0xdb,
+                0x5e, 0x3f, 0x90, 0xab, 0x1b, 0x20, 0x13, 0x81, 0x80, 0xed, 0x69, 0x73, 0x22, 0x39,
+                0xc8, 0xc2, 0x15, 0xd9, 0xcc, 0x8a, 0xc8, 0x05, 0x9b, 0xde, 0x81, 0x63, 0x27, 0xd2,
+                0x20, 0xb9, 0xa8, 0xec, 0xba, 0x5d,
             ],
             ock: [
-                0xec, 0xa3, 0x70, 0x7a, 0x74, 0x5d, 0x5d, 0x58, 0x65, 0x86, 0xb2, 0x35, 0xf2, 0x92,
-                0xad, 0x20, 0x48, 0x93, 0x14, 0xc4, 0x58, 0x80, 0xd9, 0x83, 0x2b, 0x7f, 0x47, 0xee,
-                0xbb, 0xd4, 0x5c, 0xfe,
+                0xe6, 0xb7, 0x05, 0x50, 0xe1, 0xd7, 0xa2, 0xbe, 0x73, 0x04, 0x39, 0x64, 0x41, 0xec,
+                0x6a, 0xc0, 0x47, 0x45, 0x99, 0xf9, 0xea, 0xd7, 0x55, 0xc2, 0xcf, 0x27, 0x6b, 0x87,
+                0x50, 0xc5, 0xcf, 0x2d,
             ],
             op: [
                 0x3b, 0x3e, 0x88, 0x3e, 0x95, 0x8c, 0xd6, 0xe0, 0x75, 0x4d, 0x74, 0xca, 0xae, 0x1e,
                 0x5a, 0x43, 0x98, 0xab, 0xeb, 0x7d, 0x10, 0xee, 0x5f, 0x75, 0xa4, 0xab, 0x8e, 0xf7,
-                0x03, 0x8e, 0x3d, 0xb3, 0x0f, 0xba, 0x68, 0x76, 0xb3, 0x76, 0x5d, 0xff, 0x4f, 0x4c,
-                0x40, 0xaf, 0x89, 0x3e, 0x4b, 0xd1, 0x34, 0x3a, 0x53, 0x4c, 0xdf, 0x50, 0x20, 0x15,
-                0x6b, 0x5e, 0xd1, 0xf6, 0xbf, 0x62, 0xbe, 0x3c,
+                0x03, 0x8e, 0x3d, 0xb3, 0x85, 0x7b, 0xa2, 0x47, 0xd4, 0x68, 0xe1, 0x8d, 0xfe, 0x96,
+                0x73, 0xe9, 0x05, 0x99, 0x23, 0xc2, 0x2e, 0x9b, 0x70, 0x0d, 0x56, 0x3d, 0xf8, 0xa9,
+                0x89, 0xcc, 0x63, 0x00, 0x06, 0x15, 0xb2, 0x0d,
             ],
             c_out: [
-                0xd0, 0x65, 0x9a, 0x03, 0xc5, 0x3e, 0x15, 0xdc, 0x11, 0x01, 0xa6, 0x6e, 0xa8, 0x0d,
-                0xf4, 0x14, 0x4d, 0x5e, 0xe0, 0x1c, 0x3d, 0xbf, 0x20, 0x2c, 0xe6, 0x08, 0x7e, 0x96,
-                0xa8, 0x5a, 0xe1, 0x39, 0xdd, 0x46, 0xfc, 0x82, 0xa1, 0xc3, 0x7d, 0x06, 0x05, 0xf8,
-                0x49, 0x98, 0x53, 0x13, 0x16, 0xf1, 0xf0, 0xcb, 0xc0, 0x4e, 0xa2, 0x0a, 0xa4, 0x04,
-                0xb3, 0xd5, 0xb0, 0x42, 0x96, 0x01, 0x49, 0x81, 0x6d, 0x9b, 0x8f, 0x06, 0x2a, 0xfc,
-                0xc1, 0x93, 0x89, 0x43, 0x82, 0x7a, 0x1b, 0x43, 0xfc, 0xbd,
+                0x02, 0xb1, 0x37, 0x3e, 0xb1, 0x89, 0x56, 0x32, 0x2b, 0x47, 0xa1, 0x70, 0x0d, 0xb7,
+                0x43, 0x31, 0x6e, 0xde, 0x46, 0x44, 0xd6, 0x59, 0x3c, 0xd7, 0x94, 0x22, 0xd7, 0x51,
+                0x3d, 0x1b, 0x80, 0xe6, 0x85, 0x05, 0xdf, 0xe9, 0xd6, 0x86, 0x2e, 0x79, 0x4e, 0x30,
+                0x28, 0x8b, 0xae, 0xa8, 0xb0, 0xbc, 0xb3, 0x8b, 0x35, 0x49, 0x77, 0xaa, 0xee, 0x57,
+                0x2e, 0xe8, 0x86, 0x8b, 0x2d, 0xa0, 0x7d, 0xa2, 0x99, 0x2c, 0x6d, 0x9f, 0xb8, 0xbd,
+                0x59, 0x0b, 0x8d, 0xa0, 0x28, 0x11, 0xb5, 0x09, 0xe8, 0xc6,
             ],
         },
         TestVector {
@@ -1146,36 +1141,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x6e, 0x62, 0xe4, 0xed, 0xc7, 0x86, 0xd9, 0xe0, 0xb2, 0x7d, 0x26, 0x62, 0x8b, 0x79,
                 0xda, 0x6b, 0x15, 0x14,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0xe5, 0xd0, 0x8c, 0x40, 0x26, 0x3e, 0x4a, 0x2a, 0x56, 0x96, 0xda, 0x21, 0x0d, 0x8e,
-                0x9a, 0x77, 0xf0, 0xaf, 0xc4, 0xc6, 0x8a, 0x6d, 0xda, 0x38, 0xe2, 0x85, 0xf4, 0xe3,
-                0xef, 0x13, 0xb8, 0x17,
+                0x9a, 0x09, 0xe4, 0x72, 0xe8, 0xe9, 0x96, 0xfc, 0xc3, 0x0e, 0xd5, 0x23, 0x72, 0x08,
+                0xdb, 0xb0, 0x01, 0x71, 0x32, 0x0e, 0x6b, 0xea, 0x43, 0x91, 0x86, 0x00, 0x9d, 0xad,
+                0x21, 0x38, 0xab, 0x29,
             ],
             cmx: [
-                0xad, 0xc2, 0x44, 0x3a, 0xf9, 0x57, 0x67, 0x47, 0xca, 0x4f, 0x10, 0x4b, 0x1f, 0x5a,
-                0x7a, 0xdc, 0x80, 0x5a, 0xc5, 0x5a, 0xcc, 0x56, 0x33, 0xa0, 0xb3, 0xc2, 0xdc, 0x7a,
-                0xad, 0xff, 0x21, 0x26,
+                0x18, 0xfc, 0xbd, 0x40, 0xac, 0xf1, 0xa7, 0xf4, 0xd6, 0x09, 0x87, 0x9a, 0x5f, 0x5e,
+                0x3b, 0x39, 0x70, 0x09, 0x4f, 0xf8, 0xbe, 0x84, 0x18, 0x60, 0x70, 0x16, 0xc6, 0xa6,
+                0x97, 0xf8, 0x9c, 0x20,
             ],
             esk: [
-                0x24, 0x75, 0x30, 0x5c, 0x35, 0xcf, 0x37, 0xeb, 0xd2, 0x77, 0x82, 0x35, 0x16, 0x58,
-                0x5a, 0xfa, 0x06, 0x05, 0x78, 0x52, 0x17, 0x1e, 0x0c, 0xe4, 0xb0, 0x52, 0xd5, 0xb4,
-                0x20, 0x41, 0xd8, 0x1c,
+                0x3b, 0xc1, 0x7a, 0x58, 0x0d, 0x53, 0x0f, 0x89, 0x30, 0xa3, 0x6b, 0x8d, 0x6f, 0xea,
+                0x67, 0x85, 0x7f, 0x7b, 0x85, 0x20, 0xfd, 0x2e, 0x0a, 0xb5, 0xd5, 0xcb, 0xab, 0x1a,
+                0xcc, 0xd5, 0x4e, 0x3a,
             ],
             ephemeral_key: [
-                0x00, 0x5d, 0x31, 0x5b, 0xd1, 0x80, 0xa2, 0x94, 0x0b, 0xd7, 0xfb, 0x34, 0xa7, 0x0e,
-                0x90, 0xe8, 0x32, 0x6c, 0xb1, 0x34, 0x30, 0x66, 0x05, 0x46, 0x53, 0xd2, 0x64, 0x4d,
-                0x20, 0x45, 0xe3, 0x0f,
+                0xcf, 0xe0, 0x3e, 0xb2, 0xd3, 0x36, 0x76, 0xb7, 0x73, 0x83, 0x7d, 0xa8, 0x39, 0x17,
+                0x2d, 0x33, 0x33, 0x31, 0x88, 0xc9, 0xdf, 0xef, 0x05, 0xc8, 0x32, 0xa2, 0x5c, 0x86,
+                0xd3, 0xbf, 0x0e, 0x8f,
             ],
             shared_secret: [
-                0x8e, 0x59, 0x0d, 0x06, 0x3f, 0x7e, 0xc3, 0x8e, 0xb2, 0x00, 0x84, 0x70, 0xf9, 0xbb,
-                0x42, 0x29, 0x04, 0xfc, 0x0b, 0xaf, 0x97, 0x80, 0xf8, 0xfd, 0x1f, 0x54, 0x22, 0xea,
-                0x30, 0x8c, 0x47, 0xba,
+                0xd2, 0xc2, 0x88, 0x9e, 0x03, 0x7e, 0xac, 0x60, 0x60, 0x58, 0x68, 0x2b, 0xaa, 0x38,
+                0x86, 0xa4, 0xc2, 0xdd, 0x44, 0xea, 0xdf, 0x8b, 0x2c, 0xe4, 0x39, 0x95, 0xde, 0xd7,
+                0x61, 0xfd, 0xaf, 0xb5,
             ],
             k_enc: [
-                0xeb, 0xb2, 0xff, 0x9b, 0x1f, 0x29, 0x0d, 0xa5, 0x63, 0x27, 0xa9, 0x67, 0x71, 0xb2,
-                0x5f, 0x71, 0x29, 0xff, 0x10, 0x2e, 0xe6, 0xd2, 0xb2, 0x0d, 0xa0, 0x9a, 0x06, 0x25,
-                0xf8, 0xbb, 0x26, 0x07,
+                0xfe, 0xe3, 0xe3, 0xb5, 0xfd, 0x6c, 0xd8, 0x54, 0x44, 0x2b, 0x2a, 0xc2, 0x97, 0x70,
+                0xfb, 0x0e, 0x39, 0x32, 0xf4, 0x71, 0x52, 0x43, 0x26, 0xda, 0x4a, 0x57, 0xc2, 0x56,
+                0x18, 0x06, 0x9e, 0x99,
             ],
             p_enc: [
                 0x02, 0x1c, 0xa7, 0xb6, 0x49, 0x39, 0x9e, 0x13, 0xe4, 0x39, 0x44, 0x62, 0x91, 0x20,
@@ -1221,68 +1215,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x34, 0x1e, 0x4e, 0x6f,
             ],
             c_enc: [
-                0x96, 0x3b, 0xe3, 0x6e, 0xdc, 0xa4, 0x8b, 0x7c, 0x4a, 0x1c, 0xd6, 0xa1, 0x37, 0x2e,
-                0x84, 0xc0, 0x54, 0x54, 0x83, 0x4c, 0x5e, 0xe1, 0x92, 0x5e, 0xed, 0xeb, 0x48, 0xda,
-                0x16, 0x77, 0x79, 0xe3, 0x99, 0x83, 0x58, 0xcb, 0x92, 0x7a, 0x0a, 0x0b, 0x36, 0x9c,
-                0x85, 0xee, 0xb3, 0x30, 0xf7, 0x00, 0x5c, 0x26, 0x9d, 0x0b, 0xe4, 0xf2, 0x38, 0x09,
-                0x57, 0xb1, 0x62, 0x97, 0x7c, 0xae, 0x7a, 0x7b, 0x1d, 0x0b, 0xe5, 0xd0, 0xb7, 0x03,
-                0xd3, 0x92, 0xac, 0xae, 0xd2, 0x4f, 0x52, 0x5b, 0x83, 0xcf, 0xdd, 0x7f, 0x35, 0xc1,
-                0xf1, 0x74, 0xbf, 0x06, 0x6b, 0x7a, 0xfd, 0xb7, 0x45, 0xed, 0xbe, 0xdc, 0x0b, 0x46,
-                0xa5, 0x91, 0x36, 0x21, 0x47, 0x61, 0x9d, 0x6b, 0xd3, 0xf3, 0xce, 0x6b, 0x45, 0x23,
-                0xf0, 0x64, 0x9a, 0x7c, 0x65, 0x32, 0x2d, 0x05, 0xfa, 0xe2, 0x22, 0x70, 0x1a, 0x8c,
-                0xd6, 0xca, 0xbf, 0x8d, 0xc3, 0x2f, 0x05, 0x5f, 0xeb, 0x14, 0x1e, 0x55, 0x6d, 0xdf,
-                0xb1, 0x98, 0x30, 0xb7, 0x20, 0x4c, 0x30, 0x98, 0x4e, 0xdd, 0xf4, 0x34, 0xec, 0xc5,
-                0xf0, 0xea, 0x82, 0x5c, 0xf8, 0xd9, 0xd5, 0x03, 0x8f, 0x28, 0xe2, 0x3e, 0xf3, 0x6b,
-                0xa9, 0x38, 0x52, 0xe5, 0x8e, 0x85, 0xf8, 0x90, 0xb1, 0x77, 0x5c, 0x6d, 0x4c, 0x13,
-                0x5b, 0xef, 0x0e, 0x2a, 0x19, 0x33, 0x02, 0xd9, 0x0a, 0x80, 0x4c, 0x85, 0x31, 0x25,
-                0xaa, 0x5b, 0x11, 0x6f, 0x8c, 0x58, 0x0e, 0xb6, 0x54, 0xfe, 0x35, 0xe6, 0x73, 0x79,
-                0x9e, 0x93, 0xcf, 0x58, 0xfe, 0x1e, 0x70, 0xcd, 0xe1, 0x19, 0xab, 0x58, 0x6c, 0x12,
-                0xc4, 0x95, 0x75, 0xe6, 0x1a, 0xc4, 0xb7, 0x71, 0xfa, 0x8e, 0xbf, 0x76, 0xca, 0x95,
-                0xd6, 0x51, 0xa4, 0xba, 0x87, 0x3b, 0x24, 0xcf, 0x97, 0xff, 0x75, 0x5b, 0xc7, 0x49,
-                0xf4, 0x09, 0x6d, 0x2d, 0xa1, 0x5c, 0xf8, 0x30, 0x36, 0xcc, 0x22, 0x0f, 0x0a, 0x68,
-                0x93, 0x43, 0x21, 0xc9, 0xae, 0x33, 0x4e, 0x2d, 0x99, 0xa9, 0x95, 0xe9, 0x29, 0x04,
-                0xc1, 0x45, 0x23, 0x33, 0x19, 0x00, 0xcb, 0xca, 0x20, 0x4a, 0xdc, 0xb6, 0x93, 0x9d,
-                0xc1, 0x71, 0x87, 0x53, 0x53, 0xa1, 0x1e, 0x12, 0xba, 0xcb, 0x2a, 0xab, 0x0f, 0x57,
-                0x17, 0x9f, 0x1b, 0x67, 0xea, 0xcc, 0x7e, 0x7b, 0x6c, 0x5c, 0xc8, 0xa3, 0x78, 0x64,
-                0x9b, 0x62, 0xb8, 0x52, 0xfa, 0x47, 0x6f, 0x93, 0x37, 0x88, 0x59, 0xd0, 0xd9, 0xa3,
-                0x03, 0x3d, 0xa1, 0x31, 0x28, 0x17, 0x57, 0xad, 0x98, 0x5c, 0x86, 0xfe, 0x03, 0x7a,
-                0x4e, 0xdd, 0x0a, 0x4a, 0x49, 0xee, 0x5c, 0x4f, 0x48, 0x15, 0xf0, 0x14, 0x73, 0xb9,
-                0x60, 0xa1, 0x8a, 0x3b, 0x7f, 0x75, 0x07, 0xee, 0x3d, 0x8b, 0x39, 0x5a, 0x76, 0x68,
-                0x40, 0x95, 0x5b, 0xaa, 0xdd, 0x0a, 0xbb, 0xf4, 0xf5, 0x91, 0x4e, 0x92, 0x10, 0xf5,
-                0x9e, 0x4c, 0xd1, 0x3c, 0x82, 0xe0, 0xac, 0xf8, 0x79, 0x51, 0x78, 0x02, 0x91, 0xd0,
-                0xa9, 0xa7, 0x0f, 0x6b, 0x4f, 0xf5, 0x0d, 0x81, 0x0d, 0x50, 0x90, 0x20, 0x45, 0x30,
-                0xad, 0x69, 0x44, 0xb1, 0x3d, 0x23, 0x83, 0xab, 0xca, 0x42, 0x0c, 0xb6, 0xd9, 0xfc,
-                0xd8, 0xfd, 0xcb, 0xe9, 0xb3, 0xb5, 0xf4, 0x2f, 0x0a, 0xf5, 0xdf, 0x36, 0x37, 0x8c,
-                0xe7, 0x3d, 0xc9, 0x06, 0x16, 0x7d, 0xd4, 0xb3, 0x80, 0x41, 0x8f, 0x17, 0xe4, 0x50,
-                0x61, 0x18, 0x57, 0x23, 0xda, 0xbb, 0x6f, 0xfd, 0xbb, 0xd5, 0xa4, 0x18, 0xc3, 0xc6,
-                0xfd, 0x33, 0x70, 0x34, 0x09, 0x94, 0x27, 0x7b, 0x88, 0x8e, 0xe4, 0x9b, 0x08, 0x91,
-                0xbb, 0xb9, 0x4b, 0x6b, 0x8b, 0x06, 0x5f, 0xd1, 0x92, 0x00, 0xdc, 0x3a, 0x68, 0x1c,
-                0xa5, 0xff, 0x2a, 0x98, 0x8f, 0xa6, 0x6d, 0x02, 0x9d, 0xdd, 0xf9, 0xb0, 0x3a, 0x5e,
-                0x6c, 0x6e, 0x99, 0xb6, 0x35, 0x41, 0x15, 0x6a, 0x09, 0x51, 0xd9, 0x08, 0x7d, 0xd8,
-                0x83, 0xd5, 0x13, 0x9e, 0xe6, 0x7a, 0x8c, 0xe5, 0xdd, 0x6e, 0xf1, 0x4c, 0x9a, 0x10,
-                0xdb, 0x81, 0x8b, 0x93, 0x69, 0x02, 0xc7, 0x99, 0x93, 0x90, 0xf9, 0x72, 0xba, 0xfa,
-                0x5a, 0x57, 0x2f, 0xc8, 0x73, 0x42, 0xe2, 0xc5, 0x1c, 0xeb, 0x80, 0x30, 0xe0, 0x6b,
-                0x72, 0x40, 0x95, 0xf9, 0x8d, 0x7b,
+                0xbe, 0x1d, 0xff, 0xd3, 0x37, 0x0c, 0x67, 0x56, 0x69, 0xcc, 0x9a, 0xe1, 0xd0, 0x30,
+                0x2d, 0x7f, 0x90, 0x6d, 0x25, 0x23, 0x09, 0x3c, 0x24, 0xf4, 0x25, 0x7a, 0x83, 0xbc,
+                0x4f, 0x36, 0x62, 0x3a, 0x08, 0x2c, 0xe6, 0xeb, 0x45, 0x21, 0x95, 0x71, 0x91, 0xd5,
+                0x7e, 0x14, 0x11, 0xed, 0xe7, 0x1d, 0x44, 0xb5, 0x6c, 0x57, 0xcb, 0x22, 0x81, 0x4a,
+                0x04, 0x69, 0x39, 0xd2, 0xff, 0xf9, 0x2b, 0x46, 0x62, 0x76, 0x2d, 0x4f, 0x21, 0xc0,
+                0x78, 0x42, 0x74, 0x72, 0xb9, 0x18, 0x10, 0x10, 0x55, 0x56, 0xf4, 0xde, 0x0a, 0x27,
+                0xe7, 0x70, 0x08, 0x47, 0x72, 0xcb, 0xfe, 0xbf, 0x87, 0xdb, 0x33, 0x14, 0xab, 0x70,
+                0xf2, 0x6d, 0x11, 0xea, 0x5d, 0xe2, 0x67, 0xc3, 0xa9, 0xa8, 0xf4, 0x6b, 0xad, 0x13,
+                0xc7, 0x36, 0x26, 0x10, 0xbd, 0xba, 0x81, 0x02, 0xd4, 0xb7, 0x26, 0xef, 0x26, 0xec,
+                0x79, 0x4a, 0x15, 0x66, 0x57, 0x1b, 0xfd, 0xc1, 0x02, 0x47, 0x7d, 0xa5, 0xb4, 0x9b,
+                0xbf, 0x9f, 0xe4, 0xb1, 0xa4, 0x4e, 0xd0, 0xb3, 0xbc, 0xed, 0x99, 0xba, 0x81, 0x9a,
+                0x4f, 0x30, 0x22, 0x65, 0x49, 0x44, 0x5b, 0xc6, 0x1c, 0xff, 0x5c, 0x33, 0x16, 0x33,
+                0x5f, 0x6b, 0xd4, 0xa9, 0xa4, 0x24, 0xc9, 0x4a, 0xe0, 0xb5, 0xcb, 0xe4, 0x8a, 0xfb,
+                0x2b, 0x94, 0xd0, 0xc7, 0xe4, 0x4e, 0x32, 0x30, 0x95, 0xa7, 0x2e, 0x42, 0x64, 0xe9,
+                0x1c, 0x48, 0x94, 0xb9, 0xe8, 0x45, 0xaf, 0x32, 0x35, 0x02, 0xda, 0xe8, 0xc1, 0x86,
+                0x78, 0xa4, 0xf7, 0x40, 0xe5, 0xa6, 0x3a, 0x4c, 0x70, 0x29, 0x92, 0xfa, 0xcd, 0xd3,
+                0x57, 0x35, 0xb1, 0xd1, 0x34, 0x8b, 0x91, 0x9c, 0x70, 0x0c, 0x42, 0xd3, 0x30, 0xd3,
+                0x86, 0xaf, 0xb8, 0x73, 0xfa, 0xba, 0xd8, 0xcb, 0x32, 0x18, 0x15, 0x1b, 0x40, 0x18,
+                0x01, 0xe3, 0x69, 0x34, 0x4f, 0xf2, 0x0a, 0xaa, 0x66, 0x73, 0x47, 0x4f, 0x4b, 0xfc,
+                0x98, 0xd0, 0x7e, 0x36, 0x7b, 0xc4, 0x2e, 0xf1, 0xa0, 0x4f, 0xa1, 0xbc, 0x12, 0x52,
+                0x18, 0x8d, 0xd9, 0xd3, 0xe0, 0x00, 0xe3, 0xf5, 0xe9, 0xdf, 0xc9, 0xe1, 0x3e, 0xe9,
+                0xdb, 0x55, 0x04, 0x0d, 0x17, 0x22, 0x7d, 0xa4, 0x4a, 0x3e, 0x08, 0xfd, 0x5e, 0xc8,
+                0x58, 0xc4, 0x9c, 0x2e, 0x6a, 0x71, 0x1f, 0x8e, 0x68, 0xd0, 0xa1, 0xdf, 0x88, 0xef,
+                0x09, 0x40, 0xf7, 0x2e, 0xd7, 0x3e, 0xf4, 0x9e, 0x8a, 0x45, 0xae, 0x2e, 0x5e, 0x1b,
+                0xf1, 0x37, 0xba, 0x58, 0xcf, 0xb9, 0x25, 0x79, 0xab, 0xb2, 0xa4, 0x93, 0x13, 0xa2,
+                0xff, 0x3d, 0xb6, 0x16, 0x93, 0xd2, 0xb7, 0x58, 0xaf, 0x20, 0x47, 0x2a, 0xc6, 0x40,
+                0x6b, 0xa3, 0x55, 0xb4, 0x8c, 0xee, 0x22, 0xe7, 0x0f, 0xb8, 0xf9, 0xd4, 0x8e, 0xa3,
+                0x93, 0x4b, 0x62, 0x24, 0xac, 0xe2, 0x69, 0xb9, 0xef, 0x54, 0x6d, 0xbf, 0xc5, 0x2a,
+                0xbe, 0xcf, 0xac, 0x59, 0x40, 0xf0, 0x40, 0xbd, 0x21, 0xe9, 0x0e, 0xfa, 0x82, 0x75,
+                0x56, 0x1a, 0x88, 0xbc, 0x18, 0xe2, 0x6b, 0x98, 0x8d, 0x11, 0x79, 0xb7, 0xa2, 0xc3,
+                0xaf, 0xd8, 0x6e, 0xf2, 0xa0, 0x90, 0x62, 0x52, 0x23, 0x23, 0x4b, 0x39, 0xc9, 0xe2,
+                0x06, 0x8d, 0x94, 0x5d, 0xd7, 0x76, 0x3b, 0x01, 0x0c, 0x28, 0xc8, 0x9b, 0x72, 0xe2,
+                0x55, 0x13, 0xb3, 0x9c, 0x3c, 0xe1, 0x17, 0x73, 0x42, 0x8a, 0xd3, 0x44, 0xe1, 0xd5,
+                0xd5, 0x1b, 0x92, 0x00, 0x14, 0xf9, 0x17, 0x06, 0xff, 0xae, 0x3d, 0x86, 0x36, 0x14,
+                0x77, 0xfd, 0x5d, 0xe0, 0x13, 0x42, 0x2c, 0x06, 0xa3, 0x32, 0xe3, 0x45, 0x79, 0x75,
+                0xcf, 0x9b, 0xe9, 0xf9, 0xab, 0x3a, 0x06, 0x87, 0x2e, 0xf0, 0x71, 0x7d, 0x39, 0x08,
+                0xbd, 0xeb, 0xf8, 0x41, 0x8c, 0xe5, 0x57, 0xd5, 0x2d, 0x51, 0xa2, 0x50, 0xc0, 0x8c,
+                0x5b, 0x79, 0x3a, 0xd4, 0xbc, 0x0f, 0x16, 0xc6, 0x27, 0x89, 0xfe, 0xa2, 0xca, 0xb3,
+                0x9c, 0xcc, 0xa4, 0x07, 0xee, 0x9e, 0x47, 0xf5, 0x6d, 0x20, 0xa7, 0x41, 0x91, 0x2c,
+                0x6b, 0xad, 0xdb, 0xd7, 0xfa, 0x7b, 0x97, 0xe5, 0x46, 0x33, 0x61, 0x28, 0x74, 0x5a,
+                0xe7, 0xd7, 0x30, 0xa5, 0x5a, 0x6a, 0xc7, 0xb8, 0xfc, 0xbd, 0x72, 0xce, 0x78, 0x95,
+                0x9c, 0x7a, 0x79, 0x75, 0x21, 0x2c,
             ],
             ock: [
-                0x5b, 0x5b, 0x20, 0xfc, 0x46, 0xba, 0x14, 0xbd, 0x18, 0x43, 0xb6, 0xc7, 0x7e, 0xc3,
-                0xf4, 0x55, 0xb7, 0x65, 0xb4, 0xd1, 0x2d, 0xb6, 0x52, 0xeb, 0x34, 0x20, 0x0c, 0x41,
-                0x48, 0x88, 0x1f, 0xfc,
+                0xeb, 0x3e, 0xd9, 0xfc, 0xb3, 0xaa, 0x91, 0xc4, 0xf5, 0xec, 0xfd, 0x43, 0xdb, 0xda,
+                0x40, 0x33, 0x06, 0x93, 0xc3, 0xa6, 0x56, 0x75, 0x45, 0xfd, 0x23, 0x6a, 0xf1, 0x90,
+                0x8e, 0x29, 0x42, 0xa3,
             ],
             op: [
                 0x3f, 0xeb, 0x34, 0x5a, 0xec, 0xd3, 0x42, 0x9a, 0x16, 0xe1, 0x0f, 0x3d, 0x13, 0x20,
                 0xbc, 0x99, 0x71, 0xb5, 0x9e, 0x63, 0x9d, 0x62, 0xb6, 0x96, 0x1a, 0xea, 0x78, 0x15,
-                0x67, 0xa8, 0x60, 0x9e, 0x24, 0x75, 0x30, 0x5c, 0x35, 0xcf, 0x37, 0xeb, 0xd2, 0x77,
-                0x82, 0x35, 0x16, 0x58, 0x5a, 0xfa, 0x06, 0x05, 0x78, 0x52, 0x17, 0x1e, 0x0c, 0xe4,
-                0xb0, 0x52, 0xd5, 0xb4, 0x20, 0x41, 0xd8, 0x1c,
+                0x67, 0xa8, 0x60, 0x9e, 0x3b, 0xc1, 0x7a, 0x58, 0x0d, 0x53, 0x0f, 0x89, 0x30, 0xa3,
+                0x6b, 0x8d, 0x6f, 0xea, 0x67, 0x85, 0x7f, 0x7b, 0x85, 0x20, 0xfd, 0x2e, 0x0a, 0xb5,
+                0xd5, 0xcb, 0xab, 0x1a, 0xcc, 0xd5, 0x4e, 0x3a,
             ],
             c_out: [
-                0xe0, 0x1b, 0x5c, 0x1e, 0x01, 0x90, 0x0f, 0xf7, 0x9b, 0xf7, 0x27, 0xf5, 0x37, 0xc4,
-                0xac, 0x36, 0xf8, 0x06, 0x7a, 0x0c, 0xc5, 0xc8, 0xe9, 0xc8, 0x20, 0x44, 0x28, 0x43,
-                0x69, 0x35, 0x30, 0x91, 0x8a, 0xea, 0x67, 0x2c, 0x4c, 0xd8, 0xfa, 0x3f, 0x6f, 0x2c,
-                0xb6, 0x8b, 0x87, 0x17, 0x22, 0xe7, 0x78, 0xf6, 0xe2, 0x5e, 0x78, 0xae, 0x00, 0xa8,
-                0x43, 0x28, 0xc4, 0xc2, 0xbf, 0x1c, 0x79, 0xb2, 0xc9, 0xd8, 0x69, 0x72, 0x60, 0xcd,
-                0x44, 0x7e, 0x2e, 0xff, 0x31, 0x5d, 0x74, 0xb5, 0xb1, 0xfd,
+                0x60, 0xf3, 0xe8, 0x94, 0xe3, 0x86, 0x4e, 0xfb, 0x48, 0xcc, 0xae, 0x50, 0xe1, 0x0d,
+                0xa7, 0x73, 0xdc, 0xcf, 0x85, 0x62, 0x45, 0x5d, 0x1b, 0x73, 0x1a, 0xad, 0x44, 0xe1,
+                0x5e, 0x3e, 0x40, 0x18, 0x31, 0xce, 0x6f, 0x92, 0xf4, 0x53, 0x2d, 0x90, 0x83, 0x92,
+                0x59, 0xce, 0x9c, 0xb1, 0x44, 0x62, 0x1f, 0x12, 0x01, 0x77, 0x8f, 0x61, 0x5d, 0x09,
+                0x87, 0x01, 0x0c, 0x8d, 0x13, 0x5c, 0x32, 0xd5, 0x6e, 0xe2, 0x84, 0x68, 0x65, 0xa2,
+                0x61, 0xde, 0x14, 0x25, 0xd2, 0x3b, 0xcc, 0x51, 0xb8, 0xa0,
             ],
         },
         TestVector {
@@ -1356,36 +1350,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x0a, 0x12, 0x01, 0x2d, 0x63, 0xc0, 0x09, 0xc6, 0x77, 0x44, 0xba, 0xe0, 0xd5, 0x83,
                 0x88, 0xff, 0xee, 0x2f,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0xe9, 0x16, 0x93, 0xc3, 0x7d, 0x04, 0x37, 0x5e, 0x67, 0xc5, 0x71, 0x5a, 0x39, 0xc9,
-                0x79, 0x4a, 0x4e, 0xcd, 0x08, 0x38, 0xe2, 0x35, 0x1f, 0xd7, 0xcd, 0x93, 0xa1, 0x55,
-                0x7f, 0x01, 0x02, 0x3e,
+                0x54, 0x3e, 0xa7, 0x11, 0x56, 0xc9, 0xa6, 0xf8, 0x04, 0x1f, 0xa7, 0x7e, 0xc1, 0xc5,
+                0xaf, 0x90, 0x28, 0x8f, 0x27, 0x20, 0xf1, 0x3f, 0xf0, 0x93, 0xc6, 0x86, 0x26, 0x6b,
+                0x92, 0xd7, 0xa0, 0x24,
             ],
             cmx: [
-                0xcc, 0x29, 0x41, 0xe0, 0xf6, 0x38, 0x25, 0x7f, 0xb6, 0x51, 0x6a, 0x27, 0xc3, 0x0e,
-                0xaa, 0xe0, 0xb4, 0x6d, 0x2f, 0xf0, 0x6a, 0x73, 0x50, 0x70, 0x41, 0x74, 0x6c, 0xdc,
-                0x23, 0x07, 0x61, 0x25,
+                0x1d, 0x51, 0xea, 0x92, 0xfa, 0x43, 0x55, 0x0a, 0x0e, 0xdd, 0xea, 0x23, 0x6e, 0x17,
+                0xa0, 0x16, 0x93, 0xc2, 0x2d, 0x8d, 0xd8, 0x1c, 0x9c, 0x9e, 0xc8, 0x76, 0xa2, 0x4e,
+                0x67, 0xd4, 0x93, 0x0b,
             ],
             esk: [
-                0xec, 0x99, 0xeb, 0x6f, 0x67, 0x1d, 0x0a, 0x9e, 0x84, 0x5a, 0xbf, 0xb7, 0x8a, 0xec,
-                0xe9, 0x32, 0xeb, 0x13, 0xf5, 0xae, 0xd6, 0x4f, 0x20, 0xa7, 0x77, 0xc9, 0x46, 0xe9,
-                0xcd, 0x7a, 0x24, 0x23,
+                0x19, 0xe0, 0x26, 0x4b, 0x82, 0x88, 0xf7, 0x3e, 0xbf, 0x97, 0x14, 0xb0, 0xdf, 0x85,
+                0x8e, 0xf7, 0xab, 0x39, 0xec, 0x50, 0x2c, 0xd2, 0x98, 0xf2, 0xc4, 0x84, 0xa9, 0xf4,
+                0xc7, 0xda, 0x74, 0x36,
             ],
             ephemeral_key: [
-                0xad, 0xa7, 0x60, 0x27, 0xdc, 0xae, 0xb5, 0xf1, 0x58, 0xac, 0x6c, 0x5c, 0x6d, 0x7f,
-                0x05, 0x31, 0x8f, 0xec, 0x26, 0xd5, 0xc7, 0x94, 0xf2, 0xe9, 0x00, 0xcb, 0x96, 0x29,
-                0x92, 0x49, 0xe0, 0xb5,
+                0x8f, 0xbe, 0xb6, 0xb3, 0x03, 0x8e, 0x69, 0x49, 0x91, 0x6a, 0x2c, 0x06, 0x0e, 0xf9,
+                0xa4, 0xb1, 0xfe, 0xf1, 0x3a, 0xce, 0x2f, 0xee, 0x00, 0x25, 0xda, 0x32, 0xc3, 0x6d,
+                0x23, 0x1a, 0x61, 0x34,
             ],
             shared_secret: [
-                0xc2, 0x5c, 0xf1, 0xd6, 0x53, 0x2e, 0x06, 0xcb, 0x8b, 0x15, 0x22, 0x14, 0x76, 0x6e,
-                0xee, 0xd7, 0x5a, 0x17, 0x8c, 0x82, 0x2a, 0x11, 0x51, 0xf6, 0x9e, 0x92, 0xe9, 0xcf,
-                0xfa, 0x47, 0xcb, 0x19,
+                0x67, 0xd6, 0x8a, 0x5a, 0x05, 0x93, 0xfd, 0x16, 0x7d, 0x38, 0x08, 0x2e, 0x49, 0xd2,
+                0x30, 0x30, 0x86, 0xe5, 0x5a, 0x43, 0xc1, 0x24, 0xd5, 0xaa, 0xa8, 0x20, 0xab, 0x0c,
+                0x3f, 0x5c, 0xc5, 0x37,
             ],
             k_enc: [
-                0xd4, 0xef, 0x89, 0xc4, 0x64, 0xbe, 0x8f, 0x42, 0xf6, 0xb7, 0xf2, 0x6d, 0x89, 0x37,
-                0x8b, 0x73, 0xa3, 0x55, 0xa4, 0xfe, 0x24, 0x6c, 0x2e, 0xc8, 0xe8, 0x14, 0x6b, 0xef,
-                0x7d, 0xdd, 0x14, 0x19,
+                0x6b, 0x8d, 0x83, 0xf2, 0xf1, 0xfd, 0x1e, 0xad, 0x7d, 0x45, 0x42, 0xb3, 0x63, 0x09,
+                0x34, 0x07, 0xc5, 0x0a, 0x20, 0xed, 0x7f, 0x0e, 0x8c, 0xf2, 0xdb, 0x53, 0x6d, 0xb1,
+                0xbe, 0x25, 0xe9, 0x8d,
             ],
             p_enc: [
                 0x02, 0x56, 0x4f, 0xc3, 0x81, 0xfc, 0x4d, 0xc8, 0x11, 0x8d, 0xe4, 0x7c, 0x10, 0xb8,
@@ -1431,68 +1424,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x1a, 0x81, 0xa3, 0x59,
             ],
             c_enc: [
-                0xea, 0x86, 0x7e, 0x07, 0xac, 0xb7, 0xfa, 0x03, 0xe7, 0x36, 0xce, 0xdd, 0xed, 0x82,
-                0x3d, 0x19, 0x91, 0x30, 0xfb, 0x3f, 0xef, 0x62, 0xcc, 0x3e, 0xa9, 0xa0, 0xc9, 0x35,
-                0xdf, 0x05, 0xc5, 0xad, 0x5e, 0x67, 0xf7, 0x4f, 0xcb, 0xa6, 0x67, 0xe0, 0x81, 0x1c,
-                0xdc, 0x0c, 0xa9, 0xf3, 0xd7, 0x81, 0x76, 0x43, 0x75, 0x56, 0x47, 0xbe, 0x59, 0xdf,
-                0x09, 0x6e, 0x46, 0x5e, 0xc1, 0x11, 0x24, 0x36, 0x3c, 0x98, 0x1c, 0x55, 0xd5, 0x5f,
-                0x8d, 0x8a, 0xc8, 0xb6, 0x54, 0x0a, 0x98, 0xcf, 0xcc, 0x29, 0x4a, 0xa7, 0xcc, 0x62,
-                0x95, 0x50, 0x85, 0x3a, 0x25, 0xbf, 0x6b, 0x32, 0x35, 0x16, 0xe1, 0x58, 0x2b, 0x4e,
-                0x8b, 0x82, 0x95, 0xe2, 0x7f, 0x6b, 0x99, 0x94, 0x80, 0x2e, 0xfe, 0xf5, 0x43, 0x1f,
-                0x03, 0x7d, 0x22, 0x09, 0xa0, 0x88, 0x07, 0x34, 0x6f, 0xb3, 0x9c, 0xad, 0xd8, 0x93,
-                0xd6, 0x5f, 0x64, 0xc7, 0xfe, 0x92, 0xec, 0xbc, 0xdf, 0xe5, 0x55, 0x54, 0xca, 0xff,
-                0xb0, 0xcf, 0x41, 0xeb, 0x5c, 0x55, 0x72, 0xba, 0x44, 0x39, 0x90, 0x00, 0xe9, 0xfa,
-                0x9a, 0xaf, 0x6e, 0xb7, 0x6c, 0x2a, 0x8a, 0x5d, 0x7b, 0x6b, 0x52, 0xb9, 0xa9, 0xef,
-                0x6e, 0xc3, 0xed, 0xa6, 0x65, 0xfe, 0x8a, 0xa8, 0x07, 0x48, 0xb8, 0x1f, 0x7d, 0x55,
-                0x96, 0xf1, 0x94, 0x2f, 0xf7, 0x1d, 0x29, 0xc6, 0x78, 0xa3, 0xb6, 0xc6, 0x6b, 0xa7,
-                0x0f, 0x45, 0xb1, 0xfc, 0xf2, 0x22, 0x38, 0x84, 0x50, 0x68, 0xf3, 0x60, 0xb0, 0x99,
-                0xae, 0xe9, 0xf2, 0xf0, 0xef, 0x22, 0x33, 0x3f, 0xd6, 0x4f, 0xf1, 0x1e, 0x48, 0x15,
-                0x43, 0xa5, 0x2b, 0xb3, 0x3f, 0x52, 0x3d, 0xe2, 0xec, 0x92, 0x3a, 0xe9, 0x86, 0x58,
-                0x57, 0x71, 0x7b, 0x65, 0xd4, 0x4c, 0x3d, 0x9d, 0xb7, 0xb3, 0xec, 0xb2, 0xff, 0x02,
-                0x25, 0x29, 0x7d, 0xeb, 0x83, 0xdd, 0x1b, 0x9a, 0x39, 0x4d, 0x69, 0x7c, 0x09, 0xd7,
-                0xfe, 0xc6, 0x1e, 0xac, 0xee, 0x39, 0xa2, 0xf1, 0xce, 0xd9, 0xe6, 0xfd, 0xa5, 0xc0,
-                0xf3, 0x27, 0x71, 0xc6, 0xce, 0x3f, 0x17, 0xbe, 0x0e, 0xef, 0x81, 0x10, 0x99, 0xc1,
-                0x09, 0xe4, 0xfb, 0x6a, 0xec, 0x30, 0xdf, 0x04, 0x5b, 0x43, 0xda, 0x89, 0x30, 0x8b,
-                0xc8, 0x37, 0x68, 0x8b, 0xb0, 0xf4, 0xa2, 0xc6, 0x04, 0xa1, 0x54, 0xa8, 0x47, 0xc5,
-                0xd7, 0x87, 0x27, 0xf0, 0xe1, 0xab, 0x11, 0xe3, 0x40, 0xcf, 0xd4, 0xc7, 0xe8, 0xc6,
-                0xba, 0xff, 0xfe, 0xfc, 0x74, 0xef, 0x55, 0x3d, 0x4b, 0x29, 0x26, 0x9f, 0x38, 0xb4,
-                0xb7, 0xfe, 0x6e, 0x07, 0x3a, 0x70, 0xae, 0xf2, 0x0d, 0x6c, 0x23, 0x8b, 0x9f, 0xfd,
-                0x24, 0x1f, 0xf6, 0x99, 0x99, 0x92, 0x30, 0xf0, 0xb3, 0x9c, 0x96, 0x3e, 0xfa, 0x00,
-                0xef, 0x7f, 0x09, 0x2d, 0x76, 0x0c, 0x40, 0x9a, 0x2b, 0x6c, 0x26, 0xb4, 0x97, 0x82,
-                0x9b, 0x81, 0xcb, 0xa4, 0xc8, 0x3b, 0x11, 0x44, 0xc6, 0x5a, 0x2d, 0x31, 0x78, 0xbb,
-                0x28, 0xc1, 0xd8, 0xe3, 0x30, 0xd3, 0xf4, 0xaf, 0x90, 0x10, 0xad, 0x49, 0xa5, 0xdb,
-                0x70, 0xd6, 0x6a, 0xf5, 0x70, 0x19, 0x21, 0x49, 0x80, 0x5f, 0xe1, 0xca, 0x61, 0xc6,
-                0xd4, 0xec, 0xaf, 0xa7, 0x97, 0x51, 0x7f, 0x33, 0x06, 0xaf, 0x2a, 0x32, 0x27, 0x3b,
-                0xf3, 0xd6, 0x98, 0xaa, 0x55, 0xa5, 0x72, 0xb2, 0xdf, 0x80, 0x36, 0xd9, 0x7c, 0xf5,
-                0x8c, 0x12, 0x9f, 0x82, 0x85, 0xd0, 0xd7, 0xea, 0x04, 0xc1, 0x88, 0xa8, 0x39, 0x6e,
-                0x73, 0x8b, 0xd4, 0x48, 0x46, 0x5e, 0x7b, 0x9a, 0x64, 0xb7, 0x96, 0x7b, 0xcb, 0x25,
-                0xf8, 0xaa, 0x85, 0x9e, 0xa5, 0xca, 0x06, 0xc3, 0xdf, 0x39, 0x0f, 0xac, 0x8a, 0xc6,
-                0x06, 0x05, 0x03, 0x1a, 0x02, 0x09, 0xbb, 0x80, 0x24, 0x0d, 0x05, 0x45, 0xf4, 0x11,
-                0x77, 0xea, 0xb4, 0x40, 0x2e, 0x8a, 0x42, 0x3a, 0x40, 0xcc, 0xff, 0x58, 0x6b, 0x2e,
-                0xdd, 0x6a, 0xcf, 0xb8, 0xf1, 0xd8, 0x0d, 0x8c, 0x60, 0x5f, 0x49, 0x05, 0x2e, 0x7a,
-                0x30, 0x82, 0x6e, 0x1f, 0x03, 0x09, 0x9c, 0x71, 0x43, 0xad, 0x0b, 0x51, 0xfc, 0x63,
-                0x6f, 0x1d, 0x87, 0x05, 0x83, 0xd6, 0xed, 0xce, 0xcd, 0xe9, 0x42, 0x38, 0x9e, 0x6c,
-                0x01, 0x00, 0x66, 0x78, 0xda, 0xad,
+                0x77, 0xc6, 0xef, 0xc8, 0xb5, 0x42, 0xa7, 0x07, 0xc0, 0xa5, 0xcf, 0x5c, 0xe3, 0xf3,
+                0xb9, 0x6d, 0xe1, 0x91, 0x95, 0x7c, 0x9f, 0xa6, 0xe9, 0xbb, 0x4b, 0x8d, 0x89, 0x9e,
+                0x1f, 0x19, 0xe0, 0x20, 0xba, 0x7b, 0xb3, 0xfe, 0xf1, 0x67, 0x81, 0xc8, 0x8c, 0xc5,
+                0xd4, 0x4a, 0x5e, 0xf8, 0x17, 0x31, 0x47, 0xdc, 0x3d, 0x1b, 0x51, 0x6a, 0xf6, 0xdd,
+                0x77, 0xdd, 0xb6, 0xee, 0x67, 0xaa, 0xf5, 0x42, 0xce, 0xe2, 0xbe, 0xd3, 0xe4, 0xa0,
+                0x7e, 0xce, 0x42, 0x8f, 0x22, 0xa8, 0x01, 0xcf, 0x01, 0xba, 0xad, 0x18, 0x27, 0xfd,
+                0x42, 0x57, 0x46, 0xc5, 0x45, 0x00, 0x1c, 0x35, 0x6d, 0x0a, 0xbe, 0xaa, 0xa5, 0xa4,
+                0x22, 0xdf, 0xff, 0x0e, 0xe2, 0x18, 0xac, 0x37, 0xef, 0x83, 0x97, 0xc6, 0x2c, 0xa8,
+                0x6f, 0xab, 0xeb, 0xb6, 0x88, 0xb3, 0x8f, 0xb4, 0xa6, 0x54, 0x29, 0x11, 0xbe, 0x1c,
+                0x5e, 0x71, 0x77, 0x8b, 0x5e, 0xb5, 0x3a, 0xf1, 0xc4, 0xcb, 0x4d, 0xd9, 0x94, 0x72,
+                0x4f, 0x61, 0x0f, 0x38, 0x72, 0x4a, 0x73, 0xdf, 0x09, 0x2b, 0xea, 0xe8, 0xb8, 0x7f,
+                0x7f, 0x6a, 0x2b, 0xc0, 0x9d, 0xf2, 0xaa, 0x18, 0xc2, 0xf8, 0xee, 0xba, 0x63, 0xee,
+                0x0d, 0x31, 0x35, 0x3b, 0x6f, 0x28, 0x3e, 0xf5, 0x9a, 0xc1, 0x53, 0x60, 0x73, 0xda,
+                0x7a, 0x6d, 0x82, 0xbf, 0xdc, 0x09, 0x74, 0x02, 0x08, 0x0f, 0xa1, 0x03, 0xcb, 0x8b,
+                0x3e, 0xfb, 0x94, 0x1e, 0xe5, 0x01, 0xf6, 0x41, 0x2c, 0xfb, 0xc2, 0x50, 0xaf, 0xad,
+                0xbe, 0x54, 0x4a, 0xc5, 0x1f, 0xce, 0x41, 0x5a, 0x24, 0x93, 0xba, 0x83, 0x9e, 0x38,
+                0x18, 0xb0, 0xfe, 0x30, 0x18, 0xbf, 0xa4, 0x37, 0xf0, 0x6e, 0x31, 0x86, 0x14, 0x8a,
+                0xa4, 0x05, 0xba, 0xb8, 0x21, 0xa2, 0x6e, 0xa0, 0x7f, 0x93, 0xcf, 0xe7, 0x56, 0x8f,
+                0xe3, 0xef, 0x08, 0xfa, 0x0b, 0x80, 0xfc, 0xec, 0x5b, 0xd5, 0x91, 0x5f, 0x68, 0x8c,
+                0xf5, 0x99, 0x31, 0x5e, 0x79, 0xaa, 0xea, 0x34, 0xd5, 0x18, 0xd9, 0x55, 0xfe, 0xef,
+                0x30, 0x3f, 0x69, 0xb2, 0x87, 0xc6, 0xd0, 0x51, 0x6d, 0xa2, 0x39, 0xfb, 0xbd, 0xdb,
+                0xaf, 0x25, 0x56, 0xeb, 0xce, 0x77, 0xa3, 0xd5, 0x97, 0x23, 0x5c, 0x22, 0xd3, 0x8c,
+                0x5b, 0x5e, 0xeb, 0x98, 0xc7, 0xc0, 0x8d, 0xa8, 0xd3, 0x76, 0xbb, 0xa1, 0xb5, 0x07,
+                0x85, 0xbe, 0x82, 0xbf, 0xe0, 0x9a, 0xe7, 0x1c, 0xcc, 0xaf, 0x31, 0xa2, 0xf0, 0xcf,
+                0xa0, 0x76, 0xd1, 0xe4, 0xd1, 0xb5, 0x2f, 0xee, 0x45, 0xc8, 0xed, 0x23, 0xdf, 0x33,
+                0xa8, 0x1c, 0xb1, 0xa8, 0xac, 0xec, 0x9f, 0x53, 0x5d, 0xa4, 0x96, 0x70, 0xf9, 0x98,
+                0x6d, 0x5c, 0x92, 0xc8, 0x2b, 0x0a, 0xd2, 0x20, 0xf8, 0x5f, 0x3b, 0x38, 0x72, 0xeb,
+                0xe0, 0x53, 0xcd, 0xeb, 0x96, 0x1b, 0xd2, 0xd3, 0xab, 0x3b, 0xcd, 0x67, 0x6e, 0x6f,
+                0xd7, 0xcb, 0xe9, 0x79, 0x5e, 0x1f, 0x2d, 0x82, 0x87, 0x00, 0x7c, 0x91, 0x0e, 0x7b,
+                0x43, 0x01, 0x69, 0xe4, 0x51, 0xf0, 0xb2, 0xd7, 0x63, 0xe5, 0x43, 0x03, 0x3b, 0xc6,
+                0xc7, 0x38, 0x9f, 0xa1, 0x61, 0x5b, 0xa1, 0x9d, 0x1f, 0x27, 0x48, 0xb2, 0x17, 0xc9,
+                0x60, 0xfe, 0x05, 0x04, 0x07, 0xc8, 0xf4, 0x73, 0x35, 0x6b, 0xaa, 0x6e, 0x0c, 0x7d,
+                0x77, 0xfa, 0xc6, 0xc7, 0xdb, 0x45, 0x12, 0xaf, 0x57, 0x96, 0xb3, 0xbc, 0xf1, 0x23,
+                0xe0, 0x90, 0xb9, 0x80, 0xeb, 0xc2, 0xd6, 0x4b, 0x86, 0xdd, 0x24, 0xcb, 0x9a, 0x6d,
+                0xab, 0x1d, 0xb4, 0x13, 0x04, 0x75, 0x38, 0x90, 0x2e, 0x2e, 0x49, 0x0e, 0x4f, 0xc8,
+                0x78, 0xaa, 0x04, 0xdb, 0xef, 0x66, 0x99, 0x63, 0x9c, 0x3d, 0xab, 0x17, 0xc5, 0x14,
+                0x70, 0x48, 0xac, 0x6d, 0x48, 0x49, 0x0d, 0xc4, 0x88, 0x5e, 0xd9, 0x86, 0x70, 0x63,
+                0x35, 0xf4, 0x1b, 0xa4, 0x15, 0x59, 0x65, 0x9e, 0x1b, 0x53, 0xda, 0x76, 0x51, 0x4c,
+                0xc4, 0x0a, 0xdb, 0x66, 0xc3, 0x5c, 0xe5, 0x6f, 0x3a, 0xbe, 0x39, 0xe1, 0xae, 0xe5,
+                0x84, 0x9f, 0xff, 0xcc, 0x6e, 0x1f, 0x1b, 0xf8, 0x11, 0xce, 0xb6, 0x65, 0xa6, 0xfc,
+                0xf8, 0x80, 0x6b, 0xbb, 0xba, 0x4a, 0x5b, 0x87, 0x38, 0xa1, 0x17, 0xdc, 0xaf, 0xfb,
+                0x4f, 0xdf, 0x10, 0x08, 0x00, 0x6f,
             ],
             ock: [
-                0xf9, 0x59, 0x87, 0xcc, 0x0c, 0x73, 0x57, 0xc7, 0x20, 0x26, 0x27, 0xa5, 0xa5, 0x50,
-                0x09, 0xef, 0xd7, 0x17, 0x55, 0x3e, 0x9d, 0x34, 0xc1, 0x5f, 0xad, 0xf5, 0xc9, 0x46,
-                0xa9, 0xa0, 0x72, 0x17,
+                0xb4, 0xf8, 0x8a, 0x29, 0x2d, 0x09, 0xd9, 0x35, 0xb4, 0x77, 0x5a, 0x29, 0x30, 0xeb,
+                0x38, 0xce, 0xbd, 0x5a, 0xf6, 0xff, 0x3f, 0x39, 0xef, 0x5b, 0xb2, 0x4c, 0xd5, 0x72,
+                0x81, 0xf0, 0x8c, 0xfb,
             ],
             op: [
                 0xae, 0xee, 0xa5, 0x0c, 0x6b, 0xb0, 0x2e, 0x5e, 0x22, 0x4d, 0xc2, 0x95, 0x9c, 0x22,
                 0x9d, 0x0e, 0x3b, 0xb8, 0x79, 0xc4, 0xab, 0x00, 0xaa, 0x0a, 0xb2, 0x5a, 0x40, 0x10,
-                0x6b, 0x80, 0xbb, 0xb7, 0xec, 0x99, 0xeb, 0x6f, 0x67, 0x1d, 0x0a, 0x9e, 0x84, 0x5a,
-                0xbf, 0xb7, 0x8a, 0xec, 0xe9, 0x32, 0xeb, 0x13, 0xf5, 0xae, 0xd6, 0x4f, 0x20, 0xa7,
-                0x77, 0xc9, 0x46, 0xe9, 0xcd, 0x7a, 0x24, 0x23,
+                0x6b, 0x80, 0xbb, 0xb7, 0x19, 0xe0, 0x26, 0x4b, 0x82, 0x88, 0xf7, 0x3e, 0xbf, 0x97,
+                0x14, 0xb0, 0xdf, 0x85, 0x8e, 0xf7, 0xab, 0x39, 0xec, 0x50, 0x2c, 0xd2, 0x98, 0xf2,
+                0xc4, 0x84, 0xa9, 0xf4, 0xc7, 0xda, 0x74, 0x36,
             ],
             c_out: [
-                0x28, 0x9d, 0x00, 0xd4, 0x62, 0x78, 0x0b, 0xdb, 0xb6, 0xcd, 0x6c, 0xec, 0x93, 0x6b,
-                0xe6, 0x5e, 0x63, 0x0d, 0x4a, 0x3c, 0x2a, 0xf7, 0x6e, 0x10, 0x4b, 0x17, 0x4e, 0x3d,
-                0x5b, 0x71, 0x66, 0x39, 0xb0, 0x68, 0xb3, 0x85, 0x00, 0xd8, 0x04, 0x00, 0xee, 0x64,
-                0x2f, 0x8e, 0x08, 0xc8, 0xdb, 0x29, 0xff, 0xd5, 0xa9, 0xda, 0xde, 0x84, 0xa5, 0x49,
-                0x5d, 0x57, 0x7b, 0x2f, 0x56, 0xd3, 0x2b, 0x07, 0x96, 0xca, 0x23, 0xf0, 0x0f, 0x0f,
-                0x8e, 0xf9, 0x93, 0x07, 0x4f, 0x88, 0x0d, 0x6a, 0xeb, 0xcb,
+                0x94, 0xe3, 0x7f, 0xd6, 0x62, 0x82, 0xc0, 0x2e, 0x90, 0xe7, 0x69, 0x91, 0x4c, 0xaf,
+                0x95, 0xa4, 0x95, 0xf4, 0x89, 0x7f, 0x55, 0xa5, 0xae, 0x95, 0xad, 0xe8, 0xbf, 0x67,
+                0x61, 0xe3, 0x1b, 0xa5, 0xd1, 0xcf, 0xeb, 0x30, 0x6f, 0x4e, 0x22, 0x01, 0x42, 0x51,
+                0xcb, 0xe3, 0xf8, 0x72, 0x4b, 0xe7, 0x69, 0x21, 0xe2, 0xad, 0xa4, 0x6e, 0x3b, 0x14,
+                0x5d, 0x1b, 0x04, 0x3e, 0xb1, 0x2a, 0x0e, 0xfa, 0xb5, 0x16, 0x09, 0x34, 0xbc, 0x75,
+                0x9e, 0x02, 0x01, 0xd8, 0x66, 0xad, 0xa7, 0x44, 0x35, 0x71,
             ],
         },
         TestVector {
@@ -1566,36 +1559,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xcd, 0x51, 0x00, 0x89, 0x08, 0xa6, 0xcd, 0xd0, 0xaa, 0x02, 0x1b, 0x88, 0x8b, 0x98,
                 0xe2, 0x3c, 0x39, 0x11,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0x35, 0x6f, 0xc7, 0x2e, 0x1b, 0xf1, 0xe3, 0xa2, 0xa5, 0x9a, 0xa9, 0xe4, 0x75, 0x15,
-                0x5c, 0xf7, 0x43, 0xf8, 0xfd, 0xf0, 0xd1, 0x5b, 0x4c, 0xc4, 0x02, 0x60, 0xd0, 0xd0,
-                0x9a, 0xda, 0x04, 0x08,
+                0xbd, 0xda, 0xe8, 0xdf, 0xf1, 0x20, 0x5e, 0x04, 0x96, 0x8f, 0xae, 0x1f, 0xd9, 0xbe,
+                0x51, 0xd8, 0x25, 0xf5, 0xd8, 0x78, 0x1d, 0x93, 0x3d, 0x0f, 0x5b, 0xce, 0x9c, 0xa8,
+                0x3e, 0xe8, 0xed, 0x20,
             ],
             cmx: [
-                0xca, 0xa2, 0x8a, 0x69, 0x04, 0x54, 0x66, 0x37, 0xa7, 0xd4, 0xe5, 0xfb, 0xc2, 0x65,
-                0x4c, 0xbf, 0x24, 0x4d, 0x18, 0x77, 0x9d, 0x35, 0x62, 0x25, 0x6c, 0x14, 0xd5, 0xb1,
-                0x00, 0x5d, 0xc6, 0x0f,
+                0xbe, 0x43, 0xee, 0x84, 0x70, 0x70, 0x75, 0xac, 0x48, 0x08, 0xd0, 0x97, 0x54, 0x07,
+                0xc0, 0x27, 0x36, 0xd7, 0x66, 0x64, 0xf4, 0xe7, 0xae, 0xce, 0x01, 0xd9, 0xcc, 0x68,
+                0x32, 0x4a, 0xe9, 0x04,
             ],
             esk: [
-                0x01, 0xa3, 0x66, 0x1e, 0xa9, 0xaa, 0xb8, 0xf4, 0x32, 0x53, 0x42, 0x0e, 0xff, 0xd7,
-                0xa4, 0x83, 0xc2, 0x79, 0xd4, 0x18, 0x18, 0xbc, 0xb3, 0xee, 0x91, 0x90, 0x01, 0xf8,
-                0x66, 0xa8, 0xe9, 0x2c,
+                0xf9, 0xf7, 0xa0, 0x10, 0x5e, 0xa9, 0xf4, 0x45, 0xfb, 0x7a, 0x14, 0x49, 0x72, 0x62,
+                0xc6, 0xe4, 0xd7, 0x32, 0x89, 0x32, 0x7b, 0x8a, 0x2d, 0xf5, 0xe2, 0x63, 0xf3, 0xe3,
+                0x99, 0x07, 0xea, 0x0c,
             ],
             ephemeral_key: [
-                0x00, 0x62, 0x7e, 0x29, 0xc1, 0x83, 0x3e, 0x4e, 0x8f, 0xad, 0xe0, 0x82, 0x52, 0xf3,
-                0x83, 0x67, 0x78, 0xb9, 0x39, 0x4c, 0x1f, 0xfe, 0xab, 0x70, 0xbf, 0x35, 0x93, 0xd5,
-                0x9a, 0x81, 0xa0, 0xa5,
+                0xfa, 0x19, 0xa1, 0x52, 0x7b, 0x76, 0x04, 0x8f, 0xf3, 0x7f, 0xa4, 0xf8, 0x27, 0x89,
+                0xfe, 0x80, 0xb0, 0xcd, 0xd3, 0x5d, 0x5d, 0xa9, 0xc2, 0xec, 0x3f, 0xe3, 0x04, 0x38,
+                0x05, 0xc0, 0x61, 0x23,
             ],
             shared_secret: [
-                0xa9, 0x93, 0x34, 0x1f, 0x99, 0xeb, 0xa8, 0x2d, 0xb6, 0xec, 0x5e, 0x71, 0x3e, 0xe2,
-                0x9c, 0x01, 0xf4, 0xce, 0x2a, 0x8b, 0xb6, 0xb5, 0xeb, 0xb6, 0x0b, 0xa6, 0xeb, 0xa9,
-                0x6b, 0xa4, 0x17, 0x9b,
+                0x2d, 0xb5, 0xb8, 0x92, 0xb6, 0x1b, 0x9c, 0x55, 0x3b, 0x6c, 0x9b, 0x7a, 0xcc, 0x7d,
+                0x71, 0x05, 0xc1, 0xdd, 0x4c, 0x28, 0xc6, 0x7f, 0x97, 0x8b, 0x6d, 0x79, 0xc7, 0x1b,
+                0x98, 0xa0, 0xd0, 0x00,
             ],
             k_enc: [
-                0x35, 0x81, 0x19, 0x19, 0x3c, 0x9d, 0x2a, 0xb6, 0xd4, 0x95, 0xe0, 0x19, 0xf9, 0x7a,
-                0x1c, 0x41, 0x30, 0xae, 0xe6, 0x3d, 0xae, 0xc6, 0xbb, 0xa2, 0xf2, 0x74, 0x40, 0x0f,
-                0xd3, 0x4f, 0xad, 0x28,
+                0x16, 0xe3, 0xf9, 0x85, 0xc0, 0x7f, 0xef, 0xe5, 0x30, 0xd9, 0xe6, 0x94, 0x5e, 0xde,
+                0xc1, 0x90, 0x3b, 0xb1, 0xca, 0x8d, 0xa5, 0xa2, 0x5b, 0xe9, 0x59, 0x78, 0x63, 0x7a,
+                0x40, 0x8c, 0x2e, 0xfe,
             ],
             p_enc: [
                 0x02, 0xc6, 0xe8, 0xf0, 0xd5, 0x0a, 0xe8, 0x05, 0x87, 0x91, 0xdc, 0x0e, 0x46, 0x49,
@@ -1641,68 +1633,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x84, 0x37, 0x3f, 0x4f,
             ],
             c_enc: [
-                0x31, 0xac, 0xda, 0xa6, 0xc1, 0x76, 0xbb, 0x7a, 0x2c, 0x7d, 0x66, 0x09, 0xdc, 0x2c,
-                0x5e, 0x7b, 0x2e, 0xe7, 0x1d, 0xa9, 0x3c, 0x73, 0x87, 0x52, 0x74, 0xfa, 0x6c, 0x2a,
-                0xd6, 0x26, 0x13, 0xc7, 0x18, 0x9b, 0x35, 0x33, 0xec, 0xf0, 0x34, 0xd8, 0x76, 0xc7,
-                0x26, 0xf1, 0xed, 0x99, 0x43, 0xd4, 0x45, 0x07, 0x87, 0x52, 0x75, 0xa8, 0xe3, 0x71,
-                0x0a, 0x11, 0x8d, 0x91, 0x64, 0x72, 0x91, 0x28, 0x6c, 0xf8, 0x80, 0xa7, 0x82, 0xab,
-                0xea, 0xa8, 0xa6, 0xc3, 0x2f, 0xdf, 0x6f, 0x30, 0x4b, 0x0e, 0xe5, 0xbc, 0xb1, 0x4b,
-                0x82, 0x79, 0x2a, 0xa3, 0xaf, 0xd7, 0x24, 0x3f, 0x57, 0xb7, 0xdc, 0xa7, 0x93, 0x52,
-                0x19, 0xdf, 0x98, 0x2c, 0xe1, 0x28, 0xae, 0xa6, 0xf6, 0xbd, 0x18, 0xe1, 0x30, 0x7e,
-                0xba, 0x0e, 0x3d, 0xb0, 0x06, 0x14, 0xc2, 0x65, 0xc6, 0xf2, 0x8b, 0xfe, 0x58, 0xc1,
-                0x1d, 0x4a, 0xc9, 0x6d, 0x49, 0x02, 0x96, 0x7b, 0x54, 0xbc, 0x5d, 0xd1, 0x5c, 0x14,
-                0x3f, 0xf4, 0x2b, 0xbb, 0x62, 0xb9, 0x34, 0xb0, 0x9e, 0x79, 0xb6, 0x1e, 0xaf, 0xe7,
-                0x9a, 0xbc, 0x86, 0x94, 0x47, 0x5b, 0x6c, 0x8e, 0x19, 0x94, 0xba, 0x05, 0x5e, 0xa3,
-                0xc1, 0x82, 0x93, 0xb0, 0x3c, 0x42, 0x49, 0x50, 0x1d, 0xfd, 0xc0, 0x14, 0x60, 0xcf,
-                0x78, 0xcd, 0x97, 0x51, 0x30, 0xae, 0x34, 0x05, 0xba, 0x7d, 0xdc, 0x71, 0x30, 0xcb,
-                0xdb, 0xb9, 0x8c, 0x7a, 0xaf, 0x6b, 0x1d, 0x0b, 0x44, 0xa5, 0x16, 0x79, 0xaa, 0x63,
-                0x0a, 0x43, 0xae, 0x23, 0xb3, 0xd2, 0x2f, 0x73, 0x4c, 0xe1, 0xdb, 0xed, 0xea, 0x17,
-                0x5a, 0x00, 0x62, 0xb0, 0x6e, 0x23, 0xf4, 0xd0, 0x6d, 0x2a, 0xd0, 0x45, 0xae, 0x98,
-                0x2d, 0xb4, 0x34, 0x8f, 0x20, 0xc8, 0x9b, 0xf9, 0x67, 0x0e, 0x2f, 0xda, 0x47, 0x2e,
-                0x55, 0xce, 0x4c, 0x35, 0x82, 0xb7, 0x64, 0x43, 0xe0, 0xab, 0xbb, 0x77, 0x8a, 0xec,
-                0xa0, 0xf3, 0x9c, 0x55, 0xb6, 0xab, 0xbe, 0xd8, 0x1f, 0xde, 0x89, 0xad, 0x2c, 0x56,
-                0x7d, 0xfe, 0x27, 0x7b, 0xb2, 0x69, 0xac, 0x6a, 0xe0, 0xe1, 0x88, 0x39, 0x8d, 0xea,
-                0x24, 0xad, 0xcc, 0xe1, 0x82, 0xe7, 0xfd, 0xdc, 0x80, 0xeb, 0xd7, 0x69, 0xd0, 0xf0,
-                0x76, 0xf9, 0xaf, 0x2d, 0xd9, 0x83, 0x07, 0xa5, 0x27, 0xc6, 0x99, 0x42, 0xdf, 0xa3,
-                0xe7, 0xf4, 0x86, 0x76, 0x10, 0x1a, 0x47, 0xeb, 0x07, 0x80, 0xb6, 0x90, 0xb1, 0xaf,
-                0x10, 0xfc, 0xfb, 0x5e, 0xe2, 0xbd, 0x40, 0xd2, 0x7d, 0x10, 0x9b, 0xa1, 0x5a, 0xb0,
-                0xb1, 0xe9, 0x55, 0x4f, 0xdd, 0xfa, 0x81, 0x6b, 0x99, 0xcd, 0x8f, 0xdd, 0xe6, 0x81,
-                0xae, 0x6b, 0x6c, 0xbb, 0xfb, 0xf0, 0x2c, 0x36, 0x32, 0x68, 0xd0, 0xf3, 0xc6, 0xa7,
-                0x26, 0x1b, 0x6d, 0x00, 0x87, 0xbc, 0xad, 0xb6, 0xfb, 0x9b, 0xf3, 0x93, 0x04, 0xfc,
-                0x08, 0x41, 0x5d, 0x83, 0x6f, 0xe4, 0x09, 0xa4, 0x3f, 0xaf, 0x9e, 0x28, 0xfb, 0x48,
-                0x3f, 0x4a, 0x47, 0xaa, 0xd7, 0xe1, 0xf7, 0x97, 0x30, 0xb3, 0x21, 0x53, 0x60, 0x80,
-                0xdb, 0x35, 0x12, 0x48, 0xb2, 0x66, 0x9b, 0x6e, 0x74, 0x48, 0x90, 0x87, 0xae, 0x72,
-                0xba, 0x15, 0xd2, 0xae, 0xdd, 0x0c, 0x1e, 0x7e, 0xb1, 0x5a, 0x2f, 0x5a, 0x77, 0x31,
-                0xeb, 0x45, 0xa6, 0x17, 0x8a, 0x44, 0x87, 0x09, 0x31, 0xec, 0x8e, 0x34, 0x8c, 0x19,
-                0x2b, 0xc8, 0x87, 0xc8, 0x63, 0x60, 0x56, 0x67, 0x6f, 0x58, 0xd0, 0xc6, 0x34, 0xfc,
-                0x99, 0xea, 0x7b, 0x07, 0xfa, 0x1b, 0x62, 0x99, 0xae, 0x5d, 0xbf, 0xe0, 0x84, 0x45,
-                0xad, 0x99, 0x9f, 0x45, 0xdf, 0x00, 0xf1, 0xa4, 0x7a, 0xa5, 0xef, 0x6f, 0x88, 0xcd,
-                0xba, 0x80, 0xc8, 0x8f, 0x94, 0x01, 0xe6, 0xe9, 0x09, 0xca, 0x2c, 0x5d, 0xe2, 0xcf,
-                0x8f, 0x6a, 0x98, 0x44, 0xca, 0x32, 0xfe, 0x91, 0xf7, 0x13, 0xfe, 0x10, 0xa0, 0x69,
-                0x8a, 0x1b, 0x3b, 0xfd, 0xf4, 0x47, 0x43, 0x75, 0xb4, 0x79, 0x1d, 0xc8, 0x50, 0x50,
-                0xc9, 0x28, 0x90, 0x0e, 0x73, 0x1f, 0x7c, 0x4a, 0x12, 0x9d, 0x8e, 0x21, 0xfc, 0xf4,
-                0x17, 0x62, 0x7c, 0x47, 0xdd, 0xc9, 0xf5, 0x88, 0x40, 0x38, 0x41, 0x31, 0x7a, 0x9a,
-                0xc2, 0x6e, 0xef, 0x6c, 0xda, 0x23,
+                0x2d, 0x40, 0x4a, 0x68, 0x81, 0xa6, 0xee, 0x76, 0x0c, 0xb5, 0x3b, 0x9c, 0xc2, 0x71,
+                0x5c, 0xa7, 0x6a, 0x3a, 0x2f, 0xc9, 0x69, 0x3b, 0x1a, 0xbb, 0xcd, 0xc7, 0x5c, 0xb6,
+                0xd6, 0xc3, 0x6e, 0xcf, 0x84, 0xd6, 0x93, 0x67, 0x2c, 0x53, 0xce, 0xd8, 0x79, 0x8c,
+                0xc8, 0xf1, 0xe5, 0x3b, 0x8a, 0x9d, 0xe7, 0xbb, 0xb5, 0xe8, 0xc5, 0xa4, 0x6c, 0x3a,
+                0x74, 0x12, 0xdf, 0x11, 0xc5, 0xda, 0x16, 0xb4, 0xdd, 0x22, 0x90, 0x1a, 0x59, 0x2b,
+                0x0e, 0x93, 0x29, 0x77, 0xba, 0x06, 0x67, 0x3d, 0x6f, 0xd0, 0x38, 0xac, 0xba, 0xa9,
+                0xbf, 0x79, 0xc1, 0x5b, 0xa6, 0x2b, 0x6e, 0x30, 0x74, 0xef, 0x95, 0x3b, 0x81, 0x4c,
+                0xf1, 0xbd, 0xf0, 0x15, 0x77, 0xed, 0x3e, 0x3f, 0xae, 0xf4, 0x71, 0x55, 0xc9, 0x1c,
+                0x68, 0xee, 0x32, 0x88, 0x1b, 0x73, 0x74, 0x94, 0xb3, 0xb4, 0x76, 0x08, 0x3b, 0x3b,
+                0xd1, 0x77, 0x93, 0xc4, 0x98, 0x93, 0x1e, 0xaa, 0x92, 0xb1, 0x7c, 0x7d, 0x10, 0x47,
+                0x58, 0xfc, 0x8b, 0x34, 0x93, 0xd2, 0x47, 0x41, 0x7f, 0x5e, 0xc1, 0x97, 0x9a, 0x35,
+                0x28, 0x93, 0xe9, 0x95, 0x63, 0xb6, 0xc3, 0xab, 0x95, 0xcc, 0x5a, 0xfa, 0x37, 0x32,
+                0xef, 0xae, 0xce, 0x9e, 0x74, 0x32, 0xc8, 0x04, 0x15, 0xe2, 0x5f, 0x55, 0x56, 0x53,
+                0xc7, 0xda, 0x5d, 0xb0, 0xcc, 0x61, 0x08, 0x74, 0x21, 0x95, 0x9b, 0xb1, 0xdf, 0x80,
+                0x03, 0xb7, 0x3d, 0xa0, 0xbe, 0xf0, 0x60, 0xf3, 0xa8, 0x4c, 0x8b, 0xc2, 0x4c, 0xc7,
+                0x6d, 0x0d, 0x9e, 0x9c, 0x33, 0x76, 0x5c, 0x20, 0xf0, 0x7d, 0x80, 0xe2, 0x0f, 0xdf,
+                0x27, 0x81, 0x5d, 0xbd, 0x9d, 0x71, 0x7c, 0x09, 0x66, 0xf8, 0x0b, 0x94, 0xb9, 0x59,
+                0x15, 0x08, 0x1e, 0xa4, 0x55, 0x37, 0xa5, 0xa0, 0x74, 0xb9, 0xc9, 0x4b, 0x43, 0xdd,
+                0xf4, 0xa9, 0xcb, 0xad, 0xe9, 0x04, 0x51, 0x0e, 0xaa, 0x96, 0x9e, 0x66, 0x6c, 0x94,
+                0x34, 0xb9, 0xf6, 0x3e, 0xae, 0x62, 0xad, 0x58, 0x27, 0x99, 0x62, 0xe9, 0x41, 0x33,
+                0x05, 0x5c, 0xbc, 0xc4, 0xb1, 0x55, 0xc0, 0x0f, 0x1b, 0x83, 0xff, 0x41, 0x28, 0xa8,
+                0xab, 0xb4, 0xce, 0x68, 0xe9, 0xf1, 0xe3, 0x08, 0xe6, 0xf9, 0x7e, 0x51, 0x3a, 0xf5,
+                0x95, 0x47, 0x1a, 0x16, 0x77, 0xef, 0x78, 0xe9, 0x77, 0x0f, 0x43, 0xad, 0xde, 0x1a,
+                0x64, 0x58, 0x6d, 0xe6, 0xa5, 0x87, 0xc3, 0xd6, 0x93, 0xfe, 0xa8, 0xfc, 0xc6, 0xac,
+                0xc8, 0x94, 0x96, 0x1e, 0x2f, 0x47, 0xb2, 0x02, 0xe8, 0x6a, 0x57, 0x38, 0x79, 0xb5,
+                0xbf, 0xd7, 0x29, 0xda, 0x2f, 0xbe, 0xfc, 0x64, 0x5c, 0xfa, 0xb1, 0x88, 0x0d, 0x51,
+                0x76, 0x40, 0xdf, 0x5f, 0x53, 0xe5, 0x7c, 0x72, 0xd6, 0x5a, 0x63, 0x3a, 0xa5, 0x36,
+                0xb2, 0x98, 0x34, 0xbf, 0x28, 0x16, 0xb1, 0xf7, 0x16, 0xbf, 0x43, 0x6d, 0x6b, 0x2b,
+                0x6e, 0x47, 0x73, 0x28, 0xc9, 0x58, 0xa6, 0xb8, 0xcf, 0x73, 0xb9, 0x5d, 0x22, 0xf6,
+                0x99, 0x3b, 0x3f, 0xc5, 0x25, 0xdb, 0x62, 0x7f, 0x6f, 0x38, 0xd0, 0x77, 0x9a, 0x1d,
+                0x39, 0xaf, 0x05, 0xed, 0x74, 0xfd, 0xfe, 0xff, 0x98, 0x7a, 0x95, 0x88, 0xd8, 0x0b,
+                0x7e, 0x79, 0x69, 0x4a, 0xe4, 0x55, 0x29, 0x29, 0x88, 0x1c, 0x5b, 0xfe, 0x20, 0x49,
+                0x2f, 0xd6, 0xf3, 0x37, 0xca, 0x88, 0xdf, 0xb5, 0x01, 0xe5, 0x45, 0xd2, 0x36, 0x73,
+                0xac, 0xac, 0xbc, 0x3d, 0x33, 0x14, 0xa8, 0xbb, 0xf5, 0xec, 0x70, 0xb7, 0x05, 0xcc,
+                0x9d, 0x26, 0x57, 0xbd, 0xd5, 0xa7, 0x09, 0x15, 0xbe, 0xf6, 0xd0, 0xf0, 0x39, 0xd3,
+                0xeb, 0xa6, 0xbb, 0x71, 0x5b, 0xe5, 0x1e, 0xbf, 0x6e, 0xf6, 0x59, 0xea, 0x32, 0xff,
+                0x80, 0xc8, 0x2c, 0x04, 0x21, 0x67, 0x5f, 0xe3, 0x71, 0xef, 0x49, 0xf1, 0xb9, 0xe3,
+                0x8f, 0x43, 0x7b, 0x4a, 0x76, 0x55, 0xdc, 0x29, 0x16, 0xaa, 0x30, 0x86, 0xde, 0x6c,
+                0x62, 0xa8, 0x2b, 0x36, 0x1c, 0x05, 0x3f, 0xc6, 0x34, 0x54, 0xcc, 0xd0, 0x2c, 0x22,
+                0xd4, 0x1f, 0xf5, 0xbb, 0x83, 0x62, 0xde, 0xaa, 0x70, 0x82, 0x5a, 0xd2, 0xf9, 0x93,
+                0x63, 0x9f, 0xc4, 0x46, 0x06, 0x9d, 0x78, 0xa6, 0x1d, 0x33, 0x8d, 0xf5, 0x8f, 0x77,
+                0x63, 0xe3, 0x55, 0xe6, 0xa9, 0xff,
             ],
             ock: [
-                0x9c, 0x10, 0x3d, 0xd5, 0xd6, 0x38, 0x6c, 0xdd, 0x67, 0x69, 0x51, 0xe6, 0x56, 0x4b,
-                0x16, 0x6b, 0xc5, 0xc5, 0x72, 0x32, 0xcf, 0xc3, 0x1e, 0x0e, 0x69, 0xce, 0x84, 0xda,
-                0xe8, 0x32, 0x76, 0xbe,
+                0x8b, 0x0d, 0x29, 0x8e, 0xe8, 0xb4, 0x25, 0x34, 0xa4, 0x2f, 0xb9, 0x63, 0x5b, 0xa7,
+                0x58, 0xea, 0x9f, 0x91, 0x8b, 0x83, 0x16, 0xc0, 0xe8, 0x94, 0xa9, 0x08, 0x48, 0x89,
+                0x01, 0xd9, 0xfb, 0xa3,
             ],
             op: [
                 0x8e, 0x66, 0xb7, 0x92, 0xec, 0xb1, 0x56, 0xef, 0x68, 0x5e, 0xe8, 0xea, 0x35, 0xd3,
                 0x82, 0x75, 0x8b, 0xa4, 0x15, 0x97, 0xa3, 0x3a, 0x93, 0xba, 0xf3, 0x81, 0xd6, 0x3c,
-                0x17, 0x5b, 0xa9, 0x8b, 0x01, 0xa3, 0x66, 0x1e, 0xa9, 0xaa, 0xb8, 0xf4, 0x32, 0x53,
-                0x42, 0x0e, 0xff, 0xd7, 0xa4, 0x83, 0xc2, 0x79, 0xd4, 0x18, 0x18, 0xbc, 0xb3, 0xee,
-                0x91, 0x90, 0x01, 0xf8, 0x66, 0xa8, 0xe9, 0x2c,
+                0x17, 0x5b, 0xa9, 0x8b, 0xf9, 0xf7, 0xa0, 0x10, 0x5e, 0xa9, 0xf4, 0x45, 0xfb, 0x7a,
+                0x14, 0x49, 0x72, 0x62, 0xc6, 0xe4, 0xd7, 0x32, 0x89, 0x32, 0x7b, 0x8a, 0x2d, 0xf5,
+                0xe2, 0x63, 0xf3, 0xe3, 0x99, 0x07, 0xea, 0x0c,
             ],
             c_out: [
-                0xdf, 0x6b, 0xb6, 0x2e, 0x3b, 0x64, 0xf7, 0xe9, 0x37, 0xc1, 0xde, 0x38, 0xaa, 0xc5,
-                0xe6, 0xb1, 0x61, 0x35, 0xba, 0x2f, 0x9d, 0xbe, 0xed, 0xb0, 0x7a, 0x45, 0xb6, 0xf0,
-                0x9d, 0xf3, 0xeb, 0xec, 0xac, 0x04, 0x6c, 0x61, 0x92, 0xfb, 0xe8, 0x95, 0xd2, 0x31,
-                0x02, 0x77, 0xb3, 0xe0, 0x3a, 0x90, 0xfd, 0xc8, 0x53, 0x48, 0x4a, 0x01, 0x5c, 0x88,
-                0xd6, 0x63, 0x2e, 0x97, 0xba, 0x98, 0xad, 0xca, 0x9e, 0x49, 0xf5, 0x38, 0xc3, 0xa7,
-                0xcb, 0x6d, 0x77, 0x23, 0xbd, 0xcc, 0x9c, 0x03, 0xae, 0x88,
+                0xf3, 0xbf, 0x90, 0x76, 0xf3, 0xdb, 0x66, 0x32, 0x6d, 0xa6, 0x0c, 0xc7, 0x94, 0x3c,
+                0x85, 0x4d, 0x8d, 0xe9, 0x9f, 0x57, 0x53, 0xf7, 0x0c, 0x32, 0xed, 0x01, 0xfb, 0x2e,
+                0x84, 0x9c, 0x9d, 0xc7, 0x3f, 0x80, 0xb5, 0xcb, 0xaa, 0xb4, 0x99, 0x2d, 0xd7, 0xe7,
+                0x38, 0xb9, 0x61, 0xfd, 0x75, 0x3f, 0x7c, 0x5b, 0x29, 0x24, 0xd1, 0xd9, 0x63, 0x06,
+                0x61, 0x33, 0x92, 0x59, 0x28, 0x3e, 0x3a, 0x95, 0x3c, 0x57, 0xdf, 0x3a, 0x48, 0xca,
+                0x82, 0x71, 0xfc, 0x5f, 0x26, 0x4d, 0x6f, 0x15, 0xb6, 0xb3,
             ],
         },
         TestVector {
@@ -1776,36 +1768,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x7e, 0xed, 0xd2, 0xa7, 0x06, 0x44, 0x07, 0x34, 0x78, 0x41, 0x01, 0xae, 0x2d, 0x8e,
                 0x87, 0xe5, 0x05, 0xad,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0x32, 0x91, 0x87, 0x35, 0x66, 0x3f, 0x34, 0xad, 0xa0, 0x22, 0x8a, 0xea, 0x4a, 0xcc,
-                0x19, 0x2a, 0x12, 0x3f, 0xcf, 0xa0, 0x60, 0x46, 0x89, 0xf9, 0x1a, 0xcb, 0xe9, 0x38,
-                0x31, 0xe4, 0x8c, 0x0c,
+                0xc2, 0x79, 0xfa, 0x9d, 0x1c, 0x84, 0x11, 0x93, 0xd3, 0x32, 0xf8, 0xcc, 0xf4, 0xd0,
+                0xb1, 0xe4, 0x56, 0x01, 0xa8, 0xaf, 0x66, 0x76, 0xd7, 0x62, 0xfb, 0xa7, 0x31, 0x33,
+                0x45, 0x89, 0x35, 0x14,
             ],
             cmx: [
-                0xde, 0x7b, 0xf1, 0x55, 0x08, 0x29, 0x51, 0x96, 0x0a, 0x10, 0xbb, 0x8b, 0x75, 0x41,
-                0x02, 0x43, 0x0f, 0x89, 0xf5, 0x32, 0x67, 0x24, 0x04, 0x36, 0x81, 0xf5, 0x06, 0xf7,
-                0x48, 0xe2, 0x6f, 0x07,
+                0x6d, 0x29, 0x97, 0xd1, 0xce, 0x0a, 0x94, 0x9a, 0x63, 0x70, 0x0f, 0x46, 0x1b, 0x57,
+                0x12, 0xae, 0xeb, 0x43, 0xd4, 0x55, 0x04, 0xe3, 0x5b, 0xda, 0x16, 0x52, 0x97, 0x77,
+                0xc7, 0x4d, 0x19, 0x1b,
             ],
             esk: [
-                0x1d, 0xb6, 0x79, 0x07, 0x9a, 0xcd, 0xef, 0xe9, 0xfc, 0x1e, 0x59, 0xa1, 0x33, 0xf3,
-                0x7b, 0x6d, 0x1f, 0xfb, 0xed, 0x78, 0x8c, 0xce, 0x3b, 0x0c, 0xdd, 0x63, 0xe0, 0x62,
-                0x83, 0x05, 0x47, 0x08,
+                0x9d, 0xc4, 0xc8, 0xc0, 0x32, 0xd3, 0xbe, 0x66, 0xd2, 0x63, 0x6b, 0xa0, 0x02, 0x0c,
+                0x63, 0xf4, 0x26, 0x53, 0x29, 0xff, 0xac, 0x2a, 0xe6, 0x35, 0x57, 0x32, 0x63, 0xf4,
+                0x99, 0xbd, 0x4c, 0x13,
             ],
             ephemeral_key: [
-                0x18, 0x20, 0x84, 0x5b, 0x2d, 0x90, 0xe5, 0x45, 0x76, 0x0f, 0xca, 0x4d, 0xab, 0x30,
-                0xa6, 0x78, 0x3e, 0x03, 0x1c, 0x0e, 0x54, 0x28, 0xcc, 0x22, 0x6f, 0x3f, 0x40, 0x1d,
-                0xec, 0x20, 0x0b, 0x11,
+                0xe4, 0x76, 0x95, 0x86, 0x30, 0x4a, 0x6a, 0x9b, 0x3a, 0x2a, 0xef, 0x3a, 0xf5, 0x8b,
+                0x97, 0xda, 0xc2, 0xcc, 0x4a, 0xeb, 0x38, 0x9f, 0x68, 0xc1, 0x28, 0x87, 0x73, 0x1e,
+                0x0e, 0x12, 0xbc, 0x1e,
             ],
             shared_secret: [
-                0x79, 0x38, 0x77, 0xa1, 0xae, 0xda, 0xe9, 0xac, 0x6d, 0xa3, 0xd7, 0xe8, 0x02, 0xb5,
-                0xbc, 0x77, 0x3c, 0x0d, 0x93, 0x1c, 0x79, 0x6d, 0x17, 0x0c, 0x59, 0x7f, 0x22, 0xba,
-                0x6f, 0xcc, 0xa2, 0x06,
+                0xf6, 0xba, 0x4b, 0x1f, 0xbe, 0x01, 0xfa, 0x2f, 0x1d, 0xd4, 0x09, 0x3c, 0x5c, 0xc4,
+                0x85, 0xa9, 0xbf, 0xd9, 0xef, 0x0f, 0x57, 0x89, 0x49, 0xd6, 0xe1, 0x00, 0xb0, 0x05,
+                0x5c, 0xb8, 0xf3, 0x31,
             ],
             k_enc: [
-                0x28, 0x20, 0xb9, 0x38, 0xd6, 0xfc, 0xea, 0x99, 0xa7, 0x23, 0x37, 0x50, 0xa0, 0xf0,
-                0x9a, 0x32, 0x10, 0xad, 0x91, 0x73, 0x46, 0x16, 0x6a, 0xea, 0xdc, 0x89, 0xbb, 0x50,
-                0xf4, 0x54, 0x50, 0xa3,
+                0xd3, 0xc2, 0x20, 0x51, 0x00, 0x3e, 0x88, 0x2a, 0x5d, 0xdd, 0xfb, 0x48, 0x23, 0xd6,
+                0x77, 0x26, 0x96, 0xa7, 0xe9, 0x9f, 0x26, 0xb1, 0xa6, 0xac, 0xd2, 0x4b, 0xee, 0xd5,
+                0xf2, 0x2f, 0x9f, 0xf8,
             ],
             p_enc: [
                 0x02, 0x81, 0xf2, 0x75, 0x7c, 0x53, 0x2e, 0xd3, 0xb6, 0x2e, 0x89, 0x01, 0x22, 0x92,
@@ -1851,68 +1842,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x3e, 0xcc, 0xc6, 0x23,
             ],
             c_enc: [
-                0xd9, 0x6a, 0xe8, 0x2f, 0xba, 0xff, 0xb9, 0xe4, 0xbd, 0x36, 0x47, 0x57, 0x96, 0x33,
-                0xbc, 0x8a, 0x89, 0x66, 0xae, 0x4e, 0x18, 0x85, 0x99, 0xdc, 0x3c, 0xf0, 0x30, 0x41,
-                0xd2, 0x64, 0x4f, 0x60, 0x3c, 0xe5, 0x56, 0x2e, 0x7f, 0xa1, 0xd3, 0x83, 0x12, 0x79,
-                0xb6, 0x32, 0x60, 0x4d, 0x06, 0x5e, 0xd2, 0x46, 0xad, 0x2d, 0x4f, 0x73, 0xf3, 0xa4,
-                0x1b, 0x2a, 0x27, 0x99, 0xe5, 0xba, 0xf8, 0x6e, 0x7d, 0x9f, 0xcc, 0x64, 0xd5, 0x6b,
-                0xde, 0x56, 0xcb, 0xb0, 0x01, 0xeb, 0x7c, 0x7c, 0x0c, 0xf1, 0xe2, 0xae, 0xc3, 0xce,
-                0xb1, 0x49, 0x2d, 0xdf, 0x4e, 0x35, 0x20, 0x76, 0x1f, 0x70, 0xf6, 0xa9, 0x5c, 0x9e,
-                0xde, 0xed, 0x51, 0x43, 0x6d, 0xca, 0xcf, 0x71, 0x1e, 0xb5, 0x53, 0x24, 0xd3, 0xf0,
-                0x1d, 0xcc, 0xa0, 0x1b, 0xca, 0x15, 0xba, 0xf2, 0x8f, 0xed, 0x81, 0x4c, 0xc3, 0x3a,
-                0x43, 0x6b, 0xbc, 0x08, 0x60, 0x56, 0x78, 0x55, 0xa4, 0x9f, 0x5e, 0xfd, 0x49, 0xea,
-                0x78, 0x30, 0xc2, 0xf6, 0x00, 0x61, 0xd8, 0x13, 0xa8, 0x49, 0xb4, 0x40, 0xb1, 0x2e,
-                0x8f, 0x31, 0xe2, 0xdc, 0x0c, 0x39, 0x4c, 0xeb, 0x92, 0x4f, 0x0d, 0xc6, 0xd5, 0x7b,
-                0xcc, 0x39, 0x1d, 0x4a, 0x5f, 0x56, 0x9f, 0x34, 0x74, 0x6b, 0x9d, 0x92, 0x08, 0x82,
-                0x25, 0xb1, 0xaa, 0x3e, 0x90, 0x6f, 0x6d, 0xe4, 0xa7, 0x92, 0x2a, 0xc1, 0x16, 0xac,
-                0xb2, 0x78, 0xe8, 0xef, 0xbb, 0xf6, 0xf1, 0xe3, 0xe0, 0x8d, 0x66, 0xb3, 0x4d, 0x6e,
-                0xde, 0x34, 0xae, 0x78, 0x40, 0xa8, 0x80, 0x2b, 0x7c, 0x10, 0x0f, 0xa7, 0x98, 0x46,
-                0x4d, 0xb5, 0x29, 0x45, 0xdb, 0xbe, 0x35, 0xe7, 0x7a, 0x77, 0x21, 0xb2, 0xe0, 0xf8,
-                0xb9, 0xa1, 0x0f, 0x6b, 0xf9, 0xa2, 0x80, 0x8f, 0xa5, 0x85, 0xff, 0x21, 0xb0, 0xa3,
-                0xaf, 0xfd, 0x5f, 0x3c, 0xb2, 0x30, 0x63, 0x4e, 0x2e, 0x43, 0xff, 0xde, 0x6d, 0x09,
-                0x0a, 0xfc, 0xc6, 0x70, 0x4d, 0x7b, 0x3f, 0xc6, 0x15, 0x44, 0x85, 0x3b, 0xcd, 0xa7,
-                0xa1, 0x06, 0xd8, 0x5b, 0xd8, 0xd8, 0x6c, 0x6f, 0x8c, 0xe0, 0x34, 0x01, 0x6e, 0xd9,
-                0xa3, 0x69, 0x46, 0xf8, 0x52, 0x8b, 0x6f, 0x1e, 0x1a, 0x19, 0x82, 0xd6, 0x8d, 0x38,
-                0x86, 0xe5, 0xea, 0xe6, 0xc1, 0xe3, 0x88, 0xf3, 0xde, 0xad, 0x0d, 0x35, 0x3b, 0x6c,
-                0x0c, 0xbf, 0x57, 0xc2, 0xe4, 0x7d, 0x30, 0x72, 0x3e, 0xac, 0x95, 0x7b, 0x4a, 0xec,
-                0x82, 0xc8, 0xa1, 0x00, 0x9e, 0x3d, 0x71, 0x96, 0x92, 0xb2, 0xfc, 0xbd, 0xda, 0xae,
-                0x62, 0x5a, 0x89, 0x6a, 0x47, 0x29, 0x85, 0xb7, 0x9e, 0xb6, 0x2b, 0x1f, 0xe3, 0x3d,
-                0x6e, 0x27, 0xbc, 0x1f, 0x10, 0xe4, 0xfe, 0x5c, 0x06, 0xb2, 0x4c, 0x59, 0x7f, 0x72,
-                0x3c, 0x67, 0x13, 0x36, 0x13, 0xae, 0x8e, 0x15, 0x4d, 0x81, 0x69, 0x78, 0xb8, 0xfc,
-                0xa6, 0x50, 0xc0, 0x1d, 0x77, 0x1a, 0x62, 0x69, 0x2a, 0x84, 0x82, 0x94, 0x2e, 0x28,
-                0xfe, 0xf0, 0x45, 0x19, 0x9e, 0xd1, 0xa6, 0x64, 0x99, 0xeb, 0xa1, 0xee, 0xc1, 0x9a,
-                0xc8, 0x4a, 0x12, 0xe4, 0x10, 0x29, 0xd2, 0x2f, 0x21, 0x87, 0x6e, 0xd7, 0x4a, 0x76,
-                0xef, 0x39, 0xa0, 0x57, 0xce, 0x0a, 0x15, 0x8e, 0x68, 0x51, 0xec, 0x35, 0x6d, 0x97,
-                0x7b, 0x1a, 0xa6, 0x8d, 0xcf, 0x70, 0x88, 0xa9, 0xf0, 0xf9, 0xe4, 0x75, 0xa2, 0xbb,
-                0xc1, 0xc4, 0x49, 0x5b, 0x54, 0x6f, 0xff, 0xed, 0xaa, 0x66, 0xc4, 0xf9, 0x51, 0x74,
-                0xc6, 0x2f, 0x56, 0x5a, 0x3c, 0xc0, 0xac, 0xaf, 0x85, 0x4a, 0xde, 0xd4, 0xb4, 0x25,
-                0xa0, 0xc7, 0xdb, 0xcd, 0x37, 0x42, 0xa7, 0xe0, 0x59, 0x2e, 0x83, 0x73, 0x41, 0xf8,
-                0x95, 0x32, 0x90, 0x99, 0xe1, 0x70, 0xb6, 0xff, 0xb1, 0x05, 0xfd, 0xbc, 0x77, 0x29,
-                0x8e, 0x8c, 0x0f, 0x5e, 0xeb, 0x9e, 0x99, 0xc6, 0x58, 0x4b, 0xcf, 0xf1, 0x20, 0x20,
-                0x9d, 0x69, 0x22, 0xb5, 0x34, 0xbe, 0xc9, 0xfa, 0xc1, 0xd7, 0xd2, 0x74, 0xdb, 0xcb,
-                0x4a, 0x12, 0xea, 0x5a, 0x99, 0x21, 0x39, 0x2f, 0x00, 0x96, 0x60, 0x29, 0xff, 0x26,
-                0x0e, 0xd2, 0x4c, 0x32, 0x78, 0x58, 0xe0, 0x34, 0x64, 0x0a, 0x8c, 0xfb, 0x28, 0xad,
-                0x97, 0xe5, 0x3d, 0x80, 0xe1, 0xc9,
+                0x72, 0x29, 0xa0, 0xa5, 0x6a, 0x14, 0x4b, 0x04, 0x2c, 0x1e, 0xad, 0x91, 0x80, 0xac,
+                0x54, 0xda, 0xc6, 0xc5, 0x5c, 0xf4, 0xc2, 0x2f, 0xbe, 0x7c, 0xde, 0x99, 0x96, 0x0b,
+                0xc6, 0x20, 0xd4, 0xdd, 0x60, 0xe4, 0xbf, 0x18, 0xa0, 0xea, 0x7a, 0xd9, 0x09, 0x3b,
+                0xcd, 0x3f, 0xf6, 0xd1, 0x61, 0x1c, 0x56, 0x5f, 0x88, 0xe7, 0x35, 0xef, 0x4c, 0x51,
+                0x8c, 0x77, 0xd6, 0x22, 0x28, 0xe1, 0xe4, 0xa1, 0x35, 0xca, 0x6c, 0xb4, 0xed, 0x5a,
+                0xbb, 0xdf, 0x3e, 0x81, 0xd0, 0x96, 0x50, 0xa8, 0xfa, 0x9b, 0x5c, 0x3d, 0x05, 0xb6,
+                0xda, 0xcf, 0x3c, 0x3d, 0xb3, 0xb3, 0x63, 0xe4, 0x10, 0x57, 0x23, 0x70, 0x0c, 0x69,
+                0x13, 0x9f, 0x81, 0xec, 0xc4, 0x8d, 0x88, 0x3d, 0xa0, 0x39, 0xdd, 0xed, 0x5e, 0xf6,
+                0x04, 0x0a, 0xb2, 0x12, 0x0e, 0x53, 0x3b, 0x1f, 0xfd, 0x06, 0x74, 0xdb, 0x5b, 0x92,
+                0x6e, 0x58, 0x7f, 0x16, 0xe7, 0xe8, 0x96, 0x2b, 0x12, 0x48, 0x35, 0xbd, 0x56, 0xcf,
+                0xd8, 0xe7, 0x5b, 0xf6, 0xaa, 0x4d, 0xcd, 0x4d, 0x6f, 0x0b, 0x55, 0x61, 0x71, 0x9c,
+                0x80, 0xaa, 0x82, 0xb3, 0xbc, 0xea, 0x16, 0x7a, 0x31, 0xc6, 0x69, 0x87, 0x61, 0xe2,
+                0xd2, 0x6c, 0xb5, 0x6d, 0xd3, 0x04, 0x16, 0x72, 0x1c, 0x93, 0x37, 0x32, 0x92, 0x85,
+                0x33, 0x58, 0xfa, 0xfe, 0x74, 0x95, 0x55, 0x8d, 0xb9, 0x9e, 0x47, 0xa3, 0xa1, 0x6e,
+                0xd2, 0x2c, 0xdb, 0x9d, 0x7d, 0x16, 0xcf, 0xd9, 0xa7, 0xbb, 0x55, 0x9c, 0x72, 0x86,
+                0xed, 0x84, 0xf8, 0x89, 0x9c, 0xb0, 0x52, 0x2e, 0x8a, 0x49, 0x7f, 0x3e, 0x14, 0x45,
+                0x2b, 0xa8, 0xa9, 0x4a, 0x7f, 0x58, 0xe5, 0xde, 0x37, 0x1d, 0x76, 0xec, 0xc9, 0xef,
+                0xe2, 0x0a, 0xe7, 0x9b, 0xee, 0x12, 0xbc, 0xe4, 0xe4, 0xb6, 0xf2, 0x35, 0x35, 0xe5,
+                0xc3, 0xc4, 0x3a, 0x4c, 0xa2, 0x07, 0x6f, 0xd6, 0x73, 0xf0, 0x80, 0x6f, 0xa9, 0x85,
+                0xc5, 0x88, 0xd1, 0x14, 0xc0, 0x7d, 0x8c, 0xe3, 0xa2, 0x33, 0xe5, 0x4d, 0x77, 0x11,
+                0x6c, 0x8a, 0x2a, 0x56, 0xa6, 0x82, 0xe7, 0xa4, 0x85, 0xdf, 0x71, 0xb3, 0x02, 0xa0,
+                0x36, 0xdd, 0xab, 0x21, 0x4d, 0xee, 0x77, 0x62, 0x19, 0xcc, 0x24, 0x25, 0x94, 0xf7,
+                0x5b, 0x8e, 0xbd, 0x56, 0x6d, 0x74, 0xb1, 0x6c, 0x9e, 0xc0, 0x05, 0x8b, 0xca, 0x28,
+                0x81, 0xb7, 0x9b, 0x10, 0xe8, 0xa8, 0x01, 0x08, 0x20, 0x61, 0x8a, 0xc6, 0x52, 0x6c,
+                0xf9, 0x4b, 0x13, 0xd9, 0x75, 0x9f, 0x37, 0x33, 0x93, 0x34, 0xe8, 0xb2, 0xc6, 0xbd,
+                0xd1, 0xd0, 0xf5, 0xe2, 0x46, 0x3c, 0xff, 0x2b, 0x8d, 0xa6, 0xd2, 0xc6, 0x86, 0xaa,
+                0x98, 0x7c, 0xd1, 0xf0, 0x7e, 0x9a, 0xa2, 0x60, 0xdd, 0x04, 0x28, 0xa4, 0xff, 0x78,
+                0xaa, 0x8f, 0xda, 0x47, 0x7a, 0xb3, 0x8a, 0xcf, 0xcc, 0xb1, 0x90, 0x91, 0x77, 0xb5,
+                0x27, 0xe9, 0x38, 0xf1, 0xf9, 0xdc, 0xf3, 0x1f, 0x4f, 0x40, 0xa9, 0x62, 0x89, 0x51,
+                0xfc, 0x2a, 0x7a, 0xbc, 0x04, 0x1e, 0x8c, 0x93, 0x36, 0x08, 0xbb, 0x47, 0xb4, 0x50,
+                0xb2, 0x8f, 0xee, 0xe0, 0x41, 0x58, 0xa8, 0x17, 0x4b, 0xff, 0xe4, 0x97, 0x06, 0x02,
+                0x48, 0x86, 0x42, 0xc1, 0x9e, 0x61, 0xd4, 0x73, 0xf3, 0xde, 0x0c, 0xb0, 0xb6, 0x4a,
+                0x30, 0xd6, 0xf1, 0x46, 0x68, 0xd1, 0xb0, 0x17, 0x77, 0x56, 0x6f, 0xb5, 0xac, 0xc2,
+                0xe9, 0x2e, 0x64, 0xd9, 0x75, 0x7f, 0xba, 0x13, 0xc1, 0xee, 0x9c, 0xd0, 0x3a, 0xbe,
+                0x98, 0xbd, 0x7e, 0x8a, 0xd7, 0x04, 0x1c, 0x3f, 0xea, 0xe7, 0xc1, 0xa7, 0x24, 0x3a,
+                0xe3, 0x61, 0x0a, 0xac, 0x64, 0xfe, 0xc6, 0xc9, 0xfc, 0x94, 0x3d, 0x6a, 0xbc, 0xe9,
+                0x10, 0xad, 0xbe, 0x23, 0xb5, 0x46, 0xb4, 0xc2, 0x4a, 0xa9, 0xf2, 0xce, 0x5d, 0x97,
+                0x06, 0x2e, 0xe0, 0xd1, 0xcc, 0xc4, 0x8c, 0xfd, 0x1f, 0xdb, 0xa7, 0xfd, 0xac, 0x0b,
+                0x04, 0xd1, 0xb3, 0xdc, 0x7a, 0x70, 0x78, 0x1c, 0xdd, 0xa2, 0xa2, 0x70, 0x3d, 0xe0,
+                0x03, 0xcd, 0x01, 0x51, 0xec, 0x65, 0xbf, 0x7d, 0x1a, 0xc6, 0x3b, 0xb7, 0x35, 0xbc,
+                0x2b, 0xb6, 0x7a, 0xd2, 0xb0, 0x1e, 0xd6, 0xb9, 0xae, 0x2e, 0xbb, 0xd3, 0x7a, 0x8f,
+                0x8e, 0xc1, 0xa6, 0x53, 0xa8, 0x7e,
             ],
             ock: [
-                0x28, 0xcf, 0x3b, 0xea, 0xc3, 0xbd, 0xe2, 0xe9, 0x63, 0xaa, 0x60, 0x91, 0x3f, 0x10,
-                0x5d, 0x25, 0x67, 0xcd, 0xaf, 0xbb, 0x66, 0x09, 0x08, 0x5a, 0x84, 0x3f, 0x75, 0x68,
-                0xe4, 0x92, 0xd4, 0x4e,
+                0x1b, 0xa4, 0xac, 0xd7, 0x75, 0x10, 0xc4, 0xf0, 0xc7, 0x66, 0xad, 0xf7, 0xc7, 0xdf,
+                0x1d, 0x1c, 0x54, 0xd5, 0xbc, 0xe3, 0xd6, 0x0a, 0xf3, 0x5e, 0x8d, 0xd4, 0x8f, 0xdd,
+                0x04, 0xa7, 0x8c, 0x0b,
             ],
             op: [
                 0x55, 0xdb, 0x72, 0x90, 0x07, 0x3b, 0xa0, 0x06, 0x66, 0xe8, 0x7d, 0x25, 0x61, 0xb8,
                 0x88, 0x3c, 0x66, 0x2c, 0x56, 0x78, 0xff, 0x27, 0x30, 0x2a, 0x82, 0xe2, 0x0a, 0x72,
-                0x01, 0x70, 0x89, 0x1a, 0x1d, 0xb6, 0x79, 0x07, 0x9a, 0xcd, 0xef, 0xe9, 0xfc, 0x1e,
-                0x59, 0xa1, 0x33, 0xf3, 0x7b, 0x6d, 0x1f, 0xfb, 0xed, 0x78, 0x8c, 0xce, 0x3b, 0x0c,
-                0xdd, 0x63, 0xe0, 0x62, 0x83, 0x05, 0x47, 0x08,
+                0x01, 0x70, 0x89, 0x1a, 0x9d, 0xc4, 0xc8, 0xc0, 0x32, 0xd3, 0xbe, 0x66, 0xd2, 0x63,
+                0x6b, 0xa0, 0x02, 0x0c, 0x63, 0xf4, 0x26, 0x53, 0x29, 0xff, 0xac, 0x2a, 0xe6, 0x35,
+                0x57, 0x32, 0x63, 0xf4, 0x99, 0xbd, 0x4c, 0x13,
             ],
             c_out: [
-                0x0b, 0x2c, 0xc0, 0xa2, 0x2d, 0x06, 0xfc, 0x36, 0xa0, 0x8a, 0x7d, 0x82, 0x33, 0x8d,
-                0x4a, 0xd0, 0x95, 0xa3, 0x93, 0xa1, 0xc2, 0x4a, 0x78, 0x8d, 0x45, 0x24, 0x35, 0x94,
-                0x4a, 0xcc, 0xe6, 0x38, 0x1e, 0xcc, 0x69, 0x37, 0xf2, 0xc3, 0x8c, 0x89, 0xa5, 0xf5,
-                0x1a, 0xa6, 0x0c, 0xa6, 0x58, 0xfe, 0x71, 0x37, 0x1c, 0x2a, 0x83, 0xf4, 0x96, 0xca,
-                0x2e, 0x62, 0x49, 0x79, 0x2e, 0x09, 0xeb, 0x79, 0xea, 0x3a, 0x13, 0x80, 0x32, 0x18,
-                0xff, 0x20, 0x88, 0x9d, 0x8c, 0x59, 0xc8, 0x5e, 0x90, 0x99,
+                0x43, 0x0d, 0xaa, 0x6b, 0x75, 0x63, 0x22, 0x80, 0xd5, 0xe6, 0xda, 0xcb, 0xd2, 0xa0,
+                0xff, 0xe2, 0xaf, 0x98, 0x60, 0xc8, 0x3a, 0x3d, 0x2a, 0x87, 0xf1, 0x79, 0x62, 0x88,
+                0xeb, 0xed, 0x64, 0xd0, 0xcd, 0xc4, 0x60, 0xe2, 0xc8, 0x61, 0xc4, 0xf9, 0x38, 0x7d,
+                0x92, 0x59, 0xfc, 0x60, 0x01, 0xac, 0xd0, 0xe7, 0x6f, 0x3b, 0x0f, 0xdb, 0x5d, 0xac,
+                0x97, 0x4c, 0x26, 0xb5, 0x1b, 0x85, 0x9f, 0xab, 0xe0, 0x2e, 0xab, 0xae, 0x96, 0x8a,
+                0xab, 0x2e, 0x5e, 0x61, 0xef, 0xc2, 0xd4, 0x46, 0x2c, 0x1e,
             ],
         },
         TestVector {
@@ -1986,36 +1977,35 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xbd, 0xb9, 0x6f, 0x1c, 0xe0, 0x57, 0xc3, 0x30, 0xd1, 0xcc, 0xba, 0x2f, 0x7d, 0xa8,
                 0x71, 0x55, 0x00, 0xb5,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
-                0x3b, 0x37, 0x96, 0x78, 0x0c, 0x0a, 0xec, 0x14, 0xed, 0x28, 0x74, 0xb5, 0x23, 0x06,
-                0xe1, 0xc3, 0xd5, 0xde, 0x45, 0x93, 0xc6, 0x69, 0xaf, 0x1c, 0xaf, 0x11, 0xbc, 0xb4,
-                0xd3, 0x5c, 0x60, 0x12,
+                0xea, 0x38, 0x44, 0x75, 0x9a, 0x9a, 0x1c, 0xc5, 0x28, 0xb2, 0x95, 0xce, 0x70, 0x13,
+                0x7a, 0x85, 0xf9, 0xf0, 0x8e, 0x41, 0xa5, 0xc7, 0xc1, 0xca, 0xc1, 0x55, 0xa6, 0x69,
+                0xa3, 0x18, 0x53, 0x3e,
             ],
             cmx: [
-                0x4d, 0xa9, 0xdf, 0xdc, 0x70, 0x8c, 0xe8, 0xa0, 0x77, 0xa0, 0x6e, 0xc0, 0x67, 0x79,
-                0x24, 0xcf, 0x37, 0x70, 0xed, 0xc2, 0x07, 0xfd, 0x5e, 0x7d, 0x69, 0x5f, 0x71, 0xb0,
-                0x15, 0xbb, 0x03, 0x05,
+                0x6a, 0xba, 0x28, 0x10, 0x5b, 0xc0, 0x72, 0xc5, 0x2a, 0xb8, 0xa3, 0x14, 0x79, 0x7f,
+                0xf8, 0x66, 0x66, 0xdf, 0xb7, 0xcd, 0x8a, 0x2a, 0xe1, 0x7c, 0x58, 0x5f, 0xb7, 0xb6,
+                0x51, 0x5b, 0x97, 0x1c,
             ],
             esk: [
-                0xae, 0xec, 0x0d, 0xb9, 0x0e, 0x55, 0x83, 0x3c, 0x8b, 0xaf, 0x52, 0x6d, 0x66, 0x54,
-                0xa1, 0x74, 0x5b, 0xa4, 0x4c, 0xad, 0x3c, 0xf9, 0xa6, 0x2c, 0xfb, 0xee, 0x5d, 0xe3,
-                0x99, 0xca, 0x31, 0x26,
+                0x03, 0xfb, 0x79, 0x43, 0x75, 0x27, 0x5d, 0x23, 0xd1, 0x58, 0xd5, 0x64, 0x6b, 0xc4,
+                0x63, 0xa8, 0xb7, 0x38, 0xbc, 0x79, 0x38, 0xf6, 0x0d, 0xfb, 0x15, 0x5b, 0xef, 0x4d,
+                0x46, 0x1e, 0xec, 0x29,
             ],
             ephemeral_key: [
-                0x2d, 0xa0, 0x59, 0x4c, 0xd8, 0x74, 0x91, 0x46, 0x52, 0x67, 0xe7, 0x2c, 0x61, 0x89,
-                0x07, 0x91, 0xfe, 0xb4, 0x25, 0xa2, 0xbb, 0xcd, 0xda, 0xcf, 0xe4, 0x5a, 0x66, 0x62,
-                0x2f, 0x49, 0xef, 0x35,
+                0x95, 0x9b, 0xea, 0x8e, 0x11, 0x96, 0x8b, 0x0f, 0x34, 0x3c, 0x04, 0xcd, 0x6d, 0x50,
+                0x16, 0xfc, 0xd4, 0x33, 0x90, 0x75, 0x36, 0xa2, 0x46, 0xba, 0x1c, 0x5d, 0x3e, 0x88,
+                0x97, 0xf3, 0x23, 0x1c,
             ],
             shared_secret: [
-                0xe0, 0xb1, 0x52, 0x67, 0xfd, 0x21, 0x08, 0xeb, 0xbd, 0xd4, 0x16, 0x3f, 0x83, 0xad,
-                0xef, 0xb6, 0x1c, 0x3e, 0xdf, 0x56, 0x6d, 0x94, 0x6f, 0xa1, 0xc1, 0x5e, 0x96, 0x46,
-                0x43, 0xb1, 0x9c, 0x8e,
+                0xe2, 0x69, 0x19, 0xb4, 0x0c, 0x70, 0xaf, 0x74, 0x1d, 0xf9, 0x04, 0x51, 0x72, 0x55,
+                0x03, 0x58, 0x89, 0xee, 0x5a, 0x44, 0x42, 0x6d, 0x6a, 0xb8, 0x5c, 0x07, 0x4b, 0x86,
+                0x2b, 0xa0, 0x63, 0x08,
             ],
             k_enc: [
-                0x28, 0x48, 0xae, 0x53, 0xaa, 0xce, 0xbe, 0x7c, 0xab, 0x58, 0x73, 0x1d, 0xc2, 0x21,
-                0x88, 0x1b, 0x60, 0x2c, 0xc5, 0xa5, 0x3b, 0xcc, 0x1f, 0x76, 0xc8, 0x20, 0xb0, 0xea,
-                0x13, 0x55, 0x68, 0x8e,
+                0x09, 0xda, 0xc6, 0x51, 0x1c, 0x38, 0x44, 0x58, 0x7f, 0x82, 0x9c, 0x2f, 0x1e, 0xa0,
+                0x37, 0xa8, 0x1a, 0x8d, 0x54, 0x85, 0xed, 0x04, 0xea, 0xf2, 0x75, 0x80, 0x05, 0xb3,
+                0x2a, 0x20, 0x47, 0x0b,
             ],
             p_enc: [
                 0x02, 0xdd, 0xb7, 0xc5, 0xbc, 0x4d, 0xe9, 0xdf, 0x52, 0x1b, 0xb0, 0x4b, 0xad, 0x95,
@@ -2061,68 +2051,68 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xf5, 0xc6, 0x38, 0xbf,
             ],
             c_enc: [
-                0xf1, 0x42, 0xc4, 0xe5, 0x0e, 0xef, 0x2c, 0x64, 0x44, 0xcc, 0xd4, 0x0b, 0x8c, 0x99,
-                0xe5, 0x6a, 0x72, 0xec, 0x4e, 0x30, 0xcf, 0x73, 0x68, 0x75, 0xf0, 0xaa, 0x6b, 0x8e,
-                0x6d, 0x9c, 0xc3, 0x67, 0x73, 0x2d, 0xbc, 0x9a, 0xf0, 0xb3, 0x7d, 0x1f, 0xca, 0x6d,
-                0x5b, 0xdd, 0x1d, 0xc1, 0x23, 0x79, 0x29, 0x66, 0x99, 0x9d, 0x62, 0xea, 0xf8, 0xc5,
-                0xfe, 0x8d, 0x99, 0x91, 0x84, 0xf2, 0x8b, 0x99, 0xec, 0xef, 0xcc, 0x8f, 0x14, 0x8d,
-                0xbd, 0x52, 0x02, 0x6f, 0xdb, 0x48, 0xdf, 0xda, 0x7b, 0xad, 0xb6, 0xd1, 0xfc, 0xd2,
-                0x9a, 0xd2, 0x19, 0xea, 0xbf, 0xbb, 0x44, 0x3f, 0x5d, 0x0f, 0x98, 0xb6, 0x6a, 0x3a,
-                0x25, 0x73, 0x1b, 0x52, 0xd7, 0xf2, 0xdf, 0x70, 0x01, 0x4b, 0x4a, 0xc6, 0x99, 0x34,
-                0x32, 0xf8, 0x98, 0x1e, 0x9c, 0xbf, 0xe1, 0x69, 0x13, 0xf6, 0x8a, 0x93, 0x5d, 0x2d,
-                0xd0, 0x06, 0xd4, 0x28, 0xf1, 0x45, 0x53, 0xe7, 0x29, 0x86, 0xc7, 0x0f, 0xb4, 0x43,
-                0x18, 0xd2, 0x7c, 0x4d, 0x6f, 0x6f, 0xd3, 0x92, 0x3a, 0xb0, 0xf6, 0x28, 0x9a, 0x02,
-                0x48, 0x5e, 0x87, 0x17, 0xe5, 0x7d, 0xa0, 0x24, 0xeb, 0xe1, 0x6e, 0x9c, 0xf8, 0x35,
-                0xcf, 0x53, 0xd2, 0x19, 0x4f, 0xd4, 0x25, 0x50, 0x06, 0xb8, 0x1b, 0xfd, 0x51, 0xd1,
-                0xef, 0x5a, 0xe9, 0xf9, 0xef, 0x6a, 0xf6, 0x57, 0x41, 0x81, 0xe2, 0xe2, 0x26, 0x50,
-                0xcb, 0x91, 0x2a, 0x6b, 0x89, 0x88, 0xa0, 0x28, 0x86, 0x32, 0xbc, 0x73, 0x62, 0xbb,
-                0xe1, 0x87, 0x23, 0xd8, 0x27, 0xf7, 0x94, 0x58, 0x62, 0x26, 0x0d, 0xf7, 0x8e, 0x95,
-                0xd7, 0xd5, 0xe3, 0x31, 0x3f, 0x5a, 0xff, 0x72, 0xe2, 0x1c, 0xe2, 0xdf, 0x00, 0xee,
-                0x7e, 0x81, 0x5a, 0xba, 0x17, 0xcc, 0xde, 0x15, 0xc2, 0x7e, 0xee, 0x08, 0x5f, 0x52,
-                0xf3, 0x6c, 0x02, 0xec, 0xd6, 0x6c, 0xe1, 0x8b, 0x40, 0x15, 0xbe, 0xb6, 0x09, 0x23,
-                0x3f, 0x6e, 0xb2, 0x8e, 0x4a, 0xd5, 0xcd, 0xbe, 0x6f, 0xdc, 0xab, 0x68, 0xbf, 0xbb,
-                0x6f, 0xfd, 0x87, 0xd3, 0x86, 0xd8, 0x7e, 0xb1, 0xfe, 0x00, 0x34, 0x27, 0x0f, 0x41,
-                0x27, 0x1e, 0xa0, 0x1f, 0x9e, 0xae, 0xa9, 0xe8, 0x9f, 0x78, 0x35, 0x9e, 0x41, 0x73,
-                0x94, 0xbb, 0x9d, 0xf5, 0xb6, 0x1c, 0x36, 0xe3, 0x0b, 0xc1, 0xce, 0x4a, 0xb1, 0xbd,
-                0xd7, 0x9f, 0xa4, 0x08, 0x3e, 0x82, 0x8d, 0xd1, 0x04, 0xe4, 0x73, 0x80, 0xcd, 0x83,
-                0xcd, 0x65, 0x9d, 0xf4, 0x4d, 0xb9, 0x43, 0xdc, 0x07, 0xbc, 0xc8, 0x07, 0x05, 0x04,
-                0xa1, 0xc6, 0x55, 0x23, 0x02, 0xe7, 0x4b, 0xe4, 0xb9, 0xc4, 0x32, 0x75, 0xec, 0xc2,
-                0x88, 0xce, 0xda, 0x41, 0x59, 0xa9, 0xcc, 0x55, 0x7c, 0x18, 0x19, 0x5c, 0xec, 0x92,
-                0x62, 0x24, 0xd8, 0xd6, 0x9e, 0x98, 0xe1, 0x83, 0x5a, 0x2e, 0x29, 0x05, 0x63, 0xef,
-                0x20, 0xd0, 0x83, 0xd1, 0x4e, 0x93, 0xcc, 0x1f, 0x3f, 0x76, 0x3e, 0xf5, 0x58, 0x0e,
-                0x13, 0x5f, 0xae, 0x1b, 0xb8, 0x54, 0x4a, 0x0c, 0x5c, 0x6d, 0x88, 0x17, 0x41, 0xe4,
-                0x51, 0x34, 0x47, 0xac, 0xeb, 0x09, 0x33, 0xe6, 0xeb, 0xaf, 0x0c, 0xe3, 0x13, 0xc1,
-                0x8c, 0x9a, 0xf9, 0x5b, 0xa5, 0x61, 0x31, 0xf7, 0x8f, 0x42, 0x72, 0x41, 0x22, 0x65,
-                0xbc, 0xf4, 0xc5, 0xf6, 0x80, 0x89, 0x3c, 0xcd, 0xa5, 0x73, 0x7d, 0xa8, 0x23, 0xb7,
-                0x63, 0x6e, 0x98, 0xdb, 0xa5, 0x62, 0x44, 0xf2, 0xb9, 0x6a, 0x10, 0x90, 0xa6, 0x60,
-                0x38, 0x15, 0xc0, 0xef, 0x54, 0x97, 0x50, 0xf2, 0x47, 0x06, 0x19, 0x0b, 0x55, 0x76,
-                0x6e, 0x8a, 0x62, 0x09, 0xa1, 0xc2, 0x2f, 0x67, 0xe8, 0x77, 0x62, 0x66, 0xb6, 0xfa,
-                0xe4, 0x5b, 0xf7, 0x94, 0x90, 0x7f, 0x64, 0x71, 0x4f, 0xbe, 0x26, 0xc3, 0x0a, 0xc4,
-                0x04, 0x11, 0xf5, 0xe6, 0x4f, 0xc1, 0x66, 0xc8, 0x4f, 0x28, 0xb8, 0x23, 0xfd, 0xaa,
-                0x68, 0x32, 0xa3, 0x25, 0x63, 0x31, 0x7d, 0x25, 0x4c, 0x53, 0x16, 0x9b, 0x9f, 0xfb,
-                0x24, 0x53, 0xa1, 0x12, 0x2f, 0xa4, 0x4c, 0x7f, 0x17, 0xc1, 0x36, 0xb5, 0x7e, 0x20,
-                0xad, 0x17, 0x7a, 0x7e, 0xee, 0xbf, 0x9f, 0x56, 0xfb, 0x0b, 0x55, 0xcc, 0xcf, 0x68,
-                0x2b, 0x8a, 0x5b, 0xd8, 0xa7, 0x45,
+                0x7b, 0x59, 0x87, 0x78, 0xa7, 0x28, 0x4d, 0x52, 0xa7, 0x47, 0x77, 0x4c, 0x54, 0xbd,
+                0x92, 0x57, 0xb3, 0xf1, 0x7a, 0xf1, 0x3e, 0xcc, 0x72, 0xc0, 0xe3, 0xcd, 0x95, 0xeb,
+                0xfa, 0xfa, 0xa3, 0x7d, 0x16, 0x65, 0x15, 0x53, 0xdd, 0x27, 0xf0, 0x1c, 0x9c, 0xf2,
+                0x4b, 0x62, 0xd7, 0xdc, 0xfd, 0x52, 0xfa, 0x4b, 0x2b, 0x3b, 0x4a, 0x8c, 0xa9, 0xeb,
+                0xfc, 0xe7, 0xf4, 0xfc, 0xec, 0x27, 0xe6, 0x05, 0x8e, 0x44, 0x68, 0xc1, 0x50, 0x10,
+                0xd0, 0x17, 0xcb, 0x90, 0x1a, 0xbf, 0xb2, 0x2e, 0xad, 0x86, 0x99, 0x83, 0xf6, 0x9a,
+                0xed, 0xf2, 0xda, 0x7d, 0x6a, 0xaf, 0xd1, 0x30, 0x6e, 0xe7, 0x36, 0xf2, 0xdb, 0x33,
+                0xbc, 0xe4, 0xb0, 0x9f, 0xca, 0x74, 0x69, 0x2a, 0x52, 0x09, 0xa7, 0x39, 0x2b, 0x7e,
+                0xa9, 0x68, 0x5b, 0xe9, 0xec, 0x43, 0x1f, 0xfe, 0x50, 0xf7, 0x0f, 0x90, 0x22, 0x74,
+                0x05, 0x03, 0x45, 0x2a, 0xb5, 0x14, 0x92, 0xb1, 0xf7, 0x47, 0x7e, 0xda, 0x42, 0x7b,
+                0x42, 0x3a, 0x93, 0x1b, 0x26, 0x38, 0x6c, 0x56, 0xe4, 0x27, 0x86, 0x3d, 0x46, 0xb1,
+                0x99, 0xff, 0xa0, 0x8c, 0x52, 0x9f, 0xa5, 0x72, 0x1f, 0x68, 0xe9, 0x14, 0xf6, 0xea,
+                0x6a, 0x8a, 0xe6, 0xae, 0xcb, 0xf7, 0x37, 0x47, 0x1e, 0xbd, 0x83, 0xdb, 0xa9, 0xa7,
+                0xcd, 0x89, 0x75, 0x66, 0x20, 0x4e, 0x2b, 0xae, 0x63, 0xe3, 0x4e, 0x70, 0x32, 0x51,
+                0x02, 0x96, 0x92, 0x0d, 0x7e, 0x7a, 0x7c, 0xcf, 0x0f, 0xeb, 0xe7, 0xa8, 0x33, 0x69,
+                0x6a, 0x4b, 0x67, 0x41, 0x88, 0x5e, 0x9b, 0x94, 0x0c, 0x61, 0xdd, 0x8d, 0x44, 0x38,
+                0x54, 0x74, 0x15, 0x31, 0x0b, 0x15, 0xcf, 0x18, 0xdc, 0x19, 0x90, 0x07, 0x8c, 0x70,
+                0x8b, 0xea, 0xc3, 0x32, 0xa8, 0xe0, 0x81, 0x46, 0xa6, 0x95, 0x8e, 0xa6, 0xf4, 0x3f,
+                0xd0, 0xc2, 0xc8, 0xe9, 0x99, 0xaa, 0x4f, 0xdf, 0x1e, 0x77, 0xef, 0xde, 0x54, 0xfd,
+                0x65, 0xc6, 0x7a, 0x3f, 0x07, 0xda, 0xf5, 0xf6, 0x04, 0x49, 0x60, 0xa0, 0xb6, 0xdd,
+                0x84, 0x1f, 0xf8, 0xb8, 0xa5, 0x92, 0xc7, 0xb1, 0x09, 0x34, 0x2c, 0x73, 0x5c, 0x2a,
+                0x0e, 0x37, 0xb3, 0x0b, 0x8b, 0xaa, 0x5c, 0x77, 0x01, 0xeb, 0xc7, 0xa8, 0xf8, 0x20,
+                0xc0, 0x22, 0x7c, 0xa5, 0x00, 0x3f, 0x36, 0xee, 0x68, 0xf7, 0xb2, 0x89, 0x81, 0xc2,
+                0x73, 0x32, 0x03, 0x9d, 0xd6, 0xa4, 0x94, 0xf0, 0xcd, 0x02, 0xbd, 0xd2, 0x8f, 0x68,
+                0x3e, 0xca, 0x1b, 0x03, 0x2a, 0xfc, 0x09, 0xdd, 0x0c, 0xd8, 0x56, 0xcb, 0xc1, 0xa3,
+                0x5e, 0x74, 0xd4, 0x0c, 0x24, 0x53, 0xdf, 0xe2, 0x42, 0xc8, 0x6a, 0x7a, 0x60, 0xbc,
+                0xbd, 0xdb, 0x17, 0x96, 0x6c, 0x7d, 0xba, 0x76, 0x9e, 0xab, 0xd1, 0xc1, 0x67, 0xb7,
+                0xe8, 0x19, 0x78, 0xf9, 0x12, 0x8b, 0xac, 0x26, 0xa2, 0x8d, 0x77, 0x21, 0x30, 0x79,
+                0xcb, 0x56, 0xc0, 0x95, 0xa7, 0xc0, 0x60, 0xde, 0x0e, 0x77, 0x5c, 0xa8, 0xac, 0x8e,
+                0x6c, 0xa9, 0x4d, 0x19, 0xc6, 0x16, 0x2e, 0x44, 0xf7, 0xa8, 0xf0, 0x14, 0x9d, 0x31,
+                0xd3, 0x46, 0x3d, 0x01, 0xb6, 0x1a, 0x14, 0x63, 0xa9, 0xde, 0x3d, 0x8a, 0xb7, 0x40,
+                0x04, 0x0a, 0x76, 0xe0, 0x5b, 0x37, 0x64, 0x28, 0x86, 0x29, 0x87, 0x59, 0x5b, 0x87,
+                0xce, 0xa6, 0x94, 0xfe, 0x92, 0x0a, 0x06, 0x7e, 0x81, 0x6b, 0x4f, 0x29, 0xa3, 0xa2,
+                0x24, 0x50, 0x14, 0x0f, 0x13, 0x5d, 0x71, 0x9a, 0x97, 0x1b, 0x81, 0xfc, 0x19, 0x16,
+                0x98, 0x0a, 0x55, 0xdd, 0xf8, 0xd9, 0x87, 0x30, 0x57, 0x36, 0x35, 0xa0, 0x70, 0x85,
+                0xc4, 0xe7, 0x7c, 0x7e, 0x1c, 0xdb, 0xb6, 0x85, 0x42, 0x6e, 0xe4, 0x62, 0xcc, 0x30,
+                0x83, 0xa3, 0xf5, 0xa3, 0xb9, 0x17, 0xc0, 0x6f, 0x9a, 0x96, 0xf9, 0xf7, 0xbd, 0x81,
+                0xac, 0xa4, 0x9b, 0xef, 0x95, 0xb9, 0x28, 0x06, 0xc4, 0x2d, 0x09, 0x12, 0x01, 0x31,
+                0x42, 0xb2, 0x2a, 0x7b, 0xad, 0x72, 0x12, 0x11, 0x46, 0x91, 0xf1, 0xdc, 0x72, 0x64,
+                0xc6, 0x7e, 0x76, 0x34, 0xf5, 0xd7, 0x95, 0xc9, 0x75, 0x30, 0x62, 0xe3, 0x06, 0xc0,
+                0x6b, 0xc1, 0x03, 0xaa, 0x01, 0xc1, 0x0d, 0x1f, 0x5d, 0xd4, 0xcd, 0x59, 0xf6, 0x53,
+                0x2c, 0xb7, 0x23, 0xe3, 0xa0, 0x26,
             ],
             ock: [
-                0x06, 0x3c, 0x83, 0xa4, 0x95, 0x74, 0xe7, 0x80, 0x35, 0x89, 0xcc, 0x3d, 0x34, 0xb4,
-                0x38, 0x90, 0xf3, 0xd7, 0x63, 0x87, 0x35, 0xe7, 0xbd, 0x5e, 0xbd, 0xd1, 0xa5, 0xea,
-                0xb9, 0xd9, 0xc5, 0xd6,
+                0x4a, 0x25, 0x25, 0x4c, 0xcc, 0x44, 0x4e, 0xc6, 0x1c, 0x2b, 0xac, 0xeb, 0x2e, 0xe3,
+                0x97, 0x7a, 0x63, 0x32, 0x44, 0x9a, 0x3a, 0x53, 0xad, 0xd2, 0x31, 0xab, 0xf3, 0xd1,
+                0x8b, 0xb3, 0x29, 0x3d,
             ],
             op: [
                 0x65, 0x3d, 0x07, 0xc9, 0x07, 0x94, 0x6a, 0xc3, 0x02, 0x0e, 0xbd, 0xe1, 0xb4, 0xf6,
                 0x10, 0x21, 0x0c, 0x30, 0xc4, 0x50, 0xe4, 0x27, 0x12, 0x65, 0xa0, 0x5d, 0x6e, 0xce,
-                0x44, 0x6d, 0xf4, 0x39, 0xae, 0xec, 0x0d, 0xb9, 0x0e, 0x55, 0x83, 0x3c, 0x8b, 0xaf,
-                0x52, 0x6d, 0x66, 0x54, 0xa1, 0x74, 0x5b, 0xa4, 0x4c, 0xad, 0x3c, 0xf9, 0xa6, 0x2c,
-                0xfb, 0xee, 0x5d, 0xe3, 0x99, 0xca, 0x31, 0x26,
+                0x44, 0x6d, 0xf4, 0x39, 0x03, 0xfb, 0x79, 0x43, 0x75, 0x27, 0x5d, 0x23, 0xd1, 0x58,
+                0xd5, 0x64, 0x6b, 0xc4, 0x63, 0xa8, 0xb7, 0x38, 0xbc, 0x79, 0x38, 0xf6, 0x0d, 0xfb,
+                0x15, 0x5b, 0xef, 0x4d, 0x46, 0x1e, 0xec, 0x29,
             ],
             c_out: [
-                0xca, 0xb7, 0x8d, 0xd1, 0x83, 0xf3, 0xe1, 0x6a, 0xf7, 0x6e, 0x9a, 0x90, 0x3d, 0xd4,
-                0x2a, 0x96, 0x67, 0xbf, 0xe7, 0x08, 0xce, 0x88, 0x79, 0xb8, 0x38, 0x6e, 0x62, 0xac,
-                0x9f, 0x66, 0x74, 0xf4, 0x93, 0x59, 0x5d, 0xa5, 0x06, 0xe9, 0xef, 0x06, 0xbb, 0xa2,
-                0x4a, 0x93, 0x80, 0x60, 0xe5, 0xd3, 0x82, 0xcc, 0x75, 0xdf, 0xab, 0x97, 0xe0, 0xf8,
-                0x49, 0x4b, 0x47, 0x6a, 0xdf, 0x4f, 0xfd, 0x96, 0xff, 0x7f, 0x1b, 0x4f, 0x16, 0xf8,
-                0x59, 0x4b, 0x7c, 0x5a, 0x21, 0x9c, 0x7a, 0x00, 0xad, 0x15,
+                0x7b, 0xf4, 0x12, 0x7d, 0x22, 0xcc, 0x57, 0x35, 0x87, 0x51, 0x2f, 0xf8, 0x1e, 0x55,
+                0x3e, 0x3c, 0x98, 0x23, 0x5f, 0x51, 0xc7, 0x23, 0x7e, 0x9e, 0x76, 0x1a, 0x08, 0xf2,
+                0xe1, 0xe8, 0x0d, 0x04, 0x26, 0x98, 0xfc, 0x3b, 0x1d, 0x03, 0x18, 0xf1, 0xfd, 0xca,
+                0x8e, 0x41, 0xa3, 0x16, 0xd6, 0xaf, 0x3a, 0xc0, 0xc4, 0x0c, 0xe1, 0x99, 0x47, 0xa2,
+                0xba, 0xfe, 0x80, 0x4d, 0x46, 0x6e, 0xd0, 0x79, 0x82, 0x7f, 0xc1, 0x41, 0x91, 0xeb,
+                0xb5, 0x99, 0x17, 0x87, 0x49, 0xe9, 0xc4, 0x06, 0xaf, 0x26,
             ],
         },
     ]
diff --git a/src/test_vectors/note_encryption_zsa.rs b/src/test_vectors/note_encryption_zsa.rs
index 25cd361fa..534e24407 100644
--- a/src/test_vectors/note_encryption_zsa.rs
+++ b/src/test_vectors/note_encryption_zsa.rs
@@ -101,7 +101,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x42, 0xc2, 0x38, 0x51, 0x38, 0x15, 0x30, 0x2d, 0xf0, 0xf4, 0x83, 0x04, 0x21, 0xa6,
                 0xc1, 0x3e, 0x71, 0x01,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xca, 0x1f, 0xeb, 0x30, 0xca, 0x11, 0x17, 0x76, 0xc0, 0x41, 0x74, 0x66, 0xbd, 0x69,
                 0xb3, 0xd2, 0x13, 0x88, 0x2e, 0xef, 0x55, 0xe6, 0x0b, 0x6d, 0x9e, 0x2a, 0x98, 0xe7,
@@ -320,7 +319,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xa2, 0x17, 0x64, 0x10, 0x4a, 0x23, 0xea, 0xf6, 0xba, 0x49, 0x6c, 0xb9, 0xb8, 0xe8,
                 0x25, 0x7a, 0xd8, 0xb3,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xc1, 0xe1, 0x59, 0x5b, 0x8d, 0xe7, 0x55, 0x97, 0x66, 0xe5, 0xa6, 0x72, 0x5f, 0x5b,
                 0xe5, 0x74, 0x2f, 0x43, 0xbf, 0x40, 0x62, 0x3b, 0x71, 0x49, 0xca, 0xe2, 0x67, 0x5c,
@@ -539,7 +537,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x9d, 0x5e, 0x64, 0x07, 0x19, 0xbc, 0xa5, 0xc8, 0xed, 0x49, 0x99, 0x97, 0x34, 0xe6,
                 0xc5, 0xb3, 0x73, 0x3e,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xc8, 0x8d, 0x00, 0x84, 0x84, 0xc5, 0xd7, 0x98, 0x20, 0xab, 0x68, 0xc6, 0x7d, 0x08,
                 0x36, 0x72, 0xb0, 0x7f, 0x72, 0x7d, 0x44, 0xd0, 0xcd, 0x14, 0x73, 0x88, 0x00, 0xf8,
@@ -758,7 +755,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xfa, 0xde, 0x94, 0xfa, 0x0b, 0x46, 0xe3, 0xb1, 0xa5, 0x73, 0x34, 0x99, 0x34, 0xe2,
                 0x32, 0xb5, 0x0e, 0x96,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xa9, 0x0a, 0x9b, 0x8a, 0xb1, 0x35, 0x9d, 0xc9, 0x6b, 0xda, 0xe9, 0x0e, 0x52, 0x74,
                 0x78, 0x8c, 0xb0, 0xc4, 0x26, 0xef, 0xf2, 0x60, 0x43, 0x61, 0x85, 0x39, 0x8b, 0xff,
@@ -977,7 +973,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x72, 0x95, 0x89, 0xbe, 0x69, 0xd8, 0x28, 0xbe, 0x54, 0x30, 0x69, 0x16, 0x41, 0x3c,
                 0xd2, 0x50, 0x21, 0x17,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x8d, 0x67, 0xe3, 0xba, 0x4d, 0xbc, 0x9d, 0xa5, 0xe8, 0x38, 0x23, 0xa1, 0x23, 0x11,
                 0x63, 0x96, 0x51, 0xa4, 0xff, 0xa9, 0x5f, 0x27, 0xc1, 0x83, 0x0d, 0x91, 0xd8, 0xb7,
@@ -1196,7 +1191,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x6e, 0x62, 0xe4, 0xed, 0xc7, 0x86, 0xd9, 0xe0, 0xb2, 0x7d, 0x26, 0x62, 0x8b, 0x79,
                 0xda, 0x6b, 0x15, 0x14,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x9a, 0x09, 0xe4, 0x72, 0xe8, 0xe9, 0x96, 0xfc, 0xc3, 0x0e, 0xd5, 0x23, 0x72, 0x08,
                 0xdb, 0xb0, 0x01, 0x71, 0x32, 0x0e, 0x6b, 0xea, 0x43, 0x91, 0x86, 0x00, 0x9d, 0xad,
@@ -1415,7 +1409,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x0a, 0x12, 0x01, 0x2d, 0x63, 0xc0, 0x09, 0xc6, 0x77, 0x44, 0xba, 0xe0, 0xd5, 0x83,
                 0x88, 0xff, 0xee, 0x2f,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x54, 0x3e, 0xa7, 0x11, 0x56, 0xc9, 0xa6, 0xf8, 0x04, 0x1f, 0xa7, 0x7e, 0xc1, 0xc5,
                 0xaf, 0x90, 0x28, 0x8f, 0x27, 0x20, 0xf1, 0x3f, 0xf0, 0x93, 0xc6, 0x86, 0x26, 0x6b,
@@ -1634,7 +1627,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xcd, 0x51, 0x00, 0x89, 0x08, 0xa6, 0xcd, 0xd0, 0xaa, 0x02, 0x1b, 0x88, 0x8b, 0x98,
                 0xe2, 0x3c, 0x39, 0x11,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xbd, 0xda, 0xe8, 0xdf, 0xf1, 0x20, 0x5e, 0x04, 0x96, 0x8f, 0xae, 0x1f, 0xd9, 0xbe,
                 0x51, 0xd8, 0x25, 0xf5, 0xd8, 0x78, 0x1d, 0x93, 0x3d, 0x0f, 0x5b, 0xce, 0x9c, 0xa8,
@@ -1853,7 +1845,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x7e, 0xed, 0xd2, 0xa7, 0x06, 0x44, 0x07, 0x34, 0x78, 0x41, 0x01, 0xae, 0x2d, 0x8e,
                 0x87, 0xe5, 0x05, 0xad,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xc2, 0x79, 0xfa, 0x9d, 0x1c, 0x84, 0x11, 0x93, 0xd3, 0x32, 0xf8, 0xcc, 0xf4, 0xd0,
                 0xb1, 0xe4, 0x56, 0x01, 0xa8, 0xaf, 0x66, 0x76, 0xd7, 0x62, 0xfb, 0xa7, 0x31, 0x33,
@@ -2072,7 +2063,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xbd, 0xb9, 0x6f, 0x1c, 0xe0, 0x57, 0xc3, 0x30, 0xd1, 0xcc, 0xba, 0x2f, 0x7d, 0xa8,
                 0x71, 0x55, 0x00, 0xb5,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xea, 0x38, 0x44, 0x75, 0x9a, 0x9a, 0x1c, 0xc5, 0x28, 0xb2, 0x95, 0xce, 0x70, 0x13,
                 0x7a, 0x85, 0xf9, 0xf0, 0x8e, 0x41, 0xa5, 0xc7, 0xc1, 0xca, 0xc1, 0x55, 0xa6, 0x69,
@@ -2291,7 +2281,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x2c, 0x3b, 0x94, 0x21, 0x3e, 0x86, 0x47, 0x3b, 0x5e, 0x2f, 0xdd, 0x70, 0x97, 0x80,
                 0xbc, 0xca, 0x68, 0xb4,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xf6, 0x5d, 0x22, 0x96, 0x09, 0x58, 0xd7, 0x28, 0x59, 0x60, 0x9c, 0x99, 0x46, 0xd8,
                 0xa9, 0x4a, 0x06, 0x04, 0xb8, 0x00, 0x6c, 0xc7, 0x94, 0xbc, 0xab, 0x57, 0x73, 0x49,
@@ -2510,7 +2499,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x87, 0x2e, 0xf2, 0x17, 0x35, 0x43, 0xac, 0x81, 0x4c, 0x32, 0xb4, 0xb6, 0x9c, 0x9c,
                 0x34, 0x5e, 0x46, 0x98,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x27, 0x3c, 0x68, 0xd1, 0x9c, 0xda, 0xa8, 0x62, 0x8b, 0xac, 0x37, 0xa2, 0xd4, 0x2c,
                 0x51, 0x1c, 0x9b, 0xab, 0x65, 0xb6, 0xd8, 0xd5, 0xc5, 0xbd, 0x1e, 0x32, 0x77, 0x1a,
@@ -2729,7 +2717,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xce, 0xe7, 0x81, 0xe4, 0x00, 0x28, 0x5c, 0xc6, 0x66, 0xbc, 0x6c, 0x41, 0x89, 0xdb,
                 0x2d, 0xda, 0x71, 0x92,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xea, 0x1d, 0x9d, 0x26, 0x5e, 0xf4, 0x8a, 0x18, 0x97, 0x89, 0x70, 0xb1, 0x76, 0x7b,
                 0xe0, 0xe8, 0x14, 0x11, 0x94, 0x7e, 0x9e, 0x69, 0xb7, 0x19, 0xfa, 0xb7, 0x41, 0x72,
@@ -2948,7 +2935,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x80, 0x2d, 0x65, 0x00, 0x74, 0xdb, 0xd7, 0xe0, 0x6a, 0x48, 0x98, 0x03, 0x15, 0x30,
                 0x78, 0xe9, 0x97, 0x0b,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x9a, 0xd0, 0x7f, 0x1c, 0x28, 0x7b, 0xdd, 0x53, 0x4f, 0x6f, 0x7e, 0xae, 0x08, 0xf7,
                 0x85, 0x72, 0xa3, 0x05, 0xfa, 0x3b, 0x70, 0x68, 0xa3, 0x78, 0x38, 0x27, 0xaf, 0xe2,
@@ -3167,7 +3153,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x34, 0xda, 0xf4, 0xe5, 0x98, 0x34, 0xcd, 0x65, 0xd7, 0x9f, 0xfc, 0x41, 0xdd, 0xf0,
                 0x68, 0x2d, 0xc2, 0xab,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x31, 0x70, 0x5e, 0xfb, 0xf8, 0x0c, 0x7a, 0x7a, 0xb7, 0x81, 0xdf, 0x53, 0x77, 0xf8,
                 0x4d, 0x4b, 0x32, 0x36, 0xdb, 0x1f, 0x32, 0xac, 0xa7, 0x94, 0x5c, 0xf2, 0x6e, 0xc8,
@@ -3386,7 +3371,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xd7, 0xda, 0xfb, 0xbe, 0x53, 0xb0, 0xa9, 0x6b, 0x08, 0x1c, 0x90, 0xba, 0xde, 0xd9,
                 0xbe, 0x4b, 0x4f, 0x87,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x56, 0xbc, 0x48, 0x21, 0xa5, 0x3d, 0x5e, 0x9e, 0x6d, 0x7a, 0x04, 0x44, 0x44, 0x45,
                 0x4f, 0xfb, 0xc2, 0x36, 0x9c, 0xb1, 0x48, 0xeb, 0x76, 0xf1, 0xed, 0xf1, 0xb5, 0xc7,
@@ -3605,7 +3589,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x73, 0x07, 0x93, 0xf4, 0x36, 0x33, 0x1f, 0xfe, 0x66, 0x30, 0xc7, 0xca, 0x2d, 0x9b,
                 0x23, 0x2a, 0xe1, 0x98,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0xd6, 0xff, 0xc4, 0x74, 0x88, 0xad, 0x05, 0x93, 0x89, 0x70, 0xc4, 0xb1, 0x56, 0xd0,
                 0x53, 0xb9, 0x3b, 0xcb, 0xb4, 0x37, 0x57, 0x1c, 0x62, 0xf3, 0x75, 0x60, 0x7e, 0x90,
@@ -3824,7 +3807,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x95, 0x26, 0xa6, 0xe9, 0x4a, 0x49, 0x70, 0x10, 0xe3, 0x2a, 0x8a, 0x76, 0xbc, 0xdf,
                 0xa7, 0x20, 0xb8, 0xa6,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x85, 0x2f, 0x5c, 0x39, 0xd3, 0xf3, 0x55, 0xa3, 0x85, 0xe2, 0xab, 0xd2, 0x54, 0x3a,
                 0xa5, 0xed, 0x09, 0xc6, 0xee, 0x3b, 0x7f, 0x39, 0x34, 0x14, 0xe1, 0x1c, 0xd4, 0x20,
@@ -4043,7 +4025,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0x3a, 0x2a, 0xf5, 0x46, 0x32, 0xf8, 0x30, 0x08, 0x14, 0x68, 0x29, 0x65, 0x94, 0x5e,
                 0x7e, 0x33, 0x2a, 0x0d,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x09, 0x1d, 0x83, 0x73, 0x3a, 0x9f, 0xfb, 0x18, 0xc1, 0x7a, 0xd1, 0x93, 0x8d, 0xd2,
                 0x67, 0x93, 0xc3, 0xfe, 0xfa, 0xda, 0xee, 0xa8, 0xe2, 0x3c, 0x44, 0xd5, 0xe0, 0x18,
@@ -4262,7 +4243,6 @@ pub(crate) fn test_vectors() -> Vec<TestVector> {
                 0xd3, 0x7d, 0x17, 0x17, 0xa4, 0x8d, 0x8f, 0x00, 0x6c, 0x1f, 0xf5, 0x86, 0x21, 0x46,
                 0x29, 0x55, 0x39, 0x1c,
             ],
-            // FIXME: used instead of rho, which was possibly modified in zsa1 version
             nf_old: [
                 0x57, 0x87, 0x18, 0x97, 0x6d, 0xa3, 0xdc, 0xb4, 0x30, 0x32, 0x71, 0x52, 0x20, 0x72,
                 0xd0, 0x28, 0x44, 0x22, 0x13, 0x50, 0x86, 0x4e, 0xed, 0x56, 0x3d, 0xab, 0x30, 0x22,