diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00000.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_transfer_2/00000.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00001.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_tx_normal/00001.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00002.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_tx_normal/00002.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00003.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_tx_normal/00003.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00004.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_tx_normal/00004.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00005.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00005.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_tx_normal/00005.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00005.png
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00006.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00006.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_transfer_2/00006.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00006.png
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00007.png b/tests_zemu/snapshots/fl-sign_simple_transfer/00007.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_transfer_2/00007.png
rename to tests_zemu/snapshots/fl-sign_simple_transfer/00007.png
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00001.png b/tests_zemu/snapshots/fl-sign_transfer_2/00001.png
deleted file mode 100644
index 9c94e38..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00002.png b/tests_zemu/snapshots/fl-sign_transfer_2/00002.png
deleted file mode 100644
index 5b966d0..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00003.png b/tests_zemu/snapshots/fl-sign_transfer_2/00003.png
deleted file mode 100644
index 2250a31..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00004.png b/tests_zemu/snapshots/fl-sign_transfer_2/00004.png
deleted file mode 100644
index 3c83ea9..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_2/00005.png b/tests_zemu/snapshots/fl-sign_transfer_2/00005.png
deleted file mode 100644
index 0b0b14e..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00000.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00000.png
deleted file mode 100644
index 2274dbc..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00001.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00001.png
deleted file mode 100644
index 9c94e38..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00002.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00002.png
deleted file mode 100644
index 5b966d0..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00003.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00003.png
deleted file mode 100644
index 2250a31..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00004.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00004.png
deleted file mode 100644
index 9c7b903..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00005.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00005.png
deleted file mode 100644
index 3592c25..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00006.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00006.png
deleted file mode 100644
index 566c04b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_create_2/00007.png b/tests_zemu/snapshots/fl-sign_transfer_create_2/00007.png
deleted file mode 100644
index 89ee8ad..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_create_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00000.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00000.png
deleted file mode 100644
index 2274dbc..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00001.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00001.png
deleted file mode 100644
index 9c94e38..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00002.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00002.png
deleted file mode 100644
index 5b966d0..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00003.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00003.png
deleted file mode 100644
index 10b0759..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00004.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00004.png
deleted file mode 100644
index 40c8e5b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00005.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00005.png
deleted file mode 100644
index 70b2d5d..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00006.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00006.png
deleted file mode 100644
index 566c04b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00007.png b/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00007.png
deleted file mode 100644
index 89ee8ad..0000000
Binary files a/tests_zemu/snapshots/fl-sign_transfer_cross_chain_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00000.png b/tests_zemu/snapshots/fl-sign_tx_normal/00000.png
deleted file mode 100644
index 2274dbc..0000000
Binary files a/tests_zemu/snapshots/fl-sign_tx_normal/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00006.png b/tests_zemu/snapshots/fl-sign_tx_normal/00006.png
deleted file mode 100644
index 566c04b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_tx_normal/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_tx_normal/00007.png b/tests_zemu/snapshots/fl-sign_tx_normal/00007.png
deleted file mode 100644
index 89ee8ad..0000000
Binary files a/tests_zemu/snapshots/fl-sign_tx_normal/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00000.png b/tests_zemu/snapshots/s-sign_simple_transfer/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_transfer_2/00000.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00000.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00001.png b/tests_zemu/snapshots/s-sign_simple_transfer/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00001.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00001.png
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00002.png b/tests_zemu/snapshots/s-sign_simple_transfer/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_transfer_2/00002.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00002.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00003.png b/tests_zemu/snapshots/s-sign_simple_transfer/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00003.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00003.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00004.png b/tests_zemu/snapshots/s-sign_simple_transfer/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00004.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00004.png
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00005.png b/tests_zemu/snapshots/s-sign_simple_transfer/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_transfer_2/00005.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00005.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00006.png b/tests_zemu/snapshots/s-sign_simple_transfer/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00006.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00006.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00007.png b/tests_zemu/snapshots/s-sign_simple_transfer/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00007.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00007.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00008.png b/tests_zemu/snapshots/s-sign_simple_transfer/00008.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00008.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00008.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00009.png b/tests_zemu/snapshots/s-sign_simple_transfer/00009.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00009.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00009.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00010.png b/tests_zemu/snapshots/s-sign_simple_transfer/00010.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00010.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00010.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00011.png b/tests_zemu/snapshots/s-sign_simple_transfer/00011.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00011.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00011.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00012.png b/tests_zemu/snapshots/s-sign_simple_transfer/00012.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00012.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00012.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00013.png b/tests_zemu/snapshots/s-sign_simple_transfer/00013.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00013.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00013.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00014.png b/tests_zemu/snapshots/s-sign_simple_transfer/00014.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00014.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00014.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00015.png b/tests_zemu/snapshots/s-sign_simple_transfer/00015.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00015.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00015.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00016.png b/tests_zemu/snapshots/s-sign_simple_transfer/00016.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00016.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00016.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00017.png b/tests_zemu/snapshots/s-sign_simple_transfer/00017.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00017.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00017.png
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00018.png b/tests_zemu/snapshots/s-sign_simple_transfer/00018.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_tx_normal/00018.png
rename to tests_zemu/snapshots/s-sign_simple_transfer/00018.png
diff --git a/tests_zemu/snapshots/s-sign_transfer_1/00019.png b/tests_zemu/snapshots/s-sign_transfer_1/00019.png
deleted file mode 100644
index f087398..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_1/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00001.png b/tests_zemu/snapshots/s-sign_transfer_2/00001.png
deleted file mode 100644
index f39b841..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00003.png b/tests_zemu/snapshots/s-sign_transfer_2/00003.png
deleted file mode 100644
index a1b71c6..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00004.png b/tests_zemu/snapshots/s-sign_transfer_2/00004.png
deleted file mode 100644
index 4caa4a9..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00006.png b/tests_zemu/snapshots/s-sign_transfer_2/00006.png
deleted file mode 100644
index 3b570d7..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00007.png b/tests_zemu/snapshots/s-sign_transfer_2/00007.png
deleted file mode 100644
index 005d123..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00008.png b/tests_zemu/snapshots/s-sign_transfer_2/00008.png
deleted file mode 100644
index 8f3da47..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00009.png b/tests_zemu/snapshots/s-sign_transfer_2/00009.png
deleted file mode 100644
index 8dda1f5..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00010.png b/tests_zemu/snapshots/s-sign_transfer_2/00010.png
deleted file mode 100644
index 45a4f18..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00011.png b/tests_zemu/snapshots/s-sign_transfer_2/00011.png
deleted file mode 100644
index 05c2284..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00012.png b/tests_zemu/snapshots/s-sign_transfer_2/00012.png
deleted file mode 100644
index fdaec24..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00013.png b/tests_zemu/snapshots/s-sign_transfer_2/00013.png
deleted file mode 100644
index ecbc4e7..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00014.png b/tests_zemu/snapshots/s-sign_transfer_2/00014.png
deleted file mode 100644
index 1c511d6..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00015.png b/tests_zemu/snapshots/s-sign_transfer_2/00015.png
deleted file mode 100644
index ca3a446..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00016.png b/tests_zemu/snapshots/s-sign_transfer_2/00016.png
deleted file mode 100644
index eda1d77..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00017.png b/tests_zemu/snapshots/s-sign_transfer_2/00017.png
deleted file mode 100644
index 67e4ac1..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00018.png b/tests_zemu/snapshots/s-sign_transfer_2/00018.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_2/00019.png b/tests_zemu/snapshots/s-sign_transfer_2/00019.png
deleted file mode 100644
index f087398..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_2/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00000.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00000.png
deleted file mode 100644
index c83ee89..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00001.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00001.png
deleted file mode 100644
index f39b841..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00002.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00002.png
deleted file mode 100644
index 2593b43..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00003.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00003.png
deleted file mode 100644
index a1b71c6..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00004.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00004.png
deleted file mode 100644
index 4caa4a9..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00005.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00005.png
deleted file mode 100644
index d283c27..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00006.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00006.png
deleted file mode 100644
index 3b570d7..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00007.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00007.png
deleted file mode 100644
index 005d123..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00008.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00008.png
deleted file mode 100644
index 8f3da47..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00009.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00009.png
deleted file mode 100644
index 8dda1f5..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00010.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00010.png
deleted file mode 100644
index 45a4f18..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00011.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00011.png
deleted file mode 100644
index d97aae8..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00012.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00012.png
deleted file mode 100644
index eda725a..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00013.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00013.png
deleted file mode 100644
index ecbc4e7..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00014.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00014.png
deleted file mode 100644
index a3331ae..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00015.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00015.png
deleted file mode 100644
index 44aa776..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00016.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00016.png
deleted file mode 100644
index eda1d77..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00017.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00017.png
deleted file mode 100644
index 67e4ac1..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00018.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00018.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_create_2/00019.png b/tests_zemu/snapshots/s-sign_transfer_create_2/00019.png
deleted file mode 100644
index f087398..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_create_2/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00000.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00000.png
deleted file mode 100644
index c83ee89..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00001.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00001.png
deleted file mode 100644
index f39b841..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00002.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00002.png
deleted file mode 100644
index 2593b43..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00003.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00003.png
deleted file mode 100644
index a1b71c6..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00004.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00004.png
deleted file mode 100644
index 4caa4a9..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00005.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00005.png
deleted file mode 100644
index d283c27..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00006.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00006.png
deleted file mode 100644
index 3560945..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00007.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00007.png
deleted file mode 100644
index 5e43738..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00008.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00008.png
deleted file mode 100644
index 65ee9c4..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00009.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00009.png
deleted file mode 100644
index fa17606..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00010.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00010.png
deleted file mode 100644
index f6be10f..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00011.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00011.png
deleted file mode 100644
index 213f112..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00012.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00012.png
deleted file mode 100644
index b93fd9e..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00013.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00013.png
deleted file mode 100644
index eda725a..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00014.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00014.png
deleted file mode 100644
index ecbc4e7..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00015.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00015.png
deleted file mode 100644
index 7511102..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00016.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00016.png
deleted file mode 100644
index 8606c80..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00017.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00017.png
deleted file mode 100644
index eda1d77..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00018.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00018.png
deleted file mode 100644
index 67e4ac1..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00018.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00019.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00019.png
deleted file mode 100644
index 006c26a..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00019.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00020.png b/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00020.png
deleted file mode 100644
index f087398..0000000
Binary files a/tests_zemu/snapshots/s-sign_transfer_cross_chain_2/00020.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00000.png b/tests_zemu/snapshots/s-sign_tx_normal/00000.png
deleted file mode 100644
index c83ee89..0000000
Binary files a/tests_zemu/snapshots/s-sign_tx_normal/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00002.png b/tests_zemu/snapshots/s-sign_tx_normal/00002.png
deleted file mode 100644
index 2593b43..0000000
Binary files a/tests_zemu/snapshots/s-sign_tx_normal/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_tx_normal/00005.png b/tests_zemu/snapshots/s-sign_tx_normal/00005.png
deleted file mode 100644
index d283c27..0000000
Binary files a/tests_zemu/snapshots/s-sign_tx_normal/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00000.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_transfer_2/00000.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00001.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_transfer_2/00001.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00002.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00002.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00003.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_transfer_2/00003.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00004.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00004.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00005.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00005.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00006.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_transfer_2/00006.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00007.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00007.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00008.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00008.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00008.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00008.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00009.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00009.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00009.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00010.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00010.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00010.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00011.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00011.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00011.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00012.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00012.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00012.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00013.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00013.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00013.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00013.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00014.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00014.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00014.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00015.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00015.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00016.png b/tests_zemu/snapshots/sp-sign_simple_transfer/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_tx_normal/00016.png
rename to tests_zemu/snapshots/sp-sign_simple_transfer/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_transfer_1/00017.png b/tests_zemu/snapshots/sp-sign_transfer_1/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_1/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00002.png b/tests_zemu/snapshots/sp-sign_transfer_2/00002.png
deleted file mode 100644
index 8b66af1..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00004.png b/tests_zemu/snapshots/sp-sign_transfer_2/00004.png
deleted file mode 100644
index 024f1c6..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00005.png b/tests_zemu/snapshots/sp-sign_transfer_2/00005.png
deleted file mode 100644
index 76cd8f9..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00007.png b/tests_zemu/snapshots/sp-sign_transfer_2/00007.png
deleted file mode 100644
index 1780e8f..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00008.png b/tests_zemu/snapshots/sp-sign_transfer_2/00008.png
deleted file mode 100644
index 1108ca2..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00009.png b/tests_zemu/snapshots/sp-sign_transfer_2/00009.png
deleted file mode 100644
index 3508ae4..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00010.png b/tests_zemu/snapshots/sp-sign_transfer_2/00010.png
deleted file mode 100644
index b52ee6c..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00011.png b/tests_zemu/snapshots/sp-sign_transfer_2/00011.png
deleted file mode 100644
index 131116b..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00012.png b/tests_zemu/snapshots/sp-sign_transfer_2/00012.png
deleted file mode 100644
index d41cee4..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00013.png b/tests_zemu/snapshots/sp-sign_transfer_2/00013.png
deleted file mode 100644
index c9d8a33..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00014.png b/tests_zemu/snapshots/sp-sign_transfer_2/00014.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00015.png b/tests_zemu/snapshots/sp-sign_transfer_2/00015.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00016.png b/tests_zemu/snapshots/sp-sign_transfer_2/00016.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_2/00017.png b/tests_zemu/snapshots/sp-sign_transfer_2/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_1/00017.png b/tests_zemu/snapshots/sp-sign_transfer_create_1/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_1/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00000.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00001.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00002.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00002.png
deleted file mode 100644
index 8b66af1..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00003.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00004.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00004.png
deleted file mode 100644
index 024f1c6..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00005.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00005.png
deleted file mode 100644
index 76cd8f9..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00006.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00007.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00007.png
deleted file mode 100644
index 1780e8f..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00008.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00008.png
deleted file mode 100644
index 1108ca2..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00009.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00009.png
deleted file mode 100644
index 3508ae4..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00010.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00010.png
deleted file mode 100644
index 33cd8cf..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00011.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00011.png
deleted file mode 100644
index 2115358..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00012.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00012.png
deleted file mode 100644
index d41cee4..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00013.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00013.png
deleted file mode 100644
index 3794349..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00014.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00014.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00015.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00015.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00016.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00016.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_create_2/00017.png b/tests_zemu/snapshots/sp-sign_transfer_create_2/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_create_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00000.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00001.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00002.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00002.png
deleted file mode 100644
index 8b66af1..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00003.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00004.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00004.png
deleted file mode 100644
index 024f1c6..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00005.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00005.png
deleted file mode 100644
index 76cd8f9..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00006.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00007.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00007.png
deleted file mode 100644
index 560c02d..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00008.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00008.png
deleted file mode 100644
index f9bd49f..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00009.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00009.png
deleted file mode 100644
index 1bf1363..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00010.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00010.png
deleted file mode 100644
index a3a7099..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00011.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00011.png
deleted file mode 100644
index 2115358..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00012.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00012.png
deleted file mode 100644
index d41cee4..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00013.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00013.png
deleted file mode 100644
index 332d6ae..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00014.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00014.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00015.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00015.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00016.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00016.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00017.png b/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/sp-sign_transfer_cross_chain_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00000.png b/tests_zemu/snapshots/sp-sign_tx_normal/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/sp-sign_tx_normal/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00001.png b/tests_zemu/snapshots/sp-sign_tx_normal/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/sp-sign_tx_normal/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00003.png b/tests_zemu/snapshots/sp-sign_tx_normal/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/sp-sign_tx_normal/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_tx_normal/00006.png b/tests_zemu/snapshots/sp-sign_tx_normal/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/sp-sign_tx_normal/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00000.png b/tests_zemu/snapshots/st-sign_simple_transfer/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00000.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00000.png
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00001.png b/tests_zemu/snapshots/st-sign_simple_transfer/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00001.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00001.png
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00002.png b/tests_zemu/snapshots/st-sign_simple_transfer/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00002.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00002.png
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00003.png b/tests_zemu/snapshots/st-sign_simple_transfer/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00003.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00003.png
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00004.png b/tests_zemu/snapshots/st-sign_simple_transfer/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00004.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00004.png
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00005.png b/tests_zemu/snapshots/st-sign_simple_transfer/00005.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00005.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00005.png
diff --git a/tests_zemu/snapshots/st-sign_tx_normal/00006.png b/tests_zemu/snapshots/st-sign_simple_transfer/00006.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_tx_normal/00006.png
rename to tests_zemu/snapshots/st-sign_simple_transfer/00006.png
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00000.png b/tests_zemu/snapshots/st-sign_transfer_2/00000.png
deleted file mode 100644
index f31f00d..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00001.png b/tests_zemu/snapshots/st-sign_transfer_2/00001.png
deleted file mode 100644
index 65ff275..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00002.png b/tests_zemu/snapshots/st-sign_transfer_2/00002.png
deleted file mode 100644
index 76e2485..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00003.png b/tests_zemu/snapshots/st-sign_transfer_2/00003.png
deleted file mode 100644
index d663b91..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00004.png b/tests_zemu/snapshots/st-sign_transfer_2/00004.png
deleted file mode 100644
index a6c5f43..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00005.png b/tests_zemu/snapshots/st-sign_transfer_2/00005.png
deleted file mode 100644
index adddb25..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00006.png b/tests_zemu/snapshots/st-sign_transfer_2/00006.png
deleted file mode 100644
index 38b104e..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_2/00007.png b/tests_zemu/snapshots/st-sign_transfer_2/00007.png
deleted file mode 100644
index 936d633..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00000.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00000.png
deleted file mode 100644
index f31f00d..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00001.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00001.png
deleted file mode 100644
index 65ff275..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00002.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00002.png
deleted file mode 100644
index 76e2485..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00003.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00003.png
deleted file mode 100644
index d663b91..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00004.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00004.png
deleted file mode 100644
index 355181a..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00005.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00005.png
deleted file mode 100644
index adddb25..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00006.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00006.png
deleted file mode 100644
index 38b104e..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_create_2/00007.png b/tests_zemu/snapshots/st-sign_transfer_create_2/00007.png
deleted file mode 100644
index 936d633..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_create_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00000.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00000.png
deleted file mode 100644
index f31f00d..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00001.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00001.png
deleted file mode 100644
index 65ff275..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00002.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00002.png
deleted file mode 100644
index 76e2485..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00003.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00003.png
deleted file mode 100644
index 59540b0..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00004.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00004.png
deleted file mode 100644
index e9a3f12..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00005.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00005.png
deleted file mode 100644
index adddb25..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00006.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00006.png
deleted file mode 100644
index 38b104e..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00007.png b/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00007.png
deleted file mode 100644
index 936d633..0000000
Binary files a/tests_zemu/snapshots/st-sign_transfer_cross_chain_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address-legacy/00000.png b/tests_zemu/snapshots/x-show_address-legacy/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-show_address-legacy/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address-legacy/00001.png b/tests_zemu/snapshots/x-show_address-legacy/00001.png
deleted file mode 100644
index 5048ead..0000000
Binary files a/tests_zemu/snapshots/x-show_address-legacy/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address-legacy/00002.png b/tests_zemu/snapshots/x-show_address-legacy/00002.png
deleted file mode 100644
index 4e7d98f..0000000
Binary files a/tests_zemu/snapshots/x-show_address-legacy/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address-legacy/00003.png b/tests_zemu/snapshots/x-show_address-legacy/00003.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-show_address-legacy/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address-legacy/00004.png b/tests_zemu/snapshots/x-show_address-legacy/00004.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-show_address-legacy/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject_legacy/00000.png b/tests_zemu/snapshots/x-show_address_reject_legacy/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject_legacy/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject_legacy/00001.png b/tests_zemu/snapshots/x-show_address_reject_legacy/00001.png
deleted file mode 100644
index 5048ead..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject_legacy/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject_legacy/00002.png b/tests_zemu/snapshots/x-show_address_reject_legacy/00002.png
deleted file mode 100644
index 4e7d98f..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject_legacy/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject_legacy/00003.png b/tests_zemu/snapshots/x-show_address_reject_legacy/00003.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject_legacy/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject_legacy/00004.png b/tests_zemu/snapshots/x-show_address_reject_legacy/00004.png
deleted file mode 100644
index de8a291..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject_legacy/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-show_address_reject_legacy/00005.png b/tests_zemu/snapshots/x-show_address_reject_legacy/00005.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-show_address_reject_legacy/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00000.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00001.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00001.png
deleted file mode 100644
index 974d2e7..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00002.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00002.png
deleted file mode 100644
index a58dfd1..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00003.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00003.png
deleted file mode 100644
index 15de6b1..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00004.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00004.png
deleted file mode 100644
index e2f1fad..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00005.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00005.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00006.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00006.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00007.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00007.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_hash_1_legacy/00008.png b/tests_zemu/snapshots/x-sign_hash_1_legacy/00008.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-sign_hash_1_legacy/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00000.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00001.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00002.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00002.png
deleted file mode 100644
index cb84a2b..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00003.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00004.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00004.png
deleted file mode 100644
index 82de24c..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00005.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00005.png
deleted file mode 100644
index d609904..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00006.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00007.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00007.png
deleted file mode 100644
index 79f0c4a..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00008.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00008.png
deleted file mode 100644
index 2bb1f90..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00009.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00009.png
deleted file mode 100644
index c39b28b..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00010.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00010.png
deleted file mode 100644
index 131116b..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00011.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00011.png
deleted file mode 100644
index 9eae1e4..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00012.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00012.png
deleted file mode 100644
index 5824ac0..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00013.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00013.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00014.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00014.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00015.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00015.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00016.png b/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00016.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-sign_simple_transfer_legacy/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00000.png b/tests_zemu/snapshots/x-sign_transfer_2/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00001.png b/tests_zemu/snapshots/x-sign_transfer_2/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00002.png b/tests_zemu/snapshots/x-sign_transfer_2/00002.png
deleted file mode 100644
index 8b66af1..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00003.png b/tests_zemu/snapshots/x-sign_transfer_2/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00004.png b/tests_zemu/snapshots/x-sign_transfer_2/00004.png
deleted file mode 100644
index 024f1c6..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00005.png b/tests_zemu/snapshots/x-sign_transfer_2/00005.png
deleted file mode 100644
index 76cd8f9..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00006.png b/tests_zemu/snapshots/x-sign_transfer_2/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00007.png b/tests_zemu/snapshots/x-sign_transfer_2/00007.png
deleted file mode 100644
index 1780e8f..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00008.png b/tests_zemu/snapshots/x-sign_transfer_2/00008.png
deleted file mode 100644
index 1108ca2..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00009.png b/tests_zemu/snapshots/x-sign_transfer_2/00009.png
deleted file mode 100644
index 3508ae4..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00010.png b/tests_zemu/snapshots/x-sign_transfer_2/00010.png
deleted file mode 100644
index b52ee6c..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00011.png b/tests_zemu/snapshots/x-sign_transfer_2/00011.png
deleted file mode 100644
index 131116b..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00012.png b/tests_zemu/snapshots/x-sign_transfer_2/00012.png
deleted file mode 100644
index d41cee4..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00013.png b/tests_zemu/snapshots/x-sign_transfer_2/00013.png
deleted file mode 100644
index c9d8a33..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00014.png b/tests_zemu/snapshots/x-sign_transfer_2/00014.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00015.png b/tests_zemu/snapshots/x-sign_transfer_2/00015.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00016.png b/tests_zemu/snapshots/x-sign_transfer_2/00016.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_2/00017.png b/tests_zemu/snapshots/x-sign_transfer_2/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00000.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00001.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00002.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00002.png
deleted file mode 100644
index 8b66af1..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00003.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00004.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00004.png
deleted file mode 100644
index 024f1c6..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00005.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00005.png
deleted file mode 100644
index 76cd8f9..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00006.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00007.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00007.png
deleted file mode 100644
index 1780e8f..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00008.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00008.png
deleted file mode 100644
index 1108ca2..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00009.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00009.png
deleted file mode 100644
index 3508ae4..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00010.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00010.png
deleted file mode 100644
index 33cd8cf..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00011.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00011.png
deleted file mode 100644
index 2115358..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00012.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00012.png
deleted file mode 100644
index d41cee4..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00013.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00013.png
deleted file mode 100644
index 3794349..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00014.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00014.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00015.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00015.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00016.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00016.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_create_2/00017.png b/tests_zemu/snapshots/x-sign_transfer_create_2/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_create_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00000.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00001.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00002.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00002.png
deleted file mode 100644
index 8b66af1..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00003.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00004.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00004.png
deleted file mode 100644
index 024f1c6..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00005.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00005.png
deleted file mode 100644
index 76cd8f9..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00006.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00007.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00007.png
deleted file mode 100644
index 560c02d..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00008.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00008.png
deleted file mode 100644
index f9bd49f..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00009.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00009.png
deleted file mode 100644
index 1bf1363..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00010.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00010.png
deleted file mode 100644
index a3a7099..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00011.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00011.png
deleted file mode 100644
index 2115358..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00012.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00012.png
deleted file mode 100644
index d41cee4..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00013.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00013.png
deleted file mode 100644
index 332d6ae..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00014.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00014.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00015.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00015.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00016.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00016.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00016.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00017.png b/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00017.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-sign_transfer_cross_chain_2/00017.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00000.png b/tests_zemu/snapshots/x-sign_tx_normal/00000.png
deleted file mode 100644
index 33a7bd8..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00001.png b/tests_zemu/snapshots/x-sign_tx_normal/00001.png
deleted file mode 100644
index ba22ea5..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00002.png b/tests_zemu/snapshots/x-sign_tx_normal/00002.png
deleted file mode 100644
index cb84a2b..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00003.png b/tests_zemu/snapshots/x-sign_tx_normal/00003.png
deleted file mode 100644
index e4ade64..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00004.png b/tests_zemu/snapshots/x-sign_tx_normal/00004.png
deleted file mode 100644
index 82de24c..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00005.png b/tests_zemu/snapshots/x-sign_tx_normal/00005.png
deleted file mode 100644
index d609904..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00006.png b/tests_zemu/snapshots/x-sign_tx_normal/00006.png
deleted file mode 100644
index 99f0b15..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00007.png b/tests_zemu/snapshots/x-sign_tx_normal/00007.png
deleted file mode 100644
index 79f0c4a..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00008.png b/tests_zemu/snapshots/x-sign_tx_normal/00008.png
deleted file mode 100644
index 2bb1f90..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00009.png b/tests_zemu/snapshots/x-sign_tx_normal/00009.png
deleted file mode 100644
index c39b28b..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00010.png b/tests_zemu/snapshots/x-sign_tx_normal/00010.png
deleted file mode 100644
index 131116b..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00011.png b/tests_zemu/snapshots/x-sign_tx_normal/00011.png
deleted file mode 100644
index 9eae1e4..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00012.png b/tests_zemu/snapshots/x-sign_tx_normal/00012.png
deleted file mode 100644
index 5824ac0..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00013.png b/tests_zemu/snapshots/x-sign_tx_normal/00013.png
deleted file mode 100644
index 7234d99..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00013.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00014.png b/tests_zemu/snapshots/x-sign_tx_normal/00014.png
deleted file mode 100644
index 0c0a855..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00014.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00015.png b/tests_zemu/snapshots/x-sign_tx_normal/00015.png
deleted file mode 100644
index 1e4be69..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00015.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_tx_normal/00016.png b/tests_zemu/snapshots/x-sign_tx_normal/00016.png
deleted file mode 100644
index 58ec4be..0000000
Binary files a/tests_zemu/snapshots/x-sign_tx_normal/00016.png and /dev/null differ
diff --git a/tests_zemu/tests/common.ts b/tests_zemu/tests/common.ts
index d5d009c..dbad9d8 100644
--- a/tests_zemu/tests/common.ts
+++ b/tests_zemu/tests/common.ts
@@ -26,6 +26,3 @@ export const defaultOptions = {
   custom: `-s "${APP_SEED}"`,
   X11: false,
 }
-
-export const simpleTxNormal =
-  '{"networkId":"mainnet01","payload":{"exec":{"data":{},"code":"(coin.transfer \\"83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790\\" \\"9790d119589a26114e1a42d92598b3f632551c566819ec48e0e8c54dae6ebb42\\" 11.0)"}},"signers":[{"pubKey":"83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790","clist":[{"args":[],"name":"coin.GAS"},{"args":["83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790","9790d119589a26114e1a42d92598b3f632551c566819ec48e0e8c54dae6ebb42",11],"name":"coin.TRANSFER"}]}],"meta":{"creationTime":1634009214,"ttl":28800,"gasLimit":600,"chainId":"0","gasPrice":1.0e-5,"sender":"83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790"},"nonce":"\\"2021-10-12T03:27:53.700Z\\""}'
diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts
index 2f3a117..f89288e 100644
--- a/tests_zemu/tests/standard.test.ts
+++ b/tests_zemu/tests/standard.test.ts
@@ -16,11 +16,7 @@
 
 import Zemu, { ButtonKind, zondaxMainmenuNavigation, isTouchDevice } from '@zondax/zemu'
 import { KadenaApp } from '@zondax/ledger-kadena'
-import { PATH, defaultOptions, models, simpleTxNormal } from './common'
-import { blake2bFinal, blake2bInit, blake2bUpdate } from 'blakejs'
-
-// @ts-expect-error
-import ed25519 from 'ed25519-supercop'
+import { PATH, defaultOptions, models } from './common'
 
 jest.setTimeout(60000)
 
@@ -146,36 +142,4 @@ describe('Standard', function () {
       await sim.close()
     }
   })
-
-  test.concurrent.each(models)('sign tx normal', async function (m) {
-    const sim = new Zemu(m.path)
-    try {
-      await sim.start({ ...defaultOptions, model: m.name })
-      const app = new KadenaApp(sim.getTransport())
-
-      const txBlob = Buffer.from(simpleTxNormal)
-      const responseAddr = await app.getAddressAndPubKey(PATH, false)
-      const pubKey = responseAddr.pubkey
-
-      // do not wait here.. we need to navigate
-      const signatureRequest = app.sign(PATH, txBlob)
-
-      // Wait until we are not in the main menu
-      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
-      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_tx_normal`)
-
-      const signatureResponse = await signatureRequest
-      console.log(signatureResponse)
-
-      const context = blake2bInit(32)
-      blake2bUpdate(context, txBlob)
-      const hash = Buffer.from(blake2bFinal(context))
-
-      // Now verify the signature
-      const valid = ed25519.verify(signatureResponse.signature, hash, pubKey)
-      expect(valid).toEqual(true)
-    } finally {
-      await sim.close()
-    }
-  })
 })
diff --git a/tests_zemu/tests/testscases/json.ts b/tests_zemu/tests/testscases/json.ts
new file mode 100644
index 0000000..ad473bc
--- /dev/null
+++ b/tests_zemu/tests/testscases/json.ts
@@ -0,0 +1,9 @@
+import { PATH } from '../common'
+
+export const JSON_TEST_CASES = [
+  {
+    name: 'simple_transfer',
+    json: '{"networkId":"mainnet01","payload":{"exec":{"data":{},"code":"(coin.transfer \\"83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790\\" \\"9790d119589a26114e1a42d92598b3f632551c566819ec48e0e8c54dae6ebb42\\" 11.0)"}},"signers":[{"pubKey":"83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790","clist":[{"args":[],"name":"coin.GAS"},{"args":["83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790","9790d119589a26114e1a42d92598b3f632551c566819ec48e0e8c54dae6ebb42",11],"name":"coin.TRANSFER"}]}],"meta":{"creationTime":1634009214,"ttl":28800,"gasLimit":600,"chainId":"0","gasPrice":1.0e-5,"sender":"83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790"},"nonce":"\\"2021-10-12T03:27:53.700Z\\""}',
+    path: PATH,
+  },
+]
diff --git a/tests_zemu/tests/testscases/transactions.ts b/tests_zemu/tests/testscases/transactions.ts
index 05fd843..48ab3fa 100644
--- a/tests_zemu/tests/testscases/transactions.ts
+++ b/tests_zemu/tests/testscases/transactions.ts
@@ -5,8 +5,8 @@ export const TRANSACTIONS_TEST_CASES = [
   {
     name: 'transfer_1',
     type: TransferTxType.TRANSFER,
-    path: PATH,
     txParams: {
+      path: PATH,
       recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
       amount: '1.23',
       network: 'testnet04',
@@ -21,8 +21,8 @@ export const TRANSACTIONS_TEST_CASES = [
   {
     name: 'transfer_create_1',
     type: TransferTxType.TRANSFER_CREATE,
-    path: PATH,
     txParams: {
+      path: PATH,
       recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
       amount: '23.67',
       network: 'testnet04',
@@ -37,8 +37,8 @@ export const TRANSACTIONS_TEST_CASES = [
   {
     name: 'transfer_cross_chain_1',
     type: TransferTxType.TRANSFER_CROSS_CHAIN,
-    path: PATH,
     txParams: {
+      path: PATH,
       recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
       amount: '23.67',
       network: 'testnet04',
@@ -48,62 +48,67 @@ export const TRANSACTIONS_TEST_CASES = [
       creationTime: 1665722463,
       ttl: '600',
       nonce: '2022-10-14 04:41:03.193557 UTC',
+      recipient_chainId: 2,
     },
-    recipient_chainId: 2,
-  },
-  {
-    name: 'transfer_2',
-    type: TransferTxType.TRANSFER,
-    path: PATH,
-    txParams: {
-      recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
-      amount: '1.23',
-      namespace: 'free',
-      module: 'mytoken-123',
-      network: 'testnet04',
-      chainId: 0,
-      gasPrice: '1.0e-6',
-      gasLimit: '2300',
-      creationTime: 1665647810,
-      ttl: '600',
-      nonce: '2022-10-13 07:56:50.893257 UTC',
-    },
-  },
-  {
-    name: 'transfer_create_2',
-    type: TransferTxType.TRANSFER_CREATE,
-    path: PATH,
-    txParams: {
-      recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
-      amount: '23.67',
-      namespace: 'free',
-      module: 'mytoken-123',
-      network: 'testnet04',
-      chainId: 1,
-      gasPrice: '1.0e-6',
-      gasLimit: '2300',
-      creationTime: 1665722463,
-      ttl: '600',
-      nonce: '2022-10-14 04:41:03.193557 UTC',
-    },
-  },
-  {
-    name: 'transfer_cross_chain_2',
-    type: TransferTxType.TRANSFER_CROSS_CHAIN,
-    path: PATH,
-    txParams: {
-      recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
-      amount: '23.67',
-      namespace: 'free',
-      module: 'mytoken-123',
-      network: 'testnet04',
-      chainId: 1,
-      gasPrice: '1.0e-6',
-      gasLimit: '2300',
-      creationTime: 1665722463,
-      ttl: '600',
-      nonce: '2022-10-14 04:41:03.193557 UTC',
-    },
-    recipient_chainId: 2,
   },
 ]
+
+export const TRANSACTIONS_LEGACY_TEST_CASES = [
+  // {
+  //   name: 'transfer_test_handler_legacy_len_287',
+  //   type: TransferTxType.TRANSFER,
+  //   txParams: {
+  //       path: PATH,
+  //       recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
+  //       amount: "1.233333333333333333333333333333",
+  //       network: "testnet040000000",
+  //       chainId: 0,
+  //       gasPrice: "1.011111111111111e-6",
+  //       gasLimit: "0123456789",
+  //       creationTime: 9876543210,
+  //       ttl: "600000000000000000001",
+  //       nonce: "2022-10-13 07:56:50.893257 UTC",
+  //       namespace: "testnamespace012",
+  //       module: "testmoduletestmoduletestmodule01"
+  //   },
+  //   blob : '{"networkId":"testnet04","payload":{"exec":{"data":{},"code":"(coin.transfer \\"k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad\\" \\"k:83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790\\" 1.23)"}},"signers":[{"pubKey":"de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad","clist":[{"args":["k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad","k:83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790",1.23],"name":"coin.TRANSFER"},{"args":[],"name":"coin.GAS"}]}],"meta":{"creationTime":1665647810,"ttl":600,"gasLimit":2300,"chainId":"0","gasPrice":1.0e-6,"sender":"k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad"},"nonce":"2022-10-13 07:56:50.893257 UTC"}',
+  // },
+  // {
+  //   name: 'transfer_test_handler_legacy_len_285',
+  //   type: TransferTxType.TRANSFER,
+  //   txParams: {
+  //       path: PATH,
+  //       recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
+  //       amount: "1.233333333333333333333333333333",
+  //       network: "testnet040000000",
+  //       chainId: 0,
+  //       gasPrice: "1.011111111111111e-6",
+  //       gasLimit: "01234567",
+  //       creationTime: 9876543210,
+  //       ttl: "600000000000000000001",
+  //       nonce: "2022-10-13 07:56:50.893257 UTC",
+  //       namespace: "testnamespace012",
+  //       module: "testmoduletestmoduletestmodule01"
+  //   },
+  //   blob : '{"networkId":"testnet04","payload":{"exec":{"data":{},"code":"(coin.transfer \\"k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad\\" \\"k:83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790\\" 1.23)"}},"signers":[{"pubKey":"de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad","clist":[{"args":["k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad","k:83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790",1.23],"name":"coin.TRANSFER"},{"args":[],"name":"coin.GAS"}]}],"meta":{"creationTime":1665647810,"ttl":600,"gasLimit":2300,"chainId":"0","gasPrice":1.0e-6,"sender":"k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad"},"nonce":"2022-10-13 07:56:50.893257 UTC"}',
+  // },
+  // {
+  //   name: 'transfer_test_handler_legacy_len_284',
+  //   type: TransferTxType.TRANSFER,
+  //   txParams: {
+  //       path: PATH,
+  //       recipient: '83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790',
+  //       amount: "1.233333333333333333333333333333",
+  //       network: "testnet040000000",
+  //       chainId: 0,
+  //       gasPrice: "1.011111111111111e-6",
+  //       gasLimit: "0123456",
+  //       creationTime: 9876543210,
+  //       ttl: "600000000000000000001",
+  //       nonce: "2022-10-13 07:56:50.893257 UTC",
+  //       namespace: "testnamespace012",
+  //       module: "testmoduletestmoduletestmodule01"
+  //   },
+  //   blob : '{"networkId":"testnet04","payload":{"exec":{"data":{},"code":"(coin.transfer \\"k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad\\" \\"k:83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790\\" 1.23)"}},"signers":[{"pubKey":"de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad","clist":[{"args":["k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad","k:83934c0f9b005f378ba3520f9dea952fb0a90e5aa36f1b5ff837d9b30c471790",1.23],"name":"coin.TRANSFER"},{"args":[],"name":"coin.GAS"}]}],"meta":{"creationTime":1665647810,"ttl":600,"gasLimit":2300,"chainId":"0","gasPrice":1.0e-6,"sender":"k:de12b5e16b93fe81ca4d70656bee4334f2e40f9f28b9796e792d28f2cead74ad"},"nonce":"2022-10-13 07:56:50.893257 UTC"}',
+  // },
+]
diff --git a/tests_zemu/tests/transactions.test.ts b/tests_zemu/tests/transactions.test.ts
index c0d958b..787bc27 100644
--- a/tests_zemu/tests/transactions.test.ts
+++ b/tests_zemu/tests/transactions.test.ts
@@ -14,11 +14,12 @@
  *  limitations under the License.
  ******************************************************************************* */
 
-import Zemu, { ButtonKind, zondaxMainmenuNavigation, isTouchDevice } from '@zondax/zemu'
+import Zemu from '@zondax/zemu'
 import { KadenaApp, TransferTxType, TransferCrossChainTxParams } from '@zondax/ledger-kadena'
 import { PATH, defaultOptions, models } from './common'
 import { blake2bFinal, blake2bInit, blake2bUpdate } from 'blakejs'
 
+import { JSON_TEST_CASES } from './testscases/json'
 import { HASH_TEST_CASES } from './testscases/hash'
 import { TRANSACTIONS_TEST_CASES } from './testscases/transactions'
 
@@ -27,8 +28,42 @@ import ed25519 from 'ed25519-supercop'
 
 jest.setTimeout(60000)
 
+describe.each(JSON_TEST_CASES)('Tx json', function (data) {
+  test.concurrent.each(models)('sign json', async function (m) {
+    const sim = new Zemu(m.path)
+    try {
+      await sim.start({ ...defaultOptions, model: m.name })
+      const app = new KadenaApp(sim.getTransport())
+
+      const txBlob = Buffer.from(data.json, 'utf-8')
+      const responseAddr = await app.getAddressAndPubKey(data.path, false)
+      const pubKey = responseAddr.pubkey
+
+      // do not wait here.. we need to navigate
+      const signatureRequest = app.sign(data.path, txBlob)
+
+      // Wait until we are not in the main menu
+      await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot())
+      await sim.compareSnapshotsAndApprove('.', `${m.prefix.toLowerCase()}-sign_${data.name}`)
+
+      const signatureResponse = await signatureRequest
+      console.log(signatureResponse)
+
+      const context = blake2bInit(32)
+      blake2bUpdate(context, txBlob)
+      const hash = Buffer.from(blake2bFinal(context))
+
+      // Now verify the signature
+      const valid = ed25519.verify(signatureResponse.signature, hash, pubKey)
+      expect(valid).toEqual(true)
+    } finally {
+      await sim.close()
+    }
+  })
+})
+
 describe.each(HASH_TEST_CASES)('Hash transactions', function (data) {
-  test.concurrent.each(models)('sign', async function (m) {
+  test.concurrent.each(models)('sign hash', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
@@ -37,8 +72,8 @@ describe.each(HASH_TEST_CASES)('Hash transactions', function (data) {
       const responseAddr = await app.getAddressAndPubKey(data.path)
       const pubKey = responseAddr.pubkey
 
-      // do not wait here... we need to navigate
       await sim.toggleExpertMode()
+      // do not wait here... we need to navigate
       const signatureRequest = app.signHash(data.path, data.hash)
 
       // // Wait until we are not in the main menu
@@ -64,30 +99,30 @@ describe.each(HASH_TEST_CASES)('Hash transactions', function (data) {
   })
 })
 
-describe.each(TRANSACTIONS_TEST_CASES)('Tx transactions', function (data) {
-  test.concurrent.each(models)('sign', async function (m) {
+describe.each(TRANSACTIONS_TEST_CASES)('Tx transfer', function (data) {
+  test.concurrent.each(models)('sign transfer tx', async function (m) {
     const sim = new Zemu(m.path)
     try {
       await sim.start({ ...defaultOptions, model: m.name })
       const app = new KadenaApp(sim.getTransport())
 
-      const responseAddr = await app.getAddressAndPubKey(data.path)
+      const responseAddr = await app.getAddressAndPubKey(data.txParams.path)
       const pubKey = responseAddr.pubkey
 
       var signatureRequest = null
       // do not wait here... we need to navigate
       if (data.type === TransferTxType.TRANSFER) {
-        signatureRequest = app.signTransferTx(data.path, data.txParams)
+        signatureRequest = app.signTransferTx(data.txParams.path, data.txParams)
       } else if (data.type === TransferTxType.TRANSFER_CREATE) {
-        signatureRequest = app.signTransferCreateTx(data.path, data.txParams)
+        signatureRequest = app.signTransferCreateTx(data.txParams.path, data.txParams)
       } else if (data.type === TransferTxType.TRANSFER_CROSS_CHAIN) {
         const transferCrossChainParams = data.txParams as TransferCrossChainTxParams
-        if (data.recipient_chainId !== undefined) {
-          transferCrossChainParams.recipient_chainId = data.recipient_chainId
+        if (data.txParams.recipient_chainId !== undefined) {
+          transferCrossChainParams.recipient_chainId = data.txParams.recipient_chainId
         } else {
           throw new Error('recipient_chainId is undefined')
         }
-        signatureRequest = app.signTransferCrossChainTx(data.path, transferCrossChainParams)
+        signatureRequest = app.signTransferCrossChainTx(data.txParams.path, transferCrossChainParams)
       }
 
       if (signatureRequest == null) {
@@ -100,11 +135,27 @@ describe.each(TRANSACTIONS_TEST_CASES)('Tx transactions', function (data) {
 
       const signatureResponse = await signatureRequest
 
+      const decodedHash = decodeHash(signatureResponse.hash)
+
+      console.log('Pubkey: ', pubKey.toString('hex'))
+      console.log('Signature: ', signatureResponse.signature.toString('hex'))
+      console.log('Decoded Hash: ', decodedHash.toString('hex'))
+
       // Now verify the signature
-      const valid = ed25519.verify(signatureResponse.signature, signatureResponse.hash, pubKey)
+      const valid = ed25519.verify(signatureResponse.signature, decodedHash, pubKey)
       expect(valid).toEqual(true)
     } finally {
       await sim.close()
     }
   })
 })
+
+function decodeHash(encodedHash: string): Buffer {
+  let base64Hash = encodedHash.replace(/-/g, '+').replace(/_/g, '/')
+
+  while (base64Hash.length % 4) {
+    base64Hash += '='
+  }
+
+  return Buffer.from(base64Hash, 'base64')
+}