diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00004.png
rename to tests_zemu/snapshots/fl-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00004.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00005.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00006.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00007.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/fl-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00001.png
deleted file mode 100644
index fdcf07b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00002.png
deleted file mode 100644
index 29d97e3..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00003.png
deleted file mode 100644
index 135422b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00004.png
deleted file mode 100644
index cedeffd..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00005.png
deleted file mode 100644
index f2af62b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_bigblindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index acbb161..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index fdcf07b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index d879f71..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index 03df129..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00004.png
deleted file mode 100644
index cedeffd..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00005.png
deleted file mode 100644
index f2af62b..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index acbb161..0000000
Binary files a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00001.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00002.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00003.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_blindsign_no_expert/00004.png
rename to tests_zemu/snapshots/fl-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00004.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00005.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00006.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00007.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/fl-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/fl-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00003.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00004.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00005.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00006.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00006.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00007.png b/tests_zemu/snapshots/s-sign_application_big_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00007.png
rename to tests_zemu/snapshots/s-sign_application_big_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00004.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00005.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00006.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00007.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00014.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00014.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00015.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00015.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00016.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00016.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00017.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00017.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00018.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00018.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00019.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00019.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00020.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00020.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00021.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00021.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00022.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00022.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00023.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00023.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00024.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00024.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00025.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00025.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00026.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00026.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00027.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00027.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00028.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00028.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00028.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00028.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00029.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00029.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00029.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00029.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00030.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00030.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00030.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00030.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00031.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00031.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00031.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00031.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00032.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00032.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00032.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00032.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00033.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00033.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00033.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00033.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00034.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00034.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00034.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00034.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00035.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00035.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00035.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00035.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00036.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00036.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00036.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00036.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00037.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00037.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00037.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00037.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00038.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00038.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00038.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00038.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00039.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00039.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00039.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00039.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00040.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00040.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00040.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00040.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00041.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00041.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00041.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00041.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00042.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00042.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00042.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00042.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00043.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00043.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00043.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00043.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00044.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00044.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00044.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00044.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00045.png b/tests_zemu/snapshots/s-sign_application_big_no_blindsign/00045.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigno_blindsign_expert/00045.png
rename to tests_zemu/snapshots/s-sign_application_big_no_blindsign/00045.png
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00000.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00000.png
deleted file mode 100644
index 28eb58a..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00001.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00001.png
deleted file mode 100644
index 04dc5e6..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00002.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00002.png
deleted file mode 100644
index 7730ac1..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00003.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00003.png
deleted file mode 100644
index 28eb58a..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00004.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00004.png
deleted file mode 100644
index 7730ac1..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00005.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00005.png
deleted file mode 100644
index 36e8419..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00006.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00006.png
deleted file mode 100644
index 8663365..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00007.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00007.png
deleted file mode 100644
index 107c4ae..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00008.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00008.png
deleted file mode 100644
index aa77788..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00009.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00009.png
deleted file mode 100644
index 3680930..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_big_shortcut/00010.png b/tests_zemu/snapshots/s-sign_application_big_shortcut/00010.png
deleted file mode 100644
index 3ad1234..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_big_shortcut/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00006.png
deleted file mode 100644
index e13f358..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00007.png
deleted file mode 100644
index 1600261..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00008.png
deleted file mode 100644
index 9adad3e..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00009.png
deleted file mode 100644
index c7725a1..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00010.png
deleted file mode 100644
index d64d5cb..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00011.png
deleted file mode 100644
index f015319..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00012.png
deleted file mode 100644
index 28eb58a..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00004.png
deleted file mode 100644
index bc7dbca..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00005.png b/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00005.png
deleted file mode 100644
index 8541bbf..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index be5b449..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index 72032ef..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index 5664a98..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index facd7ef..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00006.png
deleted file mode 100644
index e13f358..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00007.png
deleted file mode 100644
index 1600261..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00008.png
deleted file mode 100644
index 9adad3e..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00009.png
deleted file mode 100644
index c7725a1..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00010.png
deleted file mode 100644
index 4070544..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00011.png
deleted file mode 100644
index f015319..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_blindsign_expert/00012.png
deleted file mode 100644
index 28eb58a..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00012.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index be5b449..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00001.png
deleted file mode 100644
index 72032ef..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00002.png
deleted file mode 100644
index 5664a98..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00003.png
deleted file mode 100644
index facd7ef..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00004.png
deleted file mode 100644
index 4a1406f..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00005.png b/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00005.png
deleted file mode 100644
index 1c9c5af..0000000
Binary files a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_expert/00004.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_expert/00005.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00006.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00006.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00007.png b/tests_zemu/snapshots/s-sign_application_normal_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_blindsign_no_expert/00007.png
rename to tests_zemu/snapshots/s-sign_application_normal_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00004.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00005.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00006.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00007.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00009.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00009.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00010.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00010.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00011.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00011.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00012.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00012.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00013.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00013.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00014.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00014.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00015.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00015.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00016.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00016.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00017.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00017.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00018.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00018.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00019.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00019.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00020.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00020.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00021.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00021.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00022.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00022.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00023.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00023.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00024.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00024.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00025.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00025.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00026.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00026.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00027.png b/tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/s-sign_application_no_blindsign_expert/00027.png
rename to tests_zemu/snapshots/s-sign_application_normal_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00004.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00005.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00006.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_big_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00007.png
rename to tests_zemu/snapshots/sp-sign_application_big_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00004.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00005.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00006.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00007.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00014.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00014.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00015.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00015.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00016.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00016.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00017.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00017.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00018.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00018.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00019.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00019.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00020.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00020.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00021.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00021.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00022.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00022.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00023.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00023.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00024.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00024.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00025.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00025.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00026.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00026.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00027.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00027.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00028.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00028.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00028.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00028.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00029.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00029.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00029.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00029.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00030.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00030.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00030.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00030.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00031.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00031.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00031.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00031.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00032.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00032.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00032.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00032.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00033.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00033.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00033.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00033.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00034.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00034.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00034.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00034.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00035.png b/tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00035.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigno_blindsign_expert/00035.png
rename to tests_zemu/snapshots/sp-sign_application_big_no_blindsign/00035.png
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00000.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00000.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00001.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00001.png
deleted file mode 100644
index e10e004..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00002.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00002.png
deleted file mode 100644
index 7e236da..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00003.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00003.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00004.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00004.png
deleted file mode 100644
index 7e236da..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00005.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00005.png
deleted file mode 100644
index 5620922..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00006.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00006.png
deleted file mode 100644
index cacc9f0..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00007.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00007.png
deleted file mode 100644
index 89611be..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00008.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00008.png
deleted file mode 100644
index b623285..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00009.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00009.png
deleted file mode 100644
index 86e715d..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00010.png b/tests_zemu/snapshots/sp-sign_application_big_shortcut/00010.png
deleted file mode 100644
index c770372..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_big_shortcut/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00007.png
deleted file mode 100644
index e695ebd..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00008.png
deleted file mode 100644
index 175609d..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00009.png
deleted file mode 100644
index 4ff66e3..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00010.png
deleted file mode 100644
index 542e61f..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00011.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_bigblindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00007.png
deleted file mode 100644
index e695ebd..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00008.png
deleted file mode 100644
index 175609d..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00009.png
deleted file mode 100644
index ba032bd..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00010.png
deleted file mode 100644
index 542e61f..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00011.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00004.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00005.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00006.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_normal_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00007.png
rename to tests_zemu/snapshots/sp-sign_application_normal_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00004.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00005.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00006.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00007.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00009.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00009.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00010.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00010.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00011.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00011.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00012.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00012.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00013.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00013.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00014.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00014.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00015.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00015.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00016.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00016.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00017.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00017.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00018.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00018.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00019.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00019.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00020.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00020.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00021.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00021.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00022.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00022.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00023.png b/tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_no_blindsign_expert/00023.png
rename to tests_zemu/snapshots/sp-sign_application_normal_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00001.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00002.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00003.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/st-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00004.png
rename to tests_zemu/snapshots/st-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00004.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00005.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00006.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00007.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/st-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/st-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00001.png
deleted file mode 100644
index e63b74f..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00002.png
deleted file mode 100644
index e4ed3b2..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00003.png
deleted file mode 100644
index 3c68a44..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00004.png
deleted file mode 100644
index 75adea4..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00005.png
deleted file mode 100644
index 835a166..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_bigblindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index 9696ae1..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index e63b74f..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index 107124e..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index de92782..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00004.png
deleted file mode 100644
index 75adea4..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_blindsign_expert/00005.png
deleted file mode 100644
index 835a166..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index 9696ae1..0000000
Binary files a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_bigblindsign_no_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00001.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00002.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00003.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/st-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_blindsign_no_expert/00004.png
rename to tests_zemu/snapshots/st-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00004.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00005.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00006.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/st-sign_application_no_blindsign_expert/00007.png
rename to tests_zemu/snapshots/st-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00004.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_bigblindsign_no_expert/00005.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00006.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00006.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00007.png b/tests_zemu/snapshots/x-sign_application_big_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00007.png
rename to tests_zemu/snapshots/x-sign_application_big_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00004.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00005.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00006.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00007.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00008.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00009.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00010.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00011.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00012.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00012.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00013.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00013.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00014.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00014.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00015.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00015.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00016.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00016.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00017.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00017.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00018.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00018.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00019.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00019.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00020.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00020.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00021.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00021.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00022.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00022.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00023.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00023.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00023.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00024.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00024.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00024.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00024.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00025.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00025.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00025.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00025.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00026.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00026.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00026.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00026.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00027.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00027.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00027.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00027.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00028.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00028.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00028.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00028.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00029.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00029.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00029.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00029.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00030.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00030.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00030.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00030.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00031.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00031.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00031.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00031.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00032.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00032.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00032.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00032.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00033.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00033.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00033.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00033.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00034.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00034.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00034.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00034.png
diff --git a/tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00035.png b/tests_zemu/snapshots/x-sign_application_big_no_blindsign/00035.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_bigno_blindsign_expert/00035.png
rename to tests_zemu/snapshots/x-sign_application_big_no_blindsign/00035.png
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00000.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00000.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00001.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00001.png
deleted file mode 100644
index e10e004..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00002.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00002.png
deleted file mode 100644
index 7e236da..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00003.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00003.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00004.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00004.png
deleted file mode 100644
index 7e236da..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00005.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00005.png
deleted file mode 100644
index 5620922..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00006.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00006.png
deleted file mode 100644
index cacc9f0..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00007.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00007.png
deleted file mode 100644
index 89611be..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00008.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00008.png
deleted file mode 100644
index b623285..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00009.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00009.png
deleted file mode 100644
index 86e715d..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_big_shortcut/00010.png b/tests_zemu/snapshots/x-sign_application_big_shortcut/00010.png
deleted file mode 100644
index c770372..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_big_shortcut/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00000.png
deleted file mode 100644
index e65c5e9..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00001.png
deleted file mode 100644
index 137e102..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00002.png
deleted file mode 100644
index 9753547..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00003.png
deleted file mode 100644
index 15885e6..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00004.png
deleted file mode 100644
index e58b5d8..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00005.png
deleted file mode 100644
index 18b7d18..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00007.png
deleted file mode 100644
index e695ebd..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00008.png
deleted file mode 100644
index 175609d..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00009.png
deleted file mode 100644
index 4ff66e3..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00010.png
deleted file mode 100644
index 542e61f..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00011.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00000.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00000.png
deleted file mode 100644
index e65c5e9..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00001.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00001.png
deleted file mode 100644
index 137e102..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00002.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00002.png
deleted file mode 100644
index 9753547..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00003.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00003.png
deleted file mode 100644
index 15885e6..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00004.png
deleted file mode 100644
index e58b5d8..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00005.png
deleted file mode 100644
index 18b7d18..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_bigblindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00000.png
deleted file mode 100644
index e65c5e9..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00001.png
deleted file mode 100644
index 137e102..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00002.png
deleted file mode 100644
index 9753547..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00003.png
deleted file mode 100644
index 15885e6..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00004.png
deleted file mode 100644
index 28103bb..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00005.png
deleted file mode 100644
index c239bf2..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00006.png
deleted file mode 100644
index 7f7bd70..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00006.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00007.png
deleted file mode 100644
index e695ebd..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00007.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00008.png
deleted file mode 100644
index 175609d..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00008.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00009.png
deleted file mode 100644
index ba032bd..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00009.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00010.png
deleted file mode 100644
index 542e61f..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00010.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_blindsign_expert/00011.png
deleted file mode 100644
index a3f0b42..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_expert/00011.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00000.png
deleted file mode 100644
index e65c5e9..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00000.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00001.png
deleted file mode 100644
index 137e102..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00001.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00002.png
deleted file mode 100644
index 9753547..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00002.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00003.png
deleted file mode 100644
index 15885e6..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00003.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00004.png
deleted file mode 100644
index 28103bb..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00004.png and /dev/null differ
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00005.png
deleted file mode 100644
index c239bf2..0000000
Binary files a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00005.png and /dev/null differ
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00000.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00000.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00001.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00001.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00002.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00002.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00003.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00003.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00004.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00004.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00004.png
diff --git a/tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00005.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/sp-sign_application_blindsign_no_expert/00005.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00006.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00006.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00007.png b/tests_zemu/snapshots/x-sign_application_normal_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_blindsign_no_expert/00007.png
rename to tests_zemu/snapshots/x-sign_application_normal_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00000.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00000.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00000.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00000.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00001.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00001.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00001.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00001.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00002.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00002.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00002.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00002.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00003.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00003.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00003.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00003.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00004.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00004.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00004.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00004.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00005.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00005.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00005.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00005.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00006.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00006.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00006.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00006.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00007.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00007.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00007.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00007.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00008.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00008.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00008.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00008.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00009.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00009.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00009.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00009.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00010.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00010.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00010.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00010.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00011.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00011.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00011.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00011.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00012.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00012.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00012.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00012.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00013.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00013.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00013.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00013.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00014.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00014.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00014.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00014.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00015.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00015.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00015.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00015.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00016.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00016.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00016.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00016.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00017.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00017.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00017.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00017.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00018.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00018.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00018.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00018.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00019.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00019.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00019.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00019.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00020.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00020.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00020.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00020.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00021.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00021.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00021.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00021.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00022.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00022.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00022.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00022.png
diff --git a/tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00023.png b/tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00023.png
similarity index 100%
rename from tests_zemu/snapshots/x-sign_application_no_blindsign_expert/00023.png
rename to tests_zemu/snapshots/x-sign_application_normal_no_blindsign/00023.png