diff --git a/tests/integration/nano/conftest.py b/tests/integration/nano/conftest.py index 52ba34bc4..01a2d87a3 100644 --- a/tests/integration/nano/conftest.py +++ b/tests/integration/nano/conftest.py @@ -87,13 +87,16 @@ def pytest_runtest_logreport(report): logs[report.head_line].append(report) @pytest.hookimpl(tryfirst=True) -def pytest_runtest_logfinish(location): +def pytest_runtest_logfinish(nodeid, location): """Called at the end of running the runtest protocol for a single item.""" if global_log_dir is not None: - log_dir = global_log_dir / Path(location[0]).stem + log_dir = Path(nodeid.split(".py")[0]) + # Remove `tests/integration/nano/` + log_dir = Path(*log_dir.parts[3:]) + log_dir = global_log_dir / log_dir log_dir.mkdir(parents=True, exist_ok=True) head_line = location[2] - log_file = log_dir / f"{head_line.replace(' ', '_')}.log" + log_file = log_dir / f"{head_line}.log" with open(log_file, 'w', encoding="utf-8") as writer: for report in logs[head_line]: writer.write(f"============================== {report.when.capitalize()} {report.outcome} ==============================\n") @@ -178,6 +181,16 @@ def app(backend: SpeculosTezosBackend, golden_run: bool) -> TezosAppScreen: """Get `app` for pytest.""" return TezosAppScreen(backend, AppKind.WALLET, golden_run) +@pytest.fixture(scope="function") +def snapshot_dir(request) -> Path : + """Get the test snapshot location.""" + test_file_path = Path(request.fspath) + file_name = test_file_path.stem + test_name = request.node.name + # Get test directory from the root + test_file_snapshot_dir = Path(*test_file_path.parts[len(Path(__file__).parts)-1:-1]) + return test_file_snapshot_dir / file_name / test_name + def requires_device(device): """Wrapper to run the pytest test only with the provided device.""" return pytest.mark.skipif( diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00000.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00000.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00001.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00001.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00002.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00002.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00003.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/bip32_ed25519/00003.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[BIP32_ED25519]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00000.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00000.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00001.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00001.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00002.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00002.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00003.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/ed25519/00003.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[ED25519]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00000.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00000.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00001.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00001.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00002.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00002.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00003.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256k1/00003.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256K1]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00000.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00000.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00001.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00001.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00002.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00002.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00003.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_provide_pk/secp256r1/00003.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_provide_pk[SECP256R1]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00000.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00000.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00001.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00001.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00002.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00002.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00003.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00003.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00004.png b/tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00004.png rename to tests/integration/nano/snapshots/nanos/test_public_key/test_reject_pk/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_ballot/test_sign_ballot/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00026.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00027.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00028.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00029.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00030.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00030.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00031.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00031.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00031.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00031.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00032.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00032.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00032.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00032.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00033.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00033.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00033.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00033.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00034.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00034.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00034.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00034.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00035.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00035.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00035.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_nanos_regression_batched_ops/00035.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_delegation/test_sign_delegation/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_origination/test_sign_origination/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_proposals/test_sign_proposals/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_ballot/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_ballot/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_complex_operation/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_reveal/test_sign_reveal/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_delegation/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_delegation/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_failing_noop/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00026.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00027.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00028.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00029.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00030.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00030.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00031.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00031.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00031.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00031.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00032.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00032.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00032.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00032.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00033.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00033.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00033.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00033.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00034.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00034.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00034.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00034.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_increase_paid_storage/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00026.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00027.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00028.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00029.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00030.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00030.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00026.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00027.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00028.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00029.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_origination/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_origination/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png new file mode 100644 index 000000000..3d62c24e3 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png new file mode 100644 index 000000000..303483945 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png new file mode 100644 index 000000000..1d1b09a14 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png new file mode 100644 index 000000000..adb4570b0 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png new file mode 100644 index 000000000..70bcb24d8 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png new file mode 100644 index 000000000..0720f431f Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png new file mode 100644 index 000000000..17c59ecff Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png new file mode 100644 index 000000000..b3219b3b2 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png new file mode 100644 index 000000000..5acbd69b1 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png new file mode 100644 index 000000000..132f26c2a Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png new file mode 100644 index 000000000..b544e3a1e Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png new file mode 100644 index 000000000..dc2a68439 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00018.png new file mode 100644 index 000000000..25c9fc239 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00018.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00019.png new file mode 100644 index 000000000..2ed8f5a21 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00019.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00020.png new file mode 100644 index 000000000..21403bb69 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00020.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00021.png new file mode 100644 index 000000000..9f7edcff7 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00021.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00022.png new file mode 100644 index 000000000..ef13186b2 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00022.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00023.png new file mode 100644 index 000000000..c4d3ba42a Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00023.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00024.png new file mode 100644 index 000000000..5bd44f93a Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00024.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00025.png new file mode 100644 index 000000000..40408e9fb Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00025.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00026.png new file mode 100644 index 000000000..503c23b5a Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00026.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00027.png new file mode 100644 index 000000000..975659640 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00027.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00028.png new file mode 100644 index 000000000..fb6611ffe Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00028.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00029.png new file mode 100644 index 000000000..7ba8f0d10 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00029.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00030.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00030.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00031.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00031.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00031.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00031.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00032.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00032.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00032.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00032.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00033.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00033.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00033.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00033.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00034.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00034.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00034.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00034.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00035.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00035.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00035.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00035.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00036.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00036.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00036.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00036.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00037.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00037.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00037.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00037.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00038.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00038.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00038.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00038.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_proposals/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_proposals/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_register_global_constant/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_reveal/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_reveal/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_nanos_regression_batched_ops/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00026.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00027.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00028.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00029.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00030.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00030.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00031.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00031.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_ensure_always_clearsign/00031.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00031.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_add_messages/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00026.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00026.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00027.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00027.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00028.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00028.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00029.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00029.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00030.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00030.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00031.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00031.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00031.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00031.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00032.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00032.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00032.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_reject_transaction/00032.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/no_whitelist/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_originate/with_whitelist/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_consensus_key/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_set_deposit_limit/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_signing/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_micheline_without_hash/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_apdu_sign/test_sign_with_small_packet/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/blind/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_blind/clear/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_reject/reject_from_clear/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_reject_from_clear/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/blind/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/blind/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_deep/clear/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_deep/clear/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/blind/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/blind/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_blindsign_too_large/clear/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_blindsign_too_large/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/accept/summary/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/blindsigning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/delegate_parameters/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00025.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00025.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/finalize_unstake/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/basic/reject_at_summary/summary/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/only_transactions/summary/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00024.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00024.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00018.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00018.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00019.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00019.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00020.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00020.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00021.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00021.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00022.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00022.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00023.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00023.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_too_long_operation/without_fee_or_amount/summary/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00031.png b/tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00031.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transfer_ticket/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[ED25519]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/stake/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/basic/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_key/test_sign_with_another_seed[seed21]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_bip25519_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/unstake/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/complex/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00015.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00015.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00016.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_at_the_end/00016.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz1_ed25519_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/simple/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_added_inside/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz2_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_another_seed/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00013.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00013.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00014.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/one_byte_removed_inside/00014.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_magic_bytes/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/unknown_operation/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_regression_continue_after_reject/reject_public_key/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_tz3_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00001.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00001.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00002.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00002.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00003.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00003.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00004.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00004.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00005.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00005.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00005.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00006.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00006.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00007.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00007.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00008.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00008.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00009.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00009.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00010.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00010.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00010.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00011.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_sc_rollup_execute_outbox_message/00011.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00012.png b/tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00012.png rename to tests/integration/nano/snapshots/nanos/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_reject_pk/00000.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_reject_pk/00000.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00000.png diff --git a/tests/integration/nano/snapshots/nanos/test_reject_pk/00001.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_reject_pk/00001.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_reject_pk/00002.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_reject_pk/00002.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00002.png diff --git a/tests/integration/nano/snapshots/nanos/test_reject_pk/00003.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_reject_pk/00003.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00003.png diff --git a/tests/integration/nano/snapshots/nanos/test_reject_pk/00004.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_reject_pk/00004.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00004.png diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png new file mode 100644 index 000000000..053fc534b Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00001.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00001.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00001.png diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png new file mode 100644 index 000000000..8b7980241 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png new file mode 100644 index 000000000..97eab5d99 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png new file mode 100644 index 000000000..9126afa34 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png new file mode 100644 index 000000000..78b15b726 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00006.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_long_hash/00006.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00006.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00007.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00007.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00007.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00008.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_with_small_packet/00008.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00009.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00009.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00009.png diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png new file mode 100644 index 000000000..92b4bce4e Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00011.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00011.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00011.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00012.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00012.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00012.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00013.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00013.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00013.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00014.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00014.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00015.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00015.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00015.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00016.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00016.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00016.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00017.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00017.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00017.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00018.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00018.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00018.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00019.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00019.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00019.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00020.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00020.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00020.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00021.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00021.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00021.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00021.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00022.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00022.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00022.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00022.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00023.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00023.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00023.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00023.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00024.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00024.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00024.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00024.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00025.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00025.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00025.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00025.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00026.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00026.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00026.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00026.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00027.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00027.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00027.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00027.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00028.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00028.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00028.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00028.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00029.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00029.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00029.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00029.png diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00030.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00030.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00030.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00030.png diff --git a/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00031.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00031.png new file mode 100644 index 000000000..7e0e23820 Binary files /dev/null and b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00031.png differ diff --git a/tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00032.png b/tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00032.png similarity index 100% rename from tests/integration/nano/snapshots/nanos/test_sign_transaction/reject/00032.png rename to tests/integration/nano/snapshots/nanos/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00032.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/bip32_ed25519/00000.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[BIP32_ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/bip32_ed25519/00000.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[BIP32_ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/bip32_ed25519/00001.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[BIP32_ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/bip32_ed25519/00001.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[BIP32_ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/bip32_ed25519/00002.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[BIP32_ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/bip32_ed25519/00002.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[BIP32_ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/ed25519/00000.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/ed25519/00000.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/ed25519/00001.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/ed25519/00001.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/ed25519/00002.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/ed25519/00002.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256k1/00000.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256K1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256k1/00000.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256K1]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256k1/00001.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256K1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256k1/00001.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256K1]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256k1/00002.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256K1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256k1/00002.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256K1]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256r1/00000.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256R1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256r1/00000.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256R1]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256r1/00001.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256R1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256r1/00001.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256R1]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256r1/00002.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256R1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_provide_pk/secp256r1/00002.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_provide_pk[SECP256R1]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00000.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00000.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00001.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00001.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00002.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00002.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00003.png b/tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00003.png rename to tests/integration/nano/snapshots/nanosp/test_public_key/test_reject_pk/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_ballot/test_sign_ballot/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00017.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00017.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00017.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00018.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00018.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00018.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00019.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00019.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00019.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00020.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00020.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00020.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_delegation/test_sign_delegation/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_origination/test_sign_origination/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_proposals/test_sign_proposals/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_ballot/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_ballot/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_reveal/test_sign_reveal/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_complex_operation/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_delegation/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_delegation/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_failing_noop/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_micheline_without_hash/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_micheline_without_hash/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00017.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00017.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_origination/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_origination/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_proposals/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_proposals/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_ensure_always_clearsign/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_reveal/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_reveal/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_reject_transaction/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_add_messages/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/no_whitelist/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_originate/with_whitelist/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_signing/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_deposit_limit/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_set_consensus_key/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_increase_paid_storage/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_register_global_constant/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_potential_empty_screen/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_nanosp_regression_potential_empty_screen/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_nanosp_regression_press_right_works_across_apdu_recieves/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_nanosp_regression_press_right_works_across_apdu_recieves/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_micheline_without_hash/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_micheline_without_hash/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_apdu_sign/test_sign_with_small_packet/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/blind/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/blind/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/blind/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_regression_continue_after_reject/reject_public_key/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_blind/clear/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_reject/reject_from_clear/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_reject_from_clear/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/blind/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/blind/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/blind/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/blind/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/blind/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/blind/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_deep/clear/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_deep/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/blind/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/blind/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/blind/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/blind/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_micheline_without_hash/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_micheline_without_hash/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_blindsign_too_large/clear/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_blindsign_too_large/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/accept/summary/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/blindsigning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/blindsigning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/blindsigning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/blindsigning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/blindsigning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/blindsigning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_pk/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_reject_pk/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/delegate_parameters/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00019.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00019.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/finalize_unstake/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/basic/reject_at_summary/summary/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/only_transactions/summary/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/without_fee_or_amount/summary/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz1_bip25519_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz1_bip25519_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz1_bip25519_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz1_bip25519_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transfer_ticket/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz1_ed25519_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz1_ed25519_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz1_ed25519_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz1_ed25519_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz2_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz2_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz2_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz2_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz3_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz3_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz3_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz3_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/stake/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/basic/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz1_bip25519_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz1_bip25519_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/unstake/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/complex/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00015.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00015.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00015.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00016.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_at_the_end/00016.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00016.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz1_ed25519_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz1_ed25519_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/simple/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_added_inside/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz2_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz2_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_another_seed/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00008.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00008.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00009.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00009.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00010.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00010.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00011.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00011.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00012.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00012.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00013.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00013.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00013.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00014.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/one_byte_removed_inside/00014.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_magic_bytes/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/unknown_operation/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_tz3_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_tz3_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00001.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00001.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00002.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00002.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00003.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00003.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00004.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00004.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00005.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00005.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00006.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_sc_rollup_execute_outbox_message/00006.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00007.png b/tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00007.png rename to tests/integration/nano/snapshots/nanosp/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_pk/00000.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_reject_pk/00000.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_pk/00001.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_reject_pk/00001.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00001.png diff --git a/tests/integration/nano/snapshots/nanosp/test_reject_pk/00002.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_reject_pk/00002.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00002.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00003.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00003.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00000.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00000.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00001.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00001.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00002.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00002.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00003.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00003.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00004.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00004.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00005.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00005.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00006.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00006.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00006.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00007.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_long_hash/00007.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00007.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00008.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_with_small_packet/00008.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00009.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00009.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00009.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00010.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00010.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00011.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00011.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00011.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00012.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00012.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00012.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00013.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00013.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00014.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00014.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png diff --git a/tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00015.png b/tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanosp/test_sign_transaction/reject/00015.png rename to tests/integration/nano/snapshots/nanosp/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/bip32_ed25519/00000.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[BIP32_ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/bip32_ed25519/00000.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[BIP32_ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/bip32_ed25519/00001.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[BIP32_ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/bip32_ed25519/00001.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[BIP32_ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/bip32_ed25519/00002.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[BIP32_ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/bip32_ed25519/00002.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[BIP32_ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/ed25519/00000.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/ed25519/00000.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/ed25519/00001.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/ed25519/00001.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/ed25519/00002.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/ed25519/00002.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/secp256k1/00000.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256K1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/secp256k1/00000.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256K1]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/secp256k1/00001.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256K1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/secp256k1/00001.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256K1]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/secp256k1/00002.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256K1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/secp256k1/00002.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256K1]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/secp256r1/00000.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256R1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/secp256r1/00000.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256R1]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/secp256r1/00001.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256R1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/secp256r1/00001.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256R1]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_provide_pk/secp256r1/00002.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256R1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_provide_pk/secp256r1/00002.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_provide_pk[SECP256R1]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00000.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00000.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00001.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00001.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00002.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00002.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00003.png b/tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00003.png rename to tests/integration/nano/snapshots/nanox/test_public_key/test_reject_pk/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_ballot/test_sign_ballot/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00018.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00018.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00018.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00019.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00019.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_nanox_regression_batched_ops/00019.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00018.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00018.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00018.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00019.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00019.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00019.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00020.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00020.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00020.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_batched_operations/test_sign_complex_operation/00020.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_delegation/test_sign_delegation/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_failing_noop/test_sign_failing_noop/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_increase_paid_storage/test_sign_increase_paid_storage/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_ballot/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_ballot/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_origination/test_sign_origination/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_complex_operation/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_proposals/test_sign_proposals/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_delegation/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_delegation/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_register_global_constant/test_sign_register_global_constant/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_failing_noop/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_reveal/test_sign_reveal/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_add_messages/test_sign_sc_rollup_add_messages/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_micheline_without_hash/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_micheline_without_hash/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_execute_outbox_message/test_sign_sc_rollup_execute_outbox_message/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_origination/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_origination/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[empty_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_proposals/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_proposals/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png new file mode 100644 index 000000000..36cf8c9ff Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00001.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png new file mode 100644 index 000000000..b89f83a8c Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00005.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png new file mode 100644 index 000000000..4e0a6585b Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00007.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png new file mode 100644 index 000000000..fc5b3c16b Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00008.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png new file mode 100644 index 000000000..659efc67d Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00009.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png new file mode 100644 index 000000000..042e19ffb Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00010.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png new file mode 100644 index 000000000..d12ef7047 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00011.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png new file mode 100644 index 000000000..c2f1700dc Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00012.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png new file mode 100644 index 000000000..82d06c4bd Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00013.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[no_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_register_global_constant/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png new file mode 100644 index 000000000..36cf8c9ff Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00001.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png new file mode 100644 index 000000000..b89f83a8c Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00005.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png new file mode 100644 index 000000000..4e0a6585b Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00007.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png new file mode 100644 index 000000000..fc5b3c16b Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00008.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png new file mode 100644 index 000000000..659efc67d Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00009.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png new file mode 100644 index 000000000..042e19ffb Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00010.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png new file mode 100644 index 000000000..d12ef7047 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00011.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png new file mode 100644 index 000000000..c2f1700dc Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00012.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png new file mode 100644 index 000000000..82d06c4bd Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00013.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_sc_rollup_originate/test_sign_sc_rollup_originate[with_whitelist]/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_reveal/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_reveal/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_consensus_key/test_sign_set_consensus_key/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_add_messages/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_set_deposit_limit/test_sign_set_deposit_limit/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_nanox_regression_batched_ops/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_ensure_always_clearsign/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_ensure_always_clearsign/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/no_whitelist/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_reject_transaction/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_originate/with_whitelist/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_finalize_unstake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_consensus_key/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_set_delegate_parameters_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_set_deposit_limit/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_simple_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_stake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_signing/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_transaction/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_unstake_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_sign_with_long_hash/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_increase_paid_storage/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transaction/test_too_complex_transaction/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/operations/test_sign_transfer_ticket/test_sign_transfer_ticket/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_micheline_without_hash/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_micheline_without_hash/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/blind/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/blind/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_micheline_without_hash/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_apdu_sign/test_sign_with_small_packet/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/blind/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/blind/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/blind/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_regression_continue_after_reject/reject_public_key/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/blind/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_blind/clear/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_blind/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_reject/reject_from_clear/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_reject_from_clear/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/blind/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/blind/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/blind/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/blind/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_micheline_without_hash/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_micheline_without_hash/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_deep/clear/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_deep/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/blind/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/blind/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/blind/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/blind/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/blind/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/blind/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/blind/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/blind/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/blindsigning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/blind/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/blindsigning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/blind/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_blindsign_too_large/clear/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_blindsign_too_large/clear/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/accept/summary/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_summary/summary/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_basic_too_long_operation_at_warning/clear_n_too_long_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/blindsigning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/blindsigning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/blindsigning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/blindsigning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_reject_pk/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_reject_pk/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/blindsigning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/delegate_parameters/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_blindsigning/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/finalize_unstake/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00019.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00019.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00019.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_reject_too_long_operation_with_too_large_at_too_large_warning/clear_n_too_large_warning/00019.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/accept/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_too_large_warning/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/basic/reject_at_summary/summary/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_basic_too_long_operation/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/only_transactions/summary/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_only_transactions/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz1_bip25519_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz1_bip25519_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/blindsigning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00017.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00017.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00017.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00017.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00018.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00018.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_too_large_warning/clear_n_too_large_warning/00018.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_with_too_large/clear_n_too_large_warning/00018.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/clear_n_too_long_warning/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/clear_n_too_long_warning/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/without_fee_or_amount/summary/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_blindsign/test_sign_too_long_operation_without_fee_or_amount/summary/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transfer_ticket/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz1_bip25519_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz1_bip25519_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz1_ed25519_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz1_ed25519_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[BIP32_ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[ED25519]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[ED25519]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz1_ed25519_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[ED25519]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz1_ed25519_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[ED25519]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz2_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[ED25519]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz2_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[ED25519]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz2_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz2_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz3_sign_micheline_basic/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz3_sign_micheline_basic/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256K1]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz3_sign_micheline_basic/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz3_sign_micheline_basic/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_micheline_basic[SECP256R1]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz1_bip25519_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz1_bip25519_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/stake/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/basic/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png new file mode 100644 index 000000000..471324463 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/test_key/test_sign_with_another_seed[seed21]/00010.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_tz1_ed25519_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz1_ed25519_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/unstake/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/complex/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png new file mode 100644 index 000000000..1fcdee14d Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00008.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00015.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00015.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00015.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00016.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00016.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_at_the_end/00016.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_at_the_end]/00016.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz2_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz2_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/simple/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_added_inside/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_added_inside]/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_tz3_sign_micheline_basic/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_tz3_sign_micheline_basic/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_another_seed/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00008.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00008.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00008.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00008.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00009.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00009.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00010.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00010.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00011.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00011.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00012.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00012.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00013.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00013.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00014.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00014.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/one_byte_removed_inside/00014.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[one_byte_removed_inside]/00014.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_magic_bytes/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_magic_bytes]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00000.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00002.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00003.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00004.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00004.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00004.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/unknown_operation/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_error[unknown_operation]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png new file mode 100644 index 000000000..9fa51df29 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00000.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00001.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00001.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png new file mode 100644 index 000000000..c0ac1f93d Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00002.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png new file mode 100644 index 000000000..af9beddbf Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00003.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png new file mode 100644 index 000000000..908600200 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00004.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00005.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00005.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00006.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_sc_rollup_execute_outbox_message/00006.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00007.png b/tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00007.png rename to tests/integration/nano/snapshots/nanox/test_sign/test_parsing_errors/test_parsing_hard_fail[wrong_last_packet]/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_reject_pk/00000.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00000.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_reject_pk/00000.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00000.png diff --git a/tests/integration/nano/snapshots/nanox/test_reject_pk/00001.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_reject_pk/00001.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_reject_pk/00002.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00002.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_reject_pk/00002.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00002.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00003.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00003.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_too_long_operation/too_large/reject_at_blindsigning/blindsigning/00003.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_public_key/00003.png diff --git a/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png new file mode 100644 index 000000000..9fa51df29 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00000.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00001.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00001.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00001.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00001.png diff --git a/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png new file mode 100644 index 000000000..c0ac1f93d Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00002.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png new file mode 100644 index 000000000..af9beddbf Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00003.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png new file mode 100644 index 000000000..908600200 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00004.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00005.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00005.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00005.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00006.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00006.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_small_packet/00006.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00006.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00007.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00007.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_with_long_hash/00007.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00007.png diff --git a/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png new file mode 100644 index 000000000..1fcdee14d Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00008.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00009.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00009.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00009.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00009.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00010.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00010.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00010.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00011.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00011.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00011.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00011.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00012.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00012.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00012.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00012.png diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00013.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00013.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00013.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00013.png diff --git a/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png new file mode 100644 index 000000000..471324463 Binary files /dev/null and b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00014.png differ diff --git a/tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00015.png b/tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00015.png similarity index 100% rename from tests/integration/nano/snapshots/nanox/test_sign_transaction/reject/00015.png rename to tests/integration/nano/snapshots/nanox/test_wrong_apdu/test_regression_continue_after_reject/reject_signing/00015.png diff --git a/tests/integration/nano/test_public_key.py b/tests/integration/nano/test_public_key.py index e59b1e1a4..f3d9969c0 100644 --- a/tests/integration/nano/test_public_key.py +++ b/tests/integration/nano/test_public_key.py @@ -16,85 +16,57 @@ """Gathering of tests related to public key.""" +from pathlib import Path + +import pytest + from utils.account import Account, SigType from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT -def test_get_pk(app: TezosAppScreen): +accounts = [ + Account("m/44'/1729'/0'/0'", + SigType.ED25519, + "edpkuXX2VdkdXzkN11oLCb8Aurdo1BTAtQiK8ZY9UPj2YMt3AHEpcY"), + Account("m/44'/1729'/0'/0'", + SigType.SECP256K1, + "sppk7bVy617DmGvXsMqcwsiLtnedTN2trUi5ugXcNig7en4rHJyunK1"), + Account("m/44'/1729'/0'/0'", + SigType.SECP256R1, + "p2pk67fq5pzuMMABZ9RDrooYbLrgmnQbLt8z7PTGM9mskf7LXS5tdBG"), + Account("m/44'/1729'/0'/0'", + SigType.BIP32_ED25519, + "edpkumJgSsSxkpiB5hmTq6eZcrmc6BsJtLAhYceFTiziFqje4mongz") +] + +@pytest.mark.parametrize("account", accounts, ids=lambda account: f"{account.sig_type}") +def test_get_pk(app: TezosAppScreen, account: Account): """Test that public keys get from the app are correct.""" - accounts = [ - Account("m/44'/1729'/0'/0'", - SigType.ED25519, - "edpkuXX2VdkdXzkN11oLCb8Aurdo1BTAtQiK8ZY9UPj2YMt3AHEpcY"), - Account("m/44'/1729'/0'/0'", - SigType.SECP256K1, - "sppk7bVy617DmGvXsMqcwsiLtnedTN2trUi5ugXcNig7en4rHJyunK1"), - Account("m/44'/1729'/0'/0'", - SigType.SECP256R1, - "p2pk67fq5pzuMMABZ9RDrooYbLrgmnQbLt8z7PTGM9mskf7LXS5tdBG"), - Account("m/44'/1729'/0'/0'", - SigType.BIP32_ED25519, - "edpkumJgSsSxkpiB5hmTq6eZcrmc6BsJtLAhYceFTiziFqje4mongz") - ] - - for account in accounts: - app.assert_screen(Screen.HOME) + app.assert_screen(Screen.HOME) - data = app.backend.get_public_key(account, with_prompt=False) + data = app.backend.get_public_key(account, with_prompt=False) - app.checker.check_public_key(account, data) + app.checker.check_public_key(account, data) app.quit() -def test_provide_pk(app: TezosAppScreen): +@pytest.mark.parametrize("account", accounts, ids=lambda account: f"{account.sig_type}") +def test_provide_pk(app: TezosAppScreen, account: Account, snapshot_dir: Path): """Test that public keys get from the app are correct and correctly displayed.""" - test_name = "test_provide_pk" app.assert_screen(Screen.HOME) - accounts = [ - ( - Account("m/44'/1729'/0'/0'", - SigType.ED25519, - "edpkuXX2VdkdXzkN11oLCb8Aurdo1BTAtQiK8ZY9UPj2YMt3AHEpcY"), - "ed25519" - ), - ( - Account("m/44'/1729'/0'/0'", - SigType.SECP256K1, - "sppk7bVy617DmGvXsMqcwsiLtnedTN2trUi5ugXcNig7en4rHJyunK1"), - "secp256k1" - ), - ( - Account("m/44'/1729'/0'/0'", - SigType.SECP256R1, - "p2pk67fq5pzuMMABZ9RDrooYbLrgmnQbLt8z7PTGM9mskf7LXS5tdBG"), - "secp256r1" - ), - ( - Account("m/44'/1729'/0'/0'", - SigType.BIP32_ED25519, - "edpkumJgSsSxkpiB5hmTq6eZcrmc6BsJtLAhYceFTiziFqje4mongz"), - "bip32_ed25519" - ) - ] - - for (account, kind) in accounts: - - app.assert_screen(Screen.HOME) - - data = app.provide_public_key(account, test_name + "/" + kind) - - app.checker.check_public_key(account, data) + data = app.provide_public_key(account, snapshot_dir) + + app.checker.check_public_key(account, data) app.quit() -def test_reject_pk(app: TezosAppScreen): +def test_reject_pk(app: TezosAppScreen, snapshot_dir: Path): """Check reject pk behaviour""" - test_name = "test_reject_pk" app.assert_screen(Screen.HOME) - app.reject_public_key(DEFAULT_ACCOUNT, test_name) + app.reject_public_key(DEFAULT_ACCOUNT, snapshot_dir) app.quit() diff --git a/tests/integration/nano/test_sign/operations/test_sign_ballot.py b/tests/integration/nano/test_sign/operations/test_sign_ballot.py index 3fa5def1b..68f09811b 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_ballot.py +++ b/tests/integration/nano/test_sign/operations/test_sign_ballot.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import Ballot -def test_sign_ballot(app: TezosAppScreen): +def test_sign_ballot(app: TezosAppScreen, snapshot_dir: Path): """Check signing ballot""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -37,7 +36,7 @@ def test_sign_ballot(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_batched_operations.py b/tests/integration/nano/test_sign/operations/test_sign_batched_operations.py index cc820da51..d46266eeb 100644 --- a/tests/integration/nano/test_sign/operations/test_sign_batched_operations.py +++ b/tests/integration/nano/test_sign/operations/test_sign_batched_operations.py @@ -16,6 +16,8 @@ """Gathering of tests related to Batched operations.""" +from pathlib import Path + from conftest import requires_device from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT @@ -27,9 +29,8 @@ ) @requires_device("nanos") -def test_nanos_regression_batched_ops(app: TezosAppScreen): +def test_nanos_regression_batched_ops(app: TezosAppScreen, snapshot_dir: Path): """Check signing batch operation""" - test_name = "test_nanos_regression_batched_ops" app.setup_expert_mode() @@ -59,7 +60,7 @@ def test_nanos_regression_batched_ops(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -70,9 +71,8 @@ def test_nanos_regression_batched_ops(app: TezosAppScreen): app.quit() @requires_device("nanox") -def test_nanox_regression_batched_ops(app: TezosAppScreen): +def test_nanox_regression_batched_ops(app: TezosAppScreen, snapshot_dir: Path): """Check signing batch operation""" - test_name = "test_nanox_regression_batched_ops" app.setup_expert_mode() @@ -102,7 +102,7 @@ def test_nanox_regression_batched_ops(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -112,9 +112,8 @@ def test_nanox_regression_batched_ops(app: TezosAppScreen): app.quit() -def test_sign_complex_operation(app: TezosAppScreen): +def test_sign_complex_operation(app: TezosAppScreen, snapshot_dir: Path): """Check signing complex operation""" - test_name = "test_sign_complex_operation" app.assert_screen(Screen.HOME) app.setup_expert_mode() @@ -147,7 +146,7 @@ def test_sign_complex_operation(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_delegation.py b/tests/integration/nano/test_sign/operations/test_sign_delegation.py index 040b73c57..f69febe24 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_delegation.py +++ b/tests/integration/nano/test_sign/operations/test_sign_delegation.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import Delegation -def test_sign_delegation(app: TezosAppScreen): +def test_sign_delegation(app: TezosAppScreen, snapshot_dir: Path): """Check signing delegation""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -39,7 +38,7 @@ def test_sign_delegation(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_failing_noop.py b/tests/integration/nano/test_sign/operations/test_sign_failing_noop.py index d3dd99a96..648462e81 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_failing_noop.py +++ b/tests/integration/nano/test_sign/operations/test_sign_failing_noop.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import FailingNoop -def test_sign_failing_noop(app: TezosAppScreen): +def test_sign_failing_noop(app: TezosAppScreen, snapshot_dir: Path): """Check signing failing noop""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -32,7 +31,7 @@ def test_sign_failing_noop(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_increase_paid_storage.py b/tests/integration/nano/test_sign/operations/test_sign_increase_paid_storage.py index 59ed7e2f0..9b0e0266c 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_increase_paid_storage.py +++ b/tests/integration/nano/test_sign/operations/test_sign_increase_paid_storage.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import IncreasePaidStorage -def test_sign_increase_paid_storage(app: TezosAppScreen): +def test_sign_increase_paid_storage(app: TezosAppScreen, snapshot_dir: Path): """Check signing increase paid storage""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -40,7 +39,7 @@ def test_sign_increase_paid_storage(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_origination.py b/tests/integration/nano/test_sign/operations/test_sign_origination.py index eceda90c7..05c8acc30 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_origination.py +++ b/tests/integration/nano/test_sign/operations/test_sign_origination.py @@ -21,9 +21,8 @@ from utils.app import TezosAppScreen, DEFAULT_ACCOUNT from utils.message import Origination -def test_sign_origination(app: TezosAppScreen): +def test_sign_origination(app: TezosAppScreen, snapshot_dir: Path): """Check signing origination""" - test_name = Path(__file__).stem app.setup_expert_mode() @@ -41,7 +40,7 @@ def test_sign_origination(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_proposals.py b/tests/integration/nano/test_sign/operations/test_sign_proposals.py index 43d36fa7e..92c4710d5 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_proposals.py +++ b/tests/integration/nano/test_sign/operations/test_sign_proposals.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import Proposals -def test_sign_proposals(app: TezosAppScreen): +def test_sign_proposals(app: TezosAppScreen, snapshot_dir: Path): """Check signing proposals""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -39,7 +38,7 @@ def test_sign_proposals(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_register_global_constant.py b/tests/integration/nano/test_sign/operations/test_sign_register_global_constant.py index 51f043104..70a6d3fa5 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_register_global_constant.py +++ b/tests/integration/nano/test_sign/operations/test_sign_register_global_constant.py @@ -21,9 +21,8 @@ from utils.app import TezosAppScreen, DEFAULT_ACCOUNT from utils.message import RegisterGlobalConstant -def test_sign_register_global_constant(app: TezosAppScreen): +def test_sign_register_global_constant(app: TezosAppScreen, snapshot_dir: Path): """Check signing register global constant""" - test_name = Path(__file__).stem app.setup_expert_mode() @@ -39,7 +38,7 @@ def test_sign_register_global_constant(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_reveal.py b/tests/integration/nano/test_sign/operations/test_sign_reveal.py index 0aeb9f38d..41f899073 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_reveal.py +++ b/tests/integration/nano/test_sign/operations/test_sign_reveal.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import Reveal -def test_sign_reveal(app: TezosAppScreen): +def test_sign_reveal(app: TezosAppScreen, snapshot_dir: Path): """Check signing reveal""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -39,7 +38,7 @@ def test_sign_reveal(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_add_messages.py b/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_add_messages.py index d212580ed..00712038a 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_add_messages.py +++ b/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_add_messages.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import ScRollupAddMessage -def test_sign_sc_rollup_add_messages(app: TezosAppScreen): +def test_sign_sc_rollup_add_messages(app: TezosAppScreen, snapshot_dir: Path): """Check signing smart rollup add message""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -39,7 +38,7 @@ def test_sign_sc_rollup_add_messages(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_execute_outbox_message.py b/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_execute_outbox_message.py index ae88ff2a8..c28fa0789 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_execute_outbox_message.py +++ b/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_execute_outbox_message.py @@ -21,9 +21,8 @@ from utils.app import TezosAppScreen, DEFAULT_ACCOUNT from utils.message import ScRollupExecuteOutboxMessage -def test_sign_sc_rollup_execute_outbox_message(app: TezosAppScreen): +def test_sign_sc_rollup_execute_outbox_message(app: TezosAppScreen, snapshot_dir: Path): """Check signing smart rollup execute outbox message""" - test_name = Path(__file__).stem app.setup_expert_mode() @@ -41,7 +40,7 @@ def test_sign_sc_rollup_execute_outbox_message(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_originate.py b/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_originate.py index 778b13f1f..f0196912a 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_originate.py +++ b/tests/integration/nano/test_sign/operations/test_sign_sc_rollup_originate.py @@ -19,46 +19,54 @@ from pathlib import Path from typing import List, Optional +import pytest + from utils.app import TezosAppScreen, DEFAULT_ACCOUNT from utils.message import ScRollupOriginate -def test_sign_sc_rollup_originate(app: TezosAppScreen): + +@pytest.mark.parametrize( + "whitelist", [ + None, + [], + [ + 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', + 'tz2WmivuMG8MMRKMEmzKRMMxMApxZQWYNS4W', + 'tz3XMQscBFM9vPmpbYMavMmwxRMUWvWGZMQQ', + ], + ], + ids=[ + "no_whitelist", + "empty_whitelist", + "with_whitelist", + ], +) +def test_sign_sc_rollup_originate(app: TezosAppScreen, whitelist: Optional[List[str]], snapshot_dir: Path): """Check signing smart rollup originate""" - test_name = Path(__file__).stem app.setup_expert_mode() - def check_sign(name: str, whitelist: Optional[List[str]]): - - message = ScRollupOriginate( - source = 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', - fee = 10000, - counter = 2, - gas_limit = 3, - storage_limit = 4, - pvm_kind = "arith", - kernel = '396630396632393532643334353238633733336639343631356366633339626335353536313966633535306464346136376261323230386365386538363761613364313361366566393964666265333263363937346161396132313530643231656361323963333334396535396331336239303831663163313162343430616334643334353564656462653465653064653135613861663632306434633836323437643964313332646531626236646132336435666639643864666664613232626139613834', - parameters_ty = {'prim': 'Pair', 'args': [{'string': '1'}, {'int': 2}]}, - whitelist = whitelist - ) - - data = app.sign(DEFAULT_ACCOUNT, - message, - with_hash=True, - path=Path(test_name) / name) + message = ScRollupOriginate( + source = 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', + fee = 10000, + counter = 2, + gas_limit = 3, + storage_limit = 4, + pvm_kind = "arith", + kernel = '396630396632393532643334353238633733336639343631356366633339626335353536313966633535306464346136376261323230386365386538363761613364313361366566393964666265333263363937346161396132313530643231656361323963333334396535396331336239303831663163313162343430616334643334353564656462653465653064653135613861663632306434633836323437643964313332646531626236646132336435666639643864666664613232626139613834', + parameters_ty = {'prim': 'Pair', 'args': [{'string': '1'}, {'int': 2}]}, + whitelist = whitelist + ) - app.checker.check_signature( - account=DEFAULT_ACCOUNT, - message=message, - with_hash=True, - data=data) + data = app.sign(DEFAULT_ACCOUNT, + message, + with_hash=True, + path=snapshot_dir) - check_sign("no_whitelist", None) - check_sign("no_whitelist", []) - check_sign("with_whitelist", [ - 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', - 'tz2WmivuMG8MMRKMEmzKRMMxMApxZQWYNS4W', - 'tz3XMQscBFM9vPmpbYMavMmwxRMUWvWGZMQQ' - ]) + app.checker.check_signature( + account=DEFAULT_ACCOUNT, + message=message, + with_hash=True, + data=data) app.quit() diff --git a/tests/integration/nano/test_sign/operations/test_sign_set_consensus_key.py b/tests/integration/nano/test_sign/operations/test_sign_set_consensus_key.py index c8f2932f5..232cc5cd7 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_set_consensus_key.py +++ b/tests/integration/nano/test_sign/operations/test_sign_set_consensus_key.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import UpdateConsensusKey -def test_sign_set_consensus_key(app: TezosAppScreen): +def test_sign_set_consensus_key(app: TezosAppScreen, snapshot_dir: Path): """Check signing set consensus key""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -39,7 +38,7 @@ def test_sign_set_consensus_key(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_set_deposit_limit.py b/tests/integration/nano/test_sign/operations/test_sign_set_deposit_limit.py index d7b7b0189..bd8ae82b5 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_set_deposit_limit.py +++ b/tests/integration/nano/test_sign/operations/test_sign_set_deposit_limit.py @@ -21,9 +21,8 @@ from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import SetDepositLimit -def test_sign_set_deposit_limit(app: TezosAppScreen): +def test_sign_set_deposit_limit(app: TezosAppScreen, snapshot_dir: Path): """Check signing set deposit limit""" - test_name = Path(__file__).stem app.assert_screen(Screen.HOME) @@ -39,7 +38,7 @@ def test_sign_set_deposit_limit(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_transaction.py b/tests/integration/nano/test_sign/operations/test_sign_transaction.py index 699acfbd0..ef038f3ef 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_transaction.py +++ b/tests/integration/nano/test_sign/operations/test_sign_transaction.py @@ -22,11 +22,8 @@ from utils.backend import StatusCode from utils.message import Transaction -test_path = Path(Path(__file__).stem) - -def test_sign_transaction(app: TezosAppScreen): +def test_sign_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check signing transaction""" - path = test_path / "basic" app.setup_expert_mode() @@ -45,7 +42,7 @@ def test_sign_transaction(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -55,9 +52,8 @@ def test_sign_transaction(app: TezosAppScreen): app.quit() -def test_reject_transaction(app: TezosAppScreen): +def test_reject_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check reject transaction""" - path = test_path / "reject" app.setup_expert_mode() @@ -76,13 +72,12 @@ def test_reject_transaction(app: TezosAppScreen): app.reject_signing(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.quit() -def test_sign_simple_transaction(app: TezosAppScreen): +def test_sign_simple_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check sign not complex transaction""" - path = test_path / "simple" app.setup_expert_mode() @@ -99,7 +94,7 @@ def test_sign_simple_transaction(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -109,9 +104,9 @@ def test_sign_simple_transaction(app: TezosAppScreen): app.quit() -def test_too_complex_transaction(app: TezosAppScreen): +def test_too_complex_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check sign complex transaction""" - path = test_path / "complex" + app.assert_screen(Screen.HOME) message = Transaction( @@ -131,14 +126,13 @@ def test_too_complex_transaction(app: TezosAppScreen): with_hash=True, navigate=(lambda: app.navigate_until_text( ScreenText.BACK_HOME, - path)), + snapshot_dir)), status_code=StatusCode.REJECT) app.quit() -def test_sign_stake_transaction(app: TezosAppScreen): +def test_sign_stake_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check sign stake""" - path = test_path / "stake" app.setup_expert_mode() @@ -156,7 +150,7 @@ def test_sign_stake_transaction(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -166,9 +160,8 @@ def test_sign_stake_transaction(app: TezosAppScreen): app.quit() -def test_sign_unstake_transaction(app: TezosAppScreen): +def test_sign_unstake_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check sign unstake""" - path = test_path / "unstake" app.setup_expert_mode() @@ -186,7 +179,7 @@ def test_sign_unstake_transaction(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -196,9 +189,8 @@ def test_sign_unstake_transaction(app: TezosAppScreen): app.quit() -def test_sign_finalize_unstake_transaction(app: TezosAppScreen): +def test_sign_finalize_unstake_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check sign finalize_unstake""" - path = test_path / "finalize_unstake" app.setup_expert_mode() @@ -216,7 +208,7 @@ def test_sign_finalize_unstake_transaction(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -226,9 +218,8 @@ def test_sign_finalize_unstake_transaction(app: TezosAppScreen): app.quit() -def test_sign_set_delegate_parameters_transaction(app: TezosAppScreen): +def test_sign_set_delegate_parameters_transaction(app: TezosAppScreen, snapshot_dir: Path): """Check sign set delegate parameters""" - path = test_path / "delegate_parameters" app.setup_expert_mode() @@ -255,7 +246,7 @@ def test_sign_set_delegate_parameters_transaction(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=path) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -265,9 +256,8 @@ def test_sign_set_delegate_parameters_transaction(app: TezosAppScreen): app.quit() -def test_sign_with_long_hash(app: TezosAppScreen): +def test_sign_with_long_hash(app: TezosAppScreen, snapshot_dir: Path): """Check signing transaction with a long destination hash""" - test_name = "test_sign_with_long_hash" app.setup_expert_mode() @@ -286,7 +276,7 @@ def test_sign_with_long_hash(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -296,9 +286,8 @@ def test_sign_with_long_hash(app: TezosAppScreen): app.quit() -def test_ensure_always_clearsign(app: TezosAppScreen): +def test_ensure_always_clearsign(app: TezosAppScreen, snapshot_dir: Path): """Check clear signing never blindsign""" - test_name = "test_ensure_always_clearsign" app.setup_expert_mode() @@ -317,7 +306,7 @@ def test_ensure_always_clearsign(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/operations/test_sign_transfer_ticket.py b/tests/integration/nano/test_sign/operations/test_sign_transfer_ticket.py index f10eb5a8b..30ad3b79f 100755 --- a/tests/integration/nano/test_sign/operations/test_sign_transfer_ticket.py +++ b/tests/integration/nano/test_sign/operations/test_sign_transfer_ticket.py @@ -22,9 +22,8 @@ from utils.app import TezosAppScreen, DEFAULT_ACCOUNT from utils.message import TransferTicket -def test_sign_transfer_ticket(app: TezosAppScreen): +def test_sign_transfer_ticket(app: TezosAppScreen, snapshot_dir: Path): """Check signing transfer ticket""" - test_name = Path(__file__).stem app.setup_expert_mode() @@ -44,7 +43,7 @@ def test_sign_transfer_ticket(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -55,9 +54,8 @@ def test_sign_transfer_ticket(app: TezosAppScreen): app.quit() @requires_device("nanosp") -def test_nanosp_regression_potential_empty_screen(app: TezosAppScreen): +def test_nanosp_regression_potential_empty_screen(app: TezosAppScreen, snapshot_dir: Path): """Check signing operation that display potentially empty screens""" - test_name = "test_nanosp_regression_potential_empty_screen" app.setup_expert_mode() @@ -78,7 +76,7 @@ def test_nanosp_regression_potential_empty_screen(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/test_apdu_sign.py b/tests/integration/nano/test_sign/test_apdu_sign.py index efa8083d7..ea34c387f 100644 --- a/tests/integration/nano/test_sign/test_apdu_sign.py +++ b/tests/integration/nano/test_sign/test_apdu_sign.py @@ -16,14 +16,15 @@ """Gathering of tests related to Sign instructions.""" +from pathlib import Path + from conftest import requires_device from utils.account import Account from utils.app import send_and_navigate, Screen, ScreenText, TezosAppScreen, DEFAULT_ACCOUNT from utils.message import Message, MichelineExpr, Transaction -def test_sign_micheline_without_hash(app: TezosAppScreen): +def test_sign_micheline_without_hash(app: TezosAppScreen, snapshot_dir: Path): """Check signing micheline wihout getting hash""" - test_name = "test_sign_micheline_without_hash" app.assert_screen(Screen.HOME) @@ -32,7 +33,7 @@ def test_sign_micheline_without_hash(app: TezosAppScreen): data = app.sign(DEFAULT_ACCOUNT, message, with_hash=False, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -42,16 +43,15 @@ def test_sign_micheline_without_hash(app: TezosAppScreen): app.quit() -def test_sign_with_small_packet(app: TezosAppScreen): +def test_sign_with_small_packet(app: TezosAppScreen, snapshot_dir: Path): """Check signing using small packet instead of full size packets""" - test_name = "test_sign_with_small_packet" app.setup_expert_mode() def check_sign_with_small_packet( account: Account, message: Message, - path: str) -> None: + path: Path) -> None: app.assert_screen(Screen.HOME) @@ -80,14 +80,13 @@ def check_sign_with_small_packet( check_sign_with_small_packet( account=DEFAULT_ACCOUNT, message=message, - path=test_name) + path=snapshot_dir) app.quit() @requires_device("nanosp") -def test_nanosp_regression_press_right_works_across_apdu_recieves(app: TezosAppScreen): +def test_nanosp_regression_press_right_works_across_apdu_recieves(app: TezosAppScreen, snapshot_dir: Path): """Check no need to click right two times between APDUs during signing flow""" - test_name = "test_nanosp_regression_press_right_works_across_apdu_recieves" app.assert_screen(Screen.HOME) @@ -96,7 +95,7 @@ def test_nanosp_regression_press_right_works_across_apdu_recieves(app: TezosAppS data = app.sign(DEFAULT_ACCOUNT, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, diff --git a/tests/integration/nano/test_sign/test_blindsign.py b/tests/integration/nano/test_sign/test_blindsign.py index 23ac3b56f..883d2c6bc 100644 --- a/tests/integration/nano/test_sign/test_blindsign.py +++ b/tests/integration/nano/test_sign/test_blindsign.py @@ -68,7 +68,7 @@ def navigate() -> None: _sign_too_long(app, message, navigate) def _reject_too_long( - app, + app: TezosAppScreen, message: Message, status_code: StatusCode, navigate: Callable[[], None]): @@ -89,8 +89,6 @@ def _reject_too_long( ### Too long operation ### -basic_test_path = Path("test_sign_too_long_operation", "basic") - BASIC_OPERATION = OperationGroup([ Reveal( source = 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', @@ -158,33 +156,31 @@ def _reject_too_long( ) ]) -def test_sign_basic_too_long_operation(app: TezosAppScreen): +def test_sign_basic_too_long_operation(app: TezosAppScreen, snapshot_dir: Path): """Check sign too long operation""" - _sign_decodable_too_long(app, BASIC_OPERATION, basic_test_path / "accept") + _sign_decodable_too_long(app, BASIC_OPERATION, snapshot_dir) -def test_reject_basic_too_long_operation_at_warning(app: TezosAppScreen): +def test_reject_basic_too_long_operation_at_warning(app: TezosAppScreen, snapshot_dir: Path): """Check reject too long operation at warning""" - path = basic_test_path / "reject_at_too_large_warning" def navigate() -> None: - app.navigate_until_text(ScreenText.SIGN_REJECT, path / "clear_n_too_long_warning") + app.navigate_until_text(ScreenText.SIGN_REJECT, snapshot_dir / "clear_n_too_long_warning") _reject_too_long(app, BASIC_OPERATION, StatusCode.REJECT, navigate) -def test_reject_basic_too_long_operation_at_summary(app: TezosAppScreen): +def test_reject_basic_too_long_operation_at_summary(app: TezosAppScreen, snapshot_dir: Path): """Check reject too long operation at summary""" - path = basic_test_path / "reject_at_summary" def navigate() -> None: - app.navigate_until_text(ScreenText.ACCEPT_RISK, path / "clear_n_too_long_warning") - app.navigate_until_text(ScreenText.SIGN_REJECT, path / "summary") + app.navigate_until_text(ScreenText.ACCEPT_RISK, snapshot_dir / "clear_n_too_long_warning") + app.navigate_until_text(ScreenText.SIGN_REJECT, snapshot_dir / "summary") _reject_too_long(app, BASIC_OPERATION, StatusCode.REJECT, navigate) ### Different kind of too long operation ### -def test_sign_too_long_operation_with_only_transactions(app: TezosAppScreen): +def test_sign_too_long_operation_with_only_transactions(app: TezosAppScreen, snapshot_dir: Path): """Check sign too long operation that contains only transaction""" message = OperationGroup([ Transaction( @@ -242,9 +238,9 @@ def test_sign_too_long_operation_with_only_transactions(app: TezosAppScreen): amount = 5000000 ) ]) - _sign_decodable_too_long(app, message, Path("test_sign_too_long_operation", "only_transactions")) + _sign_decodable_too_long(app, message, snapshot_dir) -def test_sign_too_long_operation_without_fee_or_amount(app: TezosAppScreen): +def test_sign_too_long_operation_without_fee_or_amount(app: TezosAppScreen, snapshot_dir: Path): """Check sign too long operation that doesn't have fees or amount""" message = Proposals( source = 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', @@ -272,13 +268,11 @@ def test_sign_too_long_operation_without_fee_or_amount(app: TezosAppScreen): ], period = 32 ) - _sign_decodable_too_long(app, message, Path("test_sign_too_long_operation", "without_fee_or_amount")) + _sign_decodable_too_long(app, message, snapshot_dir) ### Too long operation containing a too large number ### -too_large_test_path = Path("test_sign_too_long_operation", "too_large") - OPERATION_WITH_TOO_LARGE = OperationGroup([ ScRollupAddMessage( source = 'tz1ixvCiPJYyMjsp2nKBVaq54f6AdbV8hCKa', @@ -329,38 +323,34 @@ def test_sign_too_long_operation_without_fee_or_amount(app: TezosAppScreen): ) ]) -def test_sign_too_long_operation_with_too_large(app: TezosAppScreen): +def test_sign_too_long_operation_with_too_large(app: TezosAppScreen, snapshot_dir: Path): """Check sign too long operation that will also fail the parsing""" - path = too_large_test_path / "accept" def navigate() -> None: - app.navigate_until_text(ScreenText.ACCEPT_RISK, path / "clear_n_too_large_warning") - app.navigate_until_text(ScreenText.SIGN_ACCEPT, path / "blindsigning") + app.navigate_until_text(ScreenText.ACCEPT_RISK, snapshot_dir / "clear_n_too_large_warning") + app.navigate_until_text(ScreenText.SIGN_ACCEPT, snapshot_dir / "blindsigning") _sign_too_long(app, OPERATION_WITH_TOO_LARGE, navigate) -def test_reject_too_long_operation_with_too_large_at_too_large_warning(app: TezosAppScreen): +def test_reject_too_long_operation_with_too_large_at_too_large_warning(app: TezosAppScreen, snapshot_dir: Path): """Check reject too long operation that will also fail the parsing at too large warning""" - path = too_large_test_path / "reject_at_too_large_warning" def navigate() -> None: - app.navigate_until_text(ScreenText.SIGN_REJECT, path / "clear_n_too_large_warning") + app.navigate_until_text(ScreenText.SIGN_REJECT, snapshot_dir / "clear_n_too_large_warning") _reject_too_long(app, OPERATION_WITH_TOO_LARGE, StatusCode.PARSE_ERROR, navigate) -def test_reject_too_long_operation_with_too_large_at_blindsigning(app: TezosAppScreen): +def test_reject_too_long_operation_with_too_large_at_blindsigning(app: TezosAppScreen, snapshot_dir: Path): """Check reject too long operation that will also fail the parsing at blindsigning""" - path = too_large_test_path / "reject_at_blindsigning" def navigate() -> None: - app.navigate_until_text(ScreenText.ACCEPT_RISK, path / "clear_n_too_large_warning") - app.navigate_until_text(ScreenText.SIGN_REJECT, path / "blindsigning") + app.navigate_until_text(ScreenText.ACCEPT_RISK, snapshot_dir / "clear_n_too_large_warning") + app.navigate_until_text(ScreenText.SIGN_REJECT, snapshot_dir / "blindsigning") _reject_too_long(app, OPERATION_WITH_TOO_LARGE, StatusCode.REJECT, navigate) -def test_blindsign_too_deep(app: TezosAppScreen): +def test_blindsign_too_deep(app: TezosAppScreen, snapshot_dir: Path): """Check blindsigning on too deep expression""" - test_name = "test_blindsign_too_deep" app.assert_screen(Screen.HOME) @@ -371,7 +361,7 @@ def send(result_queue: Queue) -> None: res = app.backend.sign(DEFAULT_ACCOUNT, expression, with_hash=True) result_queue.put(res) def assert_screen_i(i): - app.assert_screen(f"{str(i).zfill(5)}", path=Path(test_name) / "clear") + app.assert_screen(f"{str(i).zfill(5)}", snapshot_dir / "clear") result_queue: Queue = Queue() send_process = Process(target=send, args=(result_queue,)) @@ -393,7 +383,7 @@ def assert_screen_i(i): assert_screen_i(i+1) def blind_navigate() -> None: - app.navigate_until_text(ScreenText.SIGN_ACCEPT, Path(test_name) / "blind") + app.navigate_until_text(ScreenText.SIGN_ACCEPT, snapshot_dir / "blind") navigate_process = Process(target=blind_navigate) navigate_process.start() @@ -410,7 +400,7 @@ def blind_navigate() -> None: data = app.blind_sign(DEFAULT_ACCOUNT, expression, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -420,9 +410,8 @@ def blind_navigate() -> None: app.quit() -def test_blindsign_too_large(app: TezosAppScreen): +def test_blindsign_too_large(app: TezosAppScreen, snapshot_dir: Path): """Check blindsigning on too large expression""" - test_name = "test_blindsign_too_large" app.assert_screen(Screen.HOME) @@ -431,7 +420,7 @@ def test_blindsign_too_large(app: TezosAppScreen): data = app.blind_sign(DEFAULT_ACCOUNT, message=message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=DEFAULT_ACCOUNT, @@ -441,27 +430,37 @@ def test_blindsign_too_large(app: TezosAppScreen): app.quit() -def test_blindsign_reject(app: TezosAppScreen): +def test_blindsign_reject_from_clear(app: TezosAppScreen, snapshot_dir: Path): """Check blindsigning rejection""" - test_name = "test_blindsign_reject" expression = MichelineExpr({'int':12345678901234567890123456789012345678901234567890123456789012345678901234567890}) app.parsing_error_signing(DEFAULT_ACCOUNT, expression, with_hash=False, - path=Path(test_name) / "reject_from_clear") + path=snapshot_dir) + + app.quit() + +def test_blindsign_reject_from_blind(app: TezosAppScreen, snapshot_dir: Path): + """Check blindsigning rejection""" + + expression = MichelineExpr({'int':12345678901234567890123456789012345678901234567890123456789012345678901234567890}) def expected_failure_send() -> bytes: with app.expect_apdu_failure(StatusCode.REJECT): app.backend.sign(DEFAULT_ACCOUNT, expression, with_hash=False) return b'' - path = Path(test_name) / "reject_from_blind" - def navigate() -> None: - app.navigate_until_text(ScreenText.ACCEPT_RISK, path / "clear") - app.navigate_until_text(ScreenText.SIGN_REJECT, path / "blind") + app.navigate_until_text( + ScreenText.ACCEPT_RISK, + snapshot_dir / "clear" + ) + app.navigate_until_text( + ScreenText.SIGN_REJECT, + snapshot_dir / "blind" + ) send_and_navigate( send=expected_failure_send, diff --git a/tests/integration/nano/test_sign/test_key.py b/tests/integration/nano/test_sign/test_key.py index a3b227d82..cb1854aa1 100644 --- a/tests/integration/nano/test_sign/test_key.py +++ b/tests/integration/nano/test_sign/test_key.py @@ -17,99 +17,41 @@ """Gathering of tests related to Key signatures.""" from pathlib import Path + import pytest from utils.account import Account, SigType from utils.app import Screen, TezosAppScreen from utils.message import MichelineExpr, Transaction -def test_tz1_ed25519_sign_micheline_basic(app: TezosAppScreen): +@pytest.mark.parametrize( + "account", [ + Account("m/44'/1729'/0'/0'", + SigType.ED25519, + "edpkuXX2VdkdXzkN11oLCb8Aurdo1BTAtQiK8ZY9UPj2YMt3AHEpcY"), + Account("m/44'/1729'/0'/0'", + SigType.SECP256K1, + "sppk7bVy617DmGvXsMqcwsiLtnedTN2trUi5ugXcNig7en4rHJyunK1"), + Account("m/44'/1729'/0'/0'", + SigType.SECP256R1, + "p2pk67fq5pzuMMABZ9RDrooYbLrgmnQbLt8z7PTGM9mskf7LXS5tdBG"), + Account("m/44'/1729'/0'/0'", + SigType.BIP32_ED25519, + "edpkumJgSsSxkpiB5hmTq6eZcrmc6BsJtLAhYceFTiziFqje4mongz"), + ], + ids=lambda account: f"{account.sig_type}" +) +def test_sign_micheline_basic(app: TezosAppScreen, account: Account, snapshot_dir: Path): """Check signing with ed25519""" - test_name = Path("test_tz1_ed25519_sign_micheline_basic") app.assert_screen(Screen.HOME) - account = Account("m/44'/1729'/0'/0'", - SigType.ED25519, - "edpkuXX2VdkdXzkN11oLCb8Aurdo1BTAtQiK8ZY9UPj2YMt3AHEpcY") - - message = MichelineExpr([{'string': 'CACA'}, {'string': 'POPO'}, {'string': 'BOUDIN'}]) - - data = app.sign(account, - message, - with_hash=True, - path=test_name) - - app.checker.check_signature( - account=account, - message=message, - with_hash=True, - data=data) - - app.quit() - -def test_tz2_sign_micheline_basic(app: TezosAppScreen): - """Check signing with secp256k1""" - test_name = Path("test_tz2_sign_micheline_basic") - - account = Account("m/44'/1729'/0'/0'", - SigType.SECP256K1, - "sppk7bVy617DmGvXsMqcwsiLtnedTN2trUi5ugXcNig7en4rHJyunK1") - - message = MichelineExpr([{'string': 'CACA'}, {'string': 'POPO'}, {'string': 'BOUDIN'}]) - - data = app.sign(account, - message, - with_hash=True, - path=test_name) - - app.checker.check_signature( - account=account, - message=message, - with_hash=True, - data=data) - - app.quit() - -def test_tz3_sign_micheline_basic(app: TezosAppScreen): - """Check signing with p256""" - test_name = Path("test_tz3_sign_micheline_basic") - - account = Account("m/44'/1729'/0'/0'", - SigType.SECP256R1, - "p2pk67fq5pzuMMABZ9RDrooYbLrgmnQbLt8z7PTGM9mskf7LXS5tdBG") - - message = MichelineExpr([{'string': 'CACA'}, {'string': 'POPO'}, {'string': 'BOUDIN'}]) - - data = app.sign(account, - message, - with_hash=True, - path=test_name) - - app.checker.check_signature( - account=account, - message=message, - with_hash=True, - data=data) - - app.quit() - -def test_tz1_bip25519_sign_micheline_basic(app: TezosAppScreen): - """Check signing with bip25519""" - test_name = Path("test_tz1_bip25519_sign_micheline_basic") - - app.assert_screen(Screen.HOME) - - account = Account("m/44'/1729'/0'/0'", - SigType.BIP32_ED25519, - "edpkumJgSsSxkpiB5hmTq6eZcrmc6BsJtLAhYceFTiziFqje4mongz") - message = MichelineExpr([{'string': 'CACA'}, {'string': 'POPO'}, {'string': 'BOUDIN'}]) data = app.sign(account, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=account, @@ -120,10 +62,14 @@ def test_tz1_bip25519_sign_micheline_basic(app: TezosAppScreen): app.quit() -@pytest.mark.parametrize("seed", ["around dignity equal spread between young lawsuit interest climb wide that panther rather mom snake scene ecology reunion ice illegal brush"]) -def test_sign_with_another_seed(app: TezosAppScreen): +@pytest.mark.parametrize( + "seed", [ + "around dignity equal spread between young lawsuit interest climb wide that panther rather mom snake scene ecology reunion ice illegal brush" + ], + ids=["seed21"] +) +def test_sign_with_another_seed(app: TezosAppScreen, snapshot_dir: Path): """Check signing using another seed than [zebra*24]""" - test_name = Path("test_sign_with_another_seed") app.setup_expert_mode() @@ -146,7 +92,7 @@ def test_sign_with_another_seed(app: TezosAppScreen): data = app.sign(account, message, with_hash=True, - path=test_name) + path=snapshot_dir) app.checker.check_signature( account=account, diff --git a/tests/integration/nano/test_sign/test_parsing_errors.py b/tests/integration/nano/test_sign/test_parsing_errors.py index 7384cc59a..2a9929d2a 100755 --- a/tests/integration/nano/test_sign/test_parsing_errors.py +++ b/tests/integration/nano/test_sign/test_parsing_errors.py @@ -18,6 +18,8 @@ from pathlib import Path +import pytest + from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.backend import StatusCode from utils.message import RawMessage @@ -35,66 +37,51 @@ # original bytes : 0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316 -def test_parsing_errors(app: TezosAppScreen): +@pytest.mark.parametrize( + "raw_msg", [ + "0100000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316", + "03000000000000000000000000000000000000000000000000000000000000000001016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316", + "0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e010000000000000000000000000000000000000000ff02000000020316", + "0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff0200000002031645", + "0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e0100000000000000000000000000000000000000000000ff02000000020316", + ], + ids=[ + "unknown_magic_bytes", + "unknown_operation", + "one_byte_removed_inside", + "one_byte_added_at_the_end", + "one_byte_added_inside", + ] +) +def test_parsing_error(app: TezosAppScreen, raw_msg: str, snapshot_dir: Path): """Check parsing error handling""" - test_name = Path(__file__).stem - - def make_path(name: str) -> Path: - return Path(test_name) / name app.setup_expert_mode() - unknown_magic_bytes_message = RawMessage("0100000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316") - - app.parsing_error_signing(DEFAULT_ACCOUNT, - unknown_magic_bytes_message, - with_hash=True, - path=make_path("unknown_magic_bytes")) - - app.assert_screen(Screen.HOME) - - unknown_operation_message = RawMessage("03000000000000000000000000000000000000000000000000000000000000000001016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff02000000020316") - - app.parsing_error_signing(DEFAULT_ACCOUNT, - unknown_operation_message, - with_hash=True, - path=make_path("unknown_operation")) - - app.assert_screen(Screen.HOME) - - one_byte_removed_inside_message = RawMessage("0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e010000000000000000000000000000000000000000ff02000000020316") - - app.parsing_error_signing(DEFAULT_ACCOUNT, - one_byte_removed_inside_message, - with_hash=True, - path=make_path("one_byte_removed_inside")) - - app.assert_screen(Screen.HOME) - - one_byte_added_at_the_end_message = RawMessage("0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e01000000000000000000000000000000000000000000ff0200000002031645") - app.parsing_error_signing(DEFAULT_ACCOUNT, - one_byte_added_at_the_end_message, + RawMessage(raw_msg), with_hash=True, - path=make_path("one_byte_added_at_the_end")) + path=snapshot_dir) - app.assert_screen(Screen.HOME) - - one_byte_added_inside_message = RawMessage("0300000000000000000000000000000000000000000000000000000000000000006c016e8874874d31c3fbd636e924d5a036a43ec8faa7d0860308362d80d30e0100000000000000000000000000000000000000000000ff02000000020316") - - app.parsing_error_signing(DEFAULT_ACCOUNT, - one_byte_added_inside_message, - with_hash=True, - path=make_path("one_byte_added_inside")) + app.quit() - app.assert_screen(Screen.HOME) +@pytest.mark.parametrize( + "raw_msg", [ + "030000000000000000000000000000000000000000000000000000000000000000ce00ffdd6102321bc251e4a5190ad5b12b251069d9b4904e02030400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c63966303966323935326433343532386337333366393436313563666333396263353535363139666335353064643461363762613232303863653865383637616133643133613665663939646662653332633639373461613961323135306432316563613239633333343965353963313362393038316631", + ], + ids=[ + "wrong_last_packet", + ] +) +def test_parsing_hard_fail(app: TezosAppScreen, raw_msg: str, snapshot_dir: Path): + """Check parsing error hard failing""" - wrong_last_packet_message = RawMessage("030000000000000000000000000000000000000000000000000000000000000000ce00ffdd6102321bc251e4a5190ad5b12b251069d9b4904e02030400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c63966303966323935326433343532386337333366393436313563666333396263353535363139666335353064643461363762613232303863653865383637616133643133613665663939646662653332633639373461613961323135306432316563613239633333343965353963313362393038316631") + app.setup_expert_mode() app.hard_failing_signing(DEFAULT_ACCOUNT, - wrong_last_packet_message, + RawMessage(raw_msg), with_hash=True, status_code=StatusCode.UNEXPECTED_SIGN_STATE, - path=make_path("wrong_last_packet")) + path=snapshot_dir) app.quit() diff --git a/tests/integration/nano/test_wrong_apdu.py b/tests/integration/nano/test_wrong_apdu.py index 9e102c90b..018e5db0b 100644 --- a/tests/integration/nano/test_wrong_apdu.py +++ b/tests/integration/nano/test_wrong_apdu.py @@ -17,22 +17,21 @@ """Gathering of tests related to APDU checks.""" from pathlib import Path +from typing import Any, Callable, Union + +import pytest from utils.account import Account, SigType from utils.app import Screen, TezosAppScreen, DEFAULT_ACCOUNT from utils.backend import Cla, Index, Ins, StatusCode from utils.message import Transaction -def test_regression_continue_after_reject(app: TezosAppScreen): +def test_regression_continue_after_reject(app: TezosAppScreen, snapshot_dir: Path): """Check the app still runs after rejects signing""" - test_name = "test_regression_continue_after_reject" - - def make_path(name: str) -> Path: - return Path(test_name) / name app.setup_expert_mode() - app.reject_public_key(DEFAULT_ACCOUNT, make_path("reject_public_key")) + app.reject_public_key(DEFAULT_ACCOUNT, snapshot_dir / "reject_public_key") app.assert_screen(Screen.HOME) @@ -51,7 +50,7 @@ def make_path(name: str) -> Path: app.reject_signing(DEFAULT_ACCOUNT, message, with_hash=True, - path=make_path("reject_signing")) + path=snapshot_dir / "reject_signing") data = app.backend.get_public_key(DEFAULT_ACCOUNT, with_prompt=False) @@ -136,87 +135,106 @@ def test_mixing_command(app: TezosAppScreen): app.quit() -def test_wrong_index(app: TezosAppScreen): +@pytest.mark.parametrize("ins", [Ins.GET_PUBLIC_KEY, Ins.PROMPT_PUBLIC_KEY], ids=lambda ins: f"{ins}") +@pytest.mark.parametrize("index", [Index.OTHER, Index.LAST], ids=lambda index: f"{index}") +def test_wrong_index(app: TezosAppScreen, ins: Ins, index: Index): """Check wrong apdu index behaviour""" - for ins in [Ins.GET_PUBLIC_KEY, - Ins.PROMPT_PUBLIC_KEY]: - for index in [Index.OTHER, - Index.LAST]: - app.assert_screen(Screen.HOME) + app.assert_screen(Screen.HOME) - with app.expect_apdu_failure(StatusCode.WRONG_PARAM): - app.backend._exchange(ins, - index=index, - sig_type=DEFAULT_ACCOUNT.sig_type, - payload=DEFAULT_ACCOUNT.path) + with app.expect_apdu_failure(StatusCode.WRONG_PARAM): + app.backend._exchange(ins, + index=index, + sig_type=DEFAULT_ACCOUNT.sig_type, + payload=DEFAULT_ACCOUNT.path) app.quit() -def test_wrong_derivation_type(app: TezosAppScreen): + +@pytest.mark.parametrize( + "sender", + [ + lambda app, account: app.backend.get_public_key(account, with_prompt=False), + lambda app, account: app.backend.get_public_key(account, with_prompt=True), + lambda app, account: app.backend._ask_sign(Ins.SIGN, account), + lambda app, account: app.backend._ask_sign(Ins.SIGN_WITH_HASH, account) + ], + ids=[ + "get_pk_without_prompt", + "get_pk_with_prompt", + "sign_without_hash", + "sign_with_hash", + ] +) +def test_wrong_derivation_type(app: TezosAppScreen, sender: Callable[[TezosAppScreen, Account], Any]): """Check wrong derivation type behaviour""" account = Account("m/44'/1729'/0'/0'", 0x04, "__unused__") - for sender in [lambda account: app.backend.get_public_key(account, with_prompt=False), - lambda account: app.backend.get_public_key(account, with_prompt=True), - lambda account: app.backend._ask_sign(Ins.SIGN, account), - lambda account: app.backend._ask_sign(Ins.SIGN_WITH_HASH, account)]: - - app.assert_screen(Screen.HOME) + app.assert_screen(Screen.HOME) - with app.expect_apdu_failure(StatusCode.WRONG_PARAM): - sender(account) + with app.expect_apdu_failure(StatusCode.WRONG_PARAM): + sender(app, account) app.quit() -def test_wrong_derivation_path(app: TezosAppScreen): - """Check wrong derivation path behaviour""" - wrong_number_index_account = Account( - bytes.fromhex("058000002c800006c18000000080000000"), - SigType.ED25519, - "__unused__") - wrong_length_account = Account( - bytes.fromhex("048000002c800006c180000000800000"), - SigType.ED25519, - "__unused__") - too_much_index_account = Account( - bytes.fromhex("0b8000002c800006c1800000008000000080000000800000008000000080000000800000008000000080000000"), - SigType.ED25519, - "__unused__") - - for account in [wrong_number_index_account, - wrong_length_account, - too_much_index_account]: - for sender in [lambda account: app.backend.get_public_key(account, with_prompt=False), - lambda account: app.backend.get_public_key(account, with_prompt=True), - lambda account: app.backend._ask_sign(Ins.SIGN, account), - lambda account: app.backend._ask_sign(Ins.SIGN_WITH_HASH, account)]: - - app.assert_screen(Screen.HOME) - - with app.expect_apdu_failure(StatusCode.WRONG_LENGTH_FOR_INS): - sender(account) - app.quit() +@pytest.mark.parametrize( + "sender", + [ + lambda app, account: app.backend.get_public_key(account, with_prompt=False), + lambda app, account: app.backend.get_public_key(account, with_prompt=True), + lambda app, account: app.backend._ask_sign(Ins.SIGN, account), + lambda app, account: app.backend._ask_sign(Ins.SIGN_WITH_HASH, account) + ], + ids=[ + "get_pk_without_prompt", + "get_pk_with_prompt", + "sign_without_hash", + "sign_with_hash", + ] +) +@pytest.mark.parametrize( + "account", + [ + Account( + bytes.fromhex("058000002c800006c18000000080000000"), + SigType.ED25519, + "__unused__"), + Account( + bytes.fromhex("048000002c800006c180000000800000"), + SigType.ED25519, + "__unused__"), + Account( + bytes.fromhex("0b8000002c800006c1800000008000000080000000800000008000000080000000800000008000000080000000"), + SigType.ED25519, + "__unused__"), + ], + ids=[ + "wrong_number_index_account", + "wrong_length_account", + "too_much_index_account", + ] +) +def test_wrong_derivation_path( + app: TezosAppScreen, + account: Account, + sender: Callable[[TezosAppScreen, Account], Any]): + """Check wrong derivation path behaviour""" -def test_wrong_class(app: TezosAppScreen): - """Check wrong apdu class behaviour""" app.assert_screen(Screen.HOME) - raw = \ - int(0x00).to_bytes(1, 'big') + \ - int(Ins.VERSION).to_bytes(1, 'big') + \ - int(Index.FIRST).to_bytes(1, 'big') + \ - int(SigType.ED25519).to_bytes(1, 'big') + \ - int(0x00).to_bytes(1, 'big') + with app.expect_apdu_failure(StatusCode.WRONG_LENGTH_FOR_INS): + sender(app, account) - with app.expect_apdu_failure(StatusCode.CLASS): - app.backend.exchange_raw(raw) + app.quit() +@pytest.mark.parametrize("class_", [0x00, 0x81]) +def test_wrong_class(app: TezosAppScreen, class_: int): + """Check wrong apdu class behaviour""" app.assert_screen(Screen.HOME) raw = \ - int(0x81).to_bytes(1, 'big') + \ + class_.to_bytes(1, 'big') + \ int(Ins.VERSION).to_bytes(1, 'big') + \ int(Index.FIRST).to_bytes(1, 'big') + \ int(SigType.ED25519).to_bytes(1, 'big') + \ @@ -227,7 +245,15 @@ def test_wrong_class(app: TezosAppScreen): app.quit() -def test_wrong_apdu_length(app: TezosAppScreen): +@pytest.mark.parametrize( + "size, data", + [ + (0, b'\x00'), + (1, b'') + ], + ids=lambda param: f"size={param}" if isinstance(param, int) else f"data={param}" +) +def test_wrong_apdu_length(app: TezosAppScreen, size: int, data: bytes): """Check wrong apdu length behaviour""" app.assert_screen(Screen.HOME) @@ -236,44 +262,37 @@ def test_wrong_apdu_length(app: TezosAppScreen): int(Ins.VERSION).to_bytes(1, 'big') + \ int(Index.FIRST).to_bytes(1, 'big') + \ int(SigType.ED25519).to_bytes(1, 'big') + \ - int(0x00).to_bytes(1, 'big') + \ - int(0x00).to_bytes(1, 'big') # right size = 0x01 - - with app.expect_apdu_failure(StatusCode.WRONG_LENGTH_FOR_INS): - app.backend.exchange_raw(raw) - - app.assert_screen(Screen.HOME) - - raw = \ - int(Cla.DEFAULT).to_bytes(1, 'big') + \ - int(Ins.VERSION).to_bytes(1, 'big') + \ - int(Index.FIRST).to_bytes(1, 'big') + \ - int(SigType.ED25519).to_bytes(1, 'big') + \ - int(0x01).to_bytes(1, 'big') # right size = 0x00 + size.to_bytes(1, 'big') + \ + data with app.expect_apdu_failure(StatusCode.WRONG_LENGTH_FOR_INS): app.backend.exchange_raw(raw) app.quit() -def test_unimplemented_commands(app: TezosAppScreen): +@pytest.mark.parametrize( + "ins", + [ + Ins.AUTHORIZE_BAKING, + Ins.SIGN_UNSAFE, + Ins.RESET, + Ins.QUERY_AUTH_KEY, + Ins.QUERY_MAIN_HWM, + Ins.SETUP, + Ins.QUERY_ALL_HWM, + Ins.DEAUTHORIZE, + Ins.QUERY_AUTH_KEY_WITH_CURVE, + Ins.HMAC, + 0xff + ], + ids=lambda ins: f"ins={ins}" +) +def test_unimplemented_commands(app: TezosAppScreen, ins: Union[int, Ins]): """Check unimplemented commands""" - for ins in \ - [Ins.AUTHORIZE_BAKING, \ - Ins.SIGN_UNSAFE, \ - Ins.RESET, \ - Ins.QUERY_AUTH_KEY, \ - Ins.QUERY_MAIN_HWM, \ - Ins.SETUP, \ - Ins.QUERY_ALL_HWM, \ - Ins.DEAUTHORIZE, \ - Ins.QUERY_AUTH_KEY_WITH_CURVE, \ - Ins.HMAC, \ - 0xff]: - - app.assert_screen(Screen.HOME) - - with app.expect_apdu_failure(StatusCode.INVALID_INS): - app.backend._exchange(ins) + + app.assert_screen(Screen.HOME) + + with app.expect_apdu_failure(StatusCode.INVALID_INS): + app.backend._exchange(ins) app.quit() diff --git a/tests/integration/nano/utils/account.py b/tests/integration/nano/utils/account.py index 39e3d074e..0ae640875 100644 --- a/tests/integration/nano/utils/account.py +++ b/tests/integration/nano/utils/account.py @@ -30,6 +30,9 @@ class SigType(IntEnum): SECP256R1 = 0x02 BIP32_ED25519 = 0x03 + def __str__(self) -> str: + return self.name + class Signature: """Class representing signature.""" diff --git a/tests/integration/nano/utils/backend.py b/tests/integration/nano/utils/backend.py index c76cd0cea..3ac303df6 100644 --- a/tests/integration/nano/utils/backend.py +++ b/tests/integration/nano/utils/backend.py @@ -28,6 +28,9 @@ class Cla(IntEnum): DEFAULT = 0x80 + def __str__(self) -> str: + return self.name + class Ins(IntEnum): """Class representing instruction.""" @@ -48,6 +51,9 @@ class Ins(IntEnum): HMAC = 0x0e SIGN_WITH_HASH = 0x0f + def __str__(self) -> str: + return self.name + class Index(IntEnum): """Class representing packet index.""" @@ -56,6 +62,9 @@ class Index(IntEnum): LAST = 0x80 OTHER_LAST = 0x81 + def __str__(self) -> str: + return self.name + class StatusCode(IntEnum): """Class representing the status code.""" @@ -77,12 +86,18 @@ class StatusCode(IntEnum): MEMORY_ERROR = 0x9200 PARSE_ERROR = 0x9405 + def __str__(self) -> str: + return self.name + class AppKind(IntEnum): """Class representing the kind of app.""" WALLET = 0x00 BAKING = 0x01 + def __str__(self) -> str: + return self.name + MAX_APDU_SIZE: int = 235 class TezosBackend(BackendInterface):