diff --git a/test/python/apps/exchange.py b/test/python/apps/exchange.py
index 57502c12..91a2779a 100644
--- a/test/python/apps/exchange.py
+++ b/test/python/apps/exchange.py
@@ -4,7 +4,7 @@
 
 from ragger.backend.interface import BackendInterface, RAPDU
 
-from ..utils import handle_lib_call_start_or_stop, int_to_minimally_sized_bytes, prefix_with_len_custom
+from ..utils import handle_lib_call_start_or_stop, int_to_minimally_sized_bytes, prefix_with_len_custom, get_version_from_makefile
 from .exchange_transaction_builder import SubCommand
 
 MAX_CHUNK_SIZE = 255
@@ -167,3 +167,11 @@ def start_signing_transaction(self) -> RAPDU:
         if rapdu.status == 0x9000:
             handle_lib_call_start_or_stop(self._client)
         return rapdu
+
+    def assert_exchange_is_started(self):
+        # We don't care at all for the subcommand / rate
+        version = self.get_version().data
+        major, minor, patch = get_version_from_makefile()
+        assert version[0] == major
+        assert version[1] == minor
+        assert version[2] == patch
diff --git a/test/python/apps/exchange_test_runner.py b/test/python/apps/exchange_test_runner.py
index 767e1f3a..78a7e2dd 100644
--- a/test/python/apps/exchange_test_runner.py
+++ b/test/python/apps/exchange_test_runner.py
@@ -10,12 +10,10 @@
 from . import cal as cal
 from .signing_authority import SigningAuthority, LEDGER_SIGNER
 
-from ..utils import handle_lib_call_start_or_stop, int_to_minimally_sized_bytes, get_version_from_makefile
+from ..utils import handle_lib_call_start_or_stop, int_to_minimally_sized_bytes
 
 # When adding a new test, have it prefixed by this string in order to have it automatically parametrized for currencies tests
 TEST_METHOD_PREFIX="perform_test_"
-TEST_LEGACY_SUFFIX="_legacy_flow"
-TEST_UNIFIED_SUFFIX="_ng_flow"
 
 # Exchange tests helpers, create a child of this class that define coin-specific elements and call its tests entry points
 class ExchangeTestRunner:
@@ -78,14 +76,8 @@ def __init__(self, backend, exchange_navigation_helper):
 
     def run_test(self, function_to_test: str):
         # Remove the flow suffix as the function is the same and the snapshot path is the same too
-        if function_to_test.endswith(TEST_LEGACY_SUFFIX):
-            use_legacy_flow = True
-            function_to_test = function_to_test.removesuffix(TEST_LEGACY_SUFFIX)
-        if function_to_test.endswith(TEST_UNIFIED_SUFFIX):
-            use_legacy_flow = False
-            function_to_test = function_to_test.removesuffix(TEST_UNIFIED_SUFFIX)
         self.exchange_navigation_helper.set_test_name_suffix("_" + function_to_test)
-        getattr(self, TEST_METHOD_PREFIX + function_to_test)(use_legacy_flow)
+        getattr(self, TEST_METHOD_PREFIX + function_to_test)()
 
     def _perform_valid_exchange(self, subcommand, tx_infos, from_currency_configuration, to_currency_configuration, fees, ui_validation):
         # Initialize the exchange client plugin that will format and send the APDUs to the device
@@ -112,27 +104,23 @@ def _perform_valid_exchange(self, subcommand, tx_infos, from_currency_configurat
         # Ask our fake CAL the coin configuration for both FROM and TO currencies (None for TO in case of FUND or SELL)
         from_configuration = from_currency_configuration.get_conf_for_ticker()
 
-        if subcommand == SubCommand.SWAP or subcommand == SubCommand.SWAP_NG:
+        if subcommand == SubCommand.SWAP_NG:
             to_configuration = to_currency_configuration.get_conf_for_ticker()
             ex.check_payout_address(to_configuration)
 
             # Request the final address check and UI approval request on the device
             ex.check_refund_address_no_display(from_configuration)
-            with ex.prompt_ui_display():
-                if ui_validation:
-                    self.exchange_navigation_helper.simple_accept()
-                else:
-                    # Calling the navigator delays the RAPDU reception until the end of navigation
-                    # Which is problematic if the RAPDU is an error as we would not raise until the navigation is done
-                    # As a workaround, we avoid calling the navigation if we want the function to raise
-                    pass
         else:
             ex.check_asset_in_no_display(from_configuration)
-            with ex.prompt_ui_display():
-                if ui_validation:
-                    self.exchange_navigation_helper.simple_accept()
-                else:
-                    pass
+
+        with ex.prompt_ui_display():
+            if ui_validation:
+                self.exchange_navigation_helper.simple_accept()
+            else:
+                # Calling the navigator delays the RAPDU reception until the end of navigation
+                # Which is problematic if the RAPDU is an error as we would not raise until the navigation is done
+                # As a workaround, we avoid calling the navigation if we want the function to raise
+                pass
 
         self.exchange_navigation_helper.wait_for_exchange_spinner()
 
@@ -141,7 +129,7 @@ def _perform_valid_exchange(self, subcommand, tx_infos, from_currency_configurat
 
         self.exchange_navigation_helper.wait_for_library_spinner()
 
-    def perform_valid_swap_from_custom(self, destination, send_amount, fees, memo, refund_address=None, refund_memo=None, ui_validation=True, legacy=False):
+    def perform_valid_swap_from_custom(self, destination, send_amount, fees, memo, refund_address=None, refund_memo=None, ui_validation=True):
         refund_address = self.valid_refund if refund_address is None else refund_address
         refund_memo = self.valid_refund_memo if refund_memo is None else refund_memo
         tx_infos = {
@@ -156,10 +144,9 @@ def perform_valid_swap_from_custom(self, destination, send_amount, fees, memo, r
             "amount_to_provider": int_to_minimally_sized_bytes(send_amount),
             "amount_to_wallet": b"\246\333t\233+\330\000", # Default
         }
-        subcommand = SubCommand.SWAP if legacy else SubCommand.SWAP_NG
-        self._perform_valid_exchange(subcommand, tx_infos, self.currency_configuration, cal.ETH_CURRENCY_CONFIGURATION, fees, ui_validation=ui_validation)
+        self._perform_valid_exchange(SubCommand.SWAP_NG, tx_infos, self.currency_configuration, cal.ETH_CURRENCY_CONFIGURATION, fees, ui_validation=ui_validation)
 
-    def perform_valid_swap_to_custom(self, destination, send_amount, fees, memo, ui_validation=True, legacy=False):
+    def perform_valid_swap_to_custom(self, destination, send_amount, fees, memo, ui_validation=True):
         tx_infos = {
             "payin_address": "0xDad77910DbDFdE764fC21FCD4E74D71bBACA6D8D", # Default
             "payin_extra_id": "", # Default
@@ -172,10 +159,9 @@ def perform_valid_swap_to_custom(self, destination, send_amount, fees, memo, ui_
             "amount_to_provider": int_to_minimally_sized_bytes(send_amount),
             "amount_to_wallet": b"\246\333t\233+\330\000", # Default
         }
-        subcommand = SubCommand.SWAP if legacy else SubCommand.SWAP_NG
-        self._perform_valid_exchange(subcommand, tx_infos, cal.ETH_CURRENCY_CONFIGURATION, self.currency_configuration, fees, ui_validation=ui_validation)
+        self._perform_valid_exchange(SubCommand.SWAP_NG, tx_infos, cal.ETH_CURRENCY_CONFIGURATION, self.currency_configuration, fees, ui_validation=ui_validation)
 
-    def perform_valid_fund_from_custom(self, destination, send_amount, fees, legacy=False):
+    def perform_valid_fund_from_custom(self, destination, send_amount, fees):
         tx_infos = {
             "user_id": self.fund_user_id,
             "account_name": self.fund_account_name,
@@ -183,10 +169,9 @@ def perform_valid_fund_from_custom(self, destination, send_amount, fees, legacy=
             "in_amount": int_to_minimally_sized_bytes(send_amount),
             "in_address": destination,
         }
-        subcommand = SubCommand.FUND if legacy else SubCommand.FUND_NG
-        self._perform_valid_exchange(subcommand, tx_infos, self.currency_configuration, None, fees, ui_validation=True)
+        self._perform_valid_exchange(SubCommand.FUND_NG, tx_infos, self.currency_configuration, None, fees, ui_validation=True)
 
-    def perform_valid_sell_from_custom(self, destination, send_amount, fees, legacy=False):
+    def perform_valid_sell_from_custom(self, destination, send_amount, fees):
         tx_infos = {
             "trader_email": self.sell_trader_email,
             "out_currency": self.sell_out_currency,
@@ -195,8 +180,7 @@ def perform_valid_sell_from_custom(self, destination, send_amount, fees, legacy=
             "in_amount": int_to_minimally_sized_bytes(send_amount),
             "in_address": destination,
         }
-        subcommand = SubCommand.SELL if legacy else SubCommand.SELL_NG
-        self._perform_valid_exchange(subcommand, tx_infos, self.currency_configuration, None, fees, ui_validation=True)
+        self._perform_valid_exchange(SubCommand.SELL_NG, tx_infos, self.currency_configuration, None, fees, ui_validation=True)
 
     # Implement this function for each tested coin
     def perform_final_tx(self, destination, send_amount, fees, memo):
@@ -214,18 +198,14 @@ def perform_coin_specific_final_tx(self, destination, send_amount, fees, memo):
 
     def assert_exchange_is_started(self):
         # We don't care at all for the subcommand / rate
-        version = ExchangeClient(self.backend, Rate.FIXED, SubCommand.SWAP_NG).get_version().data
-        major, minor, patch = get_version_from_makefile()
-        assert version[0] == major
-        assert version[1] == minor
-        assert version[2] == patch
+        ExchangeClient(self.backend, Rate.FIXED, SubCommand.SWAP_NG).assert_exchange_is_started()
 
     #########################################################
     # Generic SWAP tests functions, call them in your tests #
     #########################################################
 
     # We test that the currency app returns a fail when checking an incorrect refund address
-    def perform_test_swap_wrong_refund(self, legacy):
+    def perform_test_swap_wrong_refund(self):
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_valid_swap_from_custom(self.valid_destination_1,
                                                 self.valid_send_amount_1,
@@ -233,60 +213,59 @@ def perform_test_swap_wrong_refund(self, legacy):
                                                 self.valid_destination_memo_1,
                                                 refund_address=self.fake_refund,
                                                 refund_memo=self.fake_refund_memo,
-                                                ui_validation=False,
-                                                legacy=legacy)
+                                                ui_validation=False)
         assert e.value.status == Errors.INVALID_ADDRESS
 
     # We test that the currency app returns a fail when checking an incorrect payout address
-    def perform_test_swap_wrong_payout(self, legacy):
+    def perform_test_swap_wrong_payout(self):
         with pytest.raises(ExceptionRAPDU) as e:
-            self.perform_valid_swap_to_custom(self.fake_payout, self.valid_send_amount_1, self.valid_fees_1, self.fake_payout_memo, ui_validation=False, legacy=legacy)
+            self.perform_valid_swap_to_custom(self.fake_payout, self.valid_send_amount_1, self.valid_fees_1, self.fake_payout_memo, ui_validation=False)
         assert e.value.status == Errors.INVALID_ADDRESS
 
     # The absolute standard swap, using default values, user accepts on UI
-    def perform_test_swap_valid_1(self, legacy):
-        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1, legacy=legacy)
+    def perform_test_swap_valid_1(self):
+        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         self.assert_exchange_is_started()
 
     # The second standard swap, using alternate default values, user accepts on UI
-    def perform_test_swap_valid_2(self, legacy):
-        self.perform_valid_swap_from_custom(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, self.valid_destination_memo_2, legacy=legacy)
+    def perform_test_swap_valid_2(self):
+        self.perform_valid_swap_from_custom(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, self.valid_destination_memo_2)
         self.perform_coin_specific_final_tx(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, self.valid_destination_memo_2)
         self.assert_exchange_is_started()
 
     # Test swap with a malicious TX with tampered fees
-    def perform_test_swap_wrong_fees(self, legacy):
+    def perform_test_swap_wrong_fees(self):
         assert self.valid_fees_1 != self.valid_fees_2, "This test won't work if the values are the same"
-        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1, legacy=legacy)
+        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_2, self.valid_destination_memo_1)
         assert e.value.status == self.wrong_fees_error_code
         self.assert_exchange_is_started()
 
     # Test swap with a malicious TX with tampered memo
-    def perform_test_swap_wrong_memo(self, legacy):
+    def perform_test_swap_wrong_memo(self):
         if self.valid_destination_memo_1 == self.valid_destination_memo_2:
             pytest.skip("This test won't work if the values are the same")
-        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1, legacy=legacy)
+        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_2)
         assert e.value.status == self.wrong_memo_error_code
         self.assert_exchange_is_started()
 
     # Test swap with a malicious TX with tampered destination
-    def perform_test_swap_wrong_destination(self, legacy):
+    def perform_test_swap_wrong_destination(self):
         assert self.valid_destination_1 != self.valid_destination_2, "This test won't work if the values are the same"
-        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1, legacy=legacy)
+        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_2, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         assert e.value.status == self.wrong_destination_error_code
         self.assert_exchange_is_started()
 
     # Test swap with a malicious TX with tampered amount
-    def perform_test_swap_wrong_amount(self, legacy):
+    def perform_test_swap_wrong_amount(self):
         assert self.valid_send_amount_1 != self.valid_send_amount_2, "This test won't work if the values are the same"
-        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1, legacy=legacy)
+        self.perform_valid_swap_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, self.valid_destination_memo_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_2, self.valid_fees_1, self.valid_destination_memo_1)
         assert e.value.status == self.wrong_amount_error_code
@@ -297,47 +276,47 @@ def perform_test_swap_wrong_amount(self, legacy):
     #########################################################
 
     # The absolute standard fund, using default values, user accepts on UI
-    def perform_test_fund_valid_1(self, legacy):
-        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+    def perform_test_fund_valid_1(self):
+        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, "")
         self.assert_exchange_is_started()
 
     # The second standard fund, using alternate default values, user accepts on UI
-    def perform_test_fund_valid_2(self, legacy):
-        self.perform_valid_fund_from_custom(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, legacy=legacy)
+    def perform_test_fund_valid_2(self):
+        self.perform_valid_fund_from_custom(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2)
         self.perform_coin_specific_final_tx(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, "")
         self.assert_exchange_is_started()
 
     # Test fund with a malicious TX with tampered fees
-    def perform_test_fund_wrong_fees(self, legacy):
+    def perform_test_fund_wrong_fees(self):
         assert self.valid_fees_1 != self.valid_fees_2, "This test won't work if the values are the same"
-        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_2, "")
         assert e.value.status == self.wrong_fees_error_code
         self.assert_exchange_is_started()
 
     # Test fund with a malicious TX with tampered memo
-    def perform_test_fund_wrong_memo(self, legacy):
-        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+    def perform_test_fund_wrong_memo(self):
+        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, "no memo expected")
         assert e.value.status == self.wrong_memo_error_code
         self.assert_exchange_is_started()
 
     # Test fund with a malicious TX with tampered destination
-    def perform_test_fund_wrong_destination(self, legacy):
+    def perform_test_fund_wrong_destination(self):
         assert self.valid_destination_1 != self.valid_destination_2, "This test won't work if the values are the same"
-        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_2, self.valid_send_amount_1, self.valid_fees_1, "")
         assert e.value.status == self.wrong_destination_error_code
         self.assert_exchange_is_started()
 
     # Test fund with a malicious TX with tampered amount
-    def perform_test_fund_wrong_amount(self, legacy):
+    def perform_test_fund_wrong_amount(self):
         assert self.valid_send_amount_1 != self.valid_send_amount_2, "This test won't work if the values are the same"
-        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+        self.perform_valid_fund_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_2, self.valid_fees_1, "")
         assert e.value.status == self.wrong_amount_error_code
@@ -348,47 +327,47 @@ def perform_test_fund_wrong_amount(self, legacy):
     #########################################################
 
     # The absolute standard sell, using default values, user accepts on UI
-    def perform_test_sell_valid_1(self, legacy):
-        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+    def perform_test_sell_valid_1(self):
+        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, "")
         self.assert_exchange_is_started()
 
     # The second standard sell, using alternate default values, user accepts on UI
-    def perform_test_sell_valid_2(self, legacy):
-        self.perform_valid_sell_from_custom(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, legacy=legacy)
+    def perform_test_sell_valid_2(self):
+        self.perform_valid_sell_from_custom(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2)
         self.perform_coin_specific_final_tx(self.valid_destination_2, self.valid_send_amount_2, self.valid_fees_2, "")
         self.assert_exchange_is_started()
 
     # Test sell with a malicious TX with tampered fees
-    def perform_test_sell_wrong_fees(self, legacy):
+    def perform_test_sell_wrong_fees(self):
         assert self.valid_fees_1 != self.valid_fees_2, "This test won't work if the values are the same"
-        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_2, "")
         assert e.value.status == self.wrong_fees_error_code
         self.assert_exchange_is_started()
 
     # Test sell with a malicious TX with tampered memo
-    def perform_test_sell_wrong_memo(self, legacy):
-        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+    def perform_test_sell_wrong_memo(self):
+        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, "no memo expected")
         assert e.value.status == self.wrong_memo_error_code
         self.assert_exchange_is_started()
 
     # Test sell with a malicious TX with tampered destination
-    def perform_test_sell_wrong_destination(self, legacy):
+    def perform_test_sell_wrong_destination(self):
         assert self.valid_destination_1 != self.valid_destination_2, "This test won't work if the values are the same"
-        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_2, self.valid_send_amount_1, self.valid_fees_1, "")
         assert e.value.status == self.wrong_destination_error_code
         self.assert_exchange_is_started()
 
     # Test sell with a malicious TX with tampered amount
-    def perform_test_sell_wrong_amount(self, legacy):
+    def perform_test_sell_wrong_amount(self):
         assert self.valid_send_amount_1 != self.valid_send_amount_2, "This test won't work if the values are the same"
-        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1, legacy=legacy)
+        self.perform_valid_sell_from_custom(self.valid_destination_1, self.valid_send_amount_1, self.valid_fees_1)
         with pytest.raises(ExceptionRAPDU) as e:
             self.perform_coin_specific_final_tx(self.valid_destination_1, self.valid_send_amount_2, self.valid_fees_1, "")
         assert e.value.status == self.wrong_amount_error_code
@@ -397,10 +376,7 @@ def perform_test_sell_wrong_amount(self, legacy):
 # Automatically collect all tests functions and export their name in ready-to-be-parametrized lists
 _all_test_methods_prefixed = [method for method in dir(ExchangeTestRunner) if method.startswith(TEST_METHOD_PREFIX)]
 # Remove prefix to have nice snapshots directories
-ALL_TESTS_NAME = [str(i).replace(TEST_METHOD_PREFIX, '') for i in _all_test_methods_prefixed]
-
-# Parametrize with NG too
-ALL_TESTS = [x + suffix for x in ALL_TESTS_NAME for suffix in (TEST_LEGACY_SUFFIX, TEST_UNIFIED_SUFFIX)]
+ALL_TESTS = [str(i).replace(TEST_METHOD_PREFIX, '') for i in _all_test_methods_prefixed]
 
 ALL_TESTS_EXCEPT_MEMO = [test for test in ALL_TESTS if not "memo" in test]
 ALL_TESTS_EXCEPT_FEES = [test for test in ALL_TESTS if not "fees" in test]
diff --git a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00000.png b/test/python/snapshots/flex/test_check_address_and_display_fund/review/00000.png
deleted file mode 100644
index c7884c11..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00000.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00001.png b/test/python/snapshots/flex/test_check_address_and_display_fund/review/00001.png
deleted file mode 100644
index 80dc5533..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00001.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00002.png b/test/python/snapshots/flex/test_check_address_and_display_fund/review/00002.png
deleted file mode 100644
index c0c351a7..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00002.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00003.png b/test/python/snapshots/flex/test_check_address_and_display_fund/review/00003.png
deleted file mode 100644
index 84a4aa80..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_fund/review/00003.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00000.png b/test/python/snapshots/flex/test_check_address_and_display_sell/review/00000.png
deleted file mode 100644
index 289aba30..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00000.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00001.png b/test/python/snapshots/flex/test_check_address_and_display_sell/review/00001.png
deleted file mode 100644
index 36a4627b..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00001.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00002.png b/test/python/snapshots/flex/test_check_address_and_display_sell/review/00002.png
deleted file mode 100644
index c0c351a7..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00002.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00003.png b/test/python/snapshots/flex/test_check_address_and_display_sell/review/00003.png
deleted file mode 100644
index 90e4f24b..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_sell/review/00003.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00000.png b/test/python/snapshots/flex/test_check_address_and_display_swap/review/00000.png
deleted file mode 100644
index ce642a73..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00000.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00001.png b/test/python/snapshots/flex/test_check_address_and_display_swap/review/00001.png
deleted file mode 100644
index 7502ae1d..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00001.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00002.png b/test/python/snapshots/flex/test_check_address_and_display_swap/review/00002.png
deleted file mode 100644
index c0c351a7..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00002.png and /dev/null differ
diff --git a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00003.png b/test/python/snapshots/flex/test_check_address_and_display_swap/review/00003.png
deleted file mode 100644
index 5af94de5..00000000
Binary files a/test/python/snapshots/flex/test_check_address_and_display_swap/review/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00002.png b/test/python/snapshots/nanos/test_check_address_and_display_fund/00002.png
deleted file mode 100644
index 1b082cfc..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_fund/00002.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00004.png b/test/python/snapshots/nanos/test_check_address_and_display_fund/00004.png
deleted file mode 100644
index 13d29398..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_fund/00004.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00005.png b/test/python/snapshots/nanos/test_check_address_and_display_fund/00005.png
deleted file mode 100644
index ed429612..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_fund/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00006.png b/test/python/snapshots/nanos/test_check_address_and_display_fund/00006.png
deleted file mode 100644
index e12d9b2b..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_fund/00006.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00003.png b/test/python/snapshots/nanos/test_check_address_and_display_sell/00003.png
deleted file mode 100644
index 1b082cfc..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_sell/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00005.png b/test/python/snapshots/nanos/test_check_address_and_display_sell/00005.png
deleted file mode 100644
index 13d29398..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_sell/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00006.png b/test/python/snapshots/nanos/test_check_address_and_display_sell/00006.png
deleted file mode 100644
index ed429612..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_sell/00006.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00007.png b/test/python/snapshots/nanos/test_check_address_and_display_sell/00007.png
deleted file mode 100644
index e12d9b2b..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_sell/00007.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00002.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00002.png
deleted file mode 100644
index 57e07235..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00002.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00003.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00003.png
deleted file mode 100644
index 6d820424..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00004.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00004.png
deleted file mode 100644
index 13d29398..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00004.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00005.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00005.png
deleted file mode 100644
index ed429612..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00006.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00006.png
deleted file mode 100644
index e12d9b2b..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00006.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00007.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00007.png
deleted file mode 100644
index 1c9156c3..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00007.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00008.png b/test/python/snapshots/nanos/test_check_address_and_display_swap/00008.png
deleted file mode 100644
index a0aef4de..00000000
Binary files a/test/python/snapshots/nanos/test_check_address_and_display_swap/00008.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00000.png b/test/python/snapshots/nanos/test_ltc_fund/00000.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_fund/00000.png
rename to test/python/snapshots/nanos/test_ltc_fund/00000.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00001.png b/test/python/snapshots/nanos/test_ltc_fund/00001.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_fund/00001.png
rename to test/python/snapshots/nanos/test_ltc_fund/00001.png
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00002.png b/test/python/snapshots/nanos/test_ltc_fund/00002.png
similarity index 100%
rename from test/python/snapshots/nanos/test_swap_ltc_to_eth/00002.png
rename to test/python/snapshots/nanos/test_ltc_fund/00002.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00003.png b/test/python/snapshots/nanos/test_ltc_fund/00003.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_fund/00003.png
rename to test/python/snapshots/nanos/test_ltc_fund/00003.png
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00004.png b/test/python/snapshots/nanos/test_ltc_fund/00004.png
similarity index 100%
rename from test/python/snapshots/nanos/test_swap_ltc_to_eth/00004.png
rename to test/python/snapshots/nanos/test_ltc_fund/00004.png
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00005.png b/test/python/snapshots/nanos/test_ltc_fund/00005.png
similarity index 100%
rename from test/python/snapshots/nanos/test_swap_ltc_to_eth/00005.png
rename to test/python/snapshots/nanos/test_ltc_fund/00005.png
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00006.png b/test/python/snapshots/nanos/test_ltc_fund/00006.png
similarity index 100%
rename from test/python/snapshots/nanos/test_swap_ltc_to_eth/00006.png
rename to test/python/snapshots/nanos/test_ltc_fund/00006.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00000.png b/test/python/snapshots/nanos/test_ltc_sell/00000.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_sell/00000.png
rename to test/python/snapshots/nanos/test_ltc_sell/00000.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00001.png b/test/python/snapshots/nanos/test_ltc_sell/00001.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_sell/00001.png
rename to test/python/snapshots/nanos/test_ltc_sell/00001.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00002.png b/test/python/snapshots/nanos/test_ltc_sell/00002.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_sell/00002.png
rename to test/python/snapshots/nanos/test_ltc_sell/00002.png
diff --git a/test/python/snapshots/nanos/test_ltc_sell/00003.png b/test/python/snapshots/nanos/test_ltc_sell/00003.png
new file mode 100644
index 00000000..d8f39e1f
Binary files /dev/null and b/test/python/snapshots/nanos/test_ltc_sell/00003.png differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00004.png b/test/python/snapshots/nanos/test_ltc_sell/00004.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_sell/00004.png
rename to test/python/snapshots/nanos/test_ltc_sell/00004.png
diff --git a/test/python/snapshots/nanos/test_ltc_sell/00005.png b/test/python/snapshots/nanos/test_ltc_sell/00005.png
new file mode 100644
index 00000000..251e5569
Binary files /dev/null and b/test/python/snapshots/nanos/test_ltc_sell/00005.png differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00007.png b/test/python/snapshots/nanos/test_ltc_sell/00006.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_fund/00007.png
rename to test/python/snapshots/nanos/test_ltc_sell/00006.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_fund/00008.png b/test/python/snapshots/nanos/test_ltc_sell/00007.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_fund/00008.png
rename to test/python/snapshots/nanos/test_ltc_sell/00007.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00000.png b/test/python/snapshots/nanos/test_ltc_swap/00000.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_swap/00000.png
rename to test/python/snapshots/nanos/test_ltc_swap/00000.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_swap/00001.png b/test/python/snapshots/nanos/test_ltc_swap/00001.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_swap/00001.png
rename to test/python/snapshots/nanos/test_ltc_swap/00001.png
diff --git a/test/python/snapshots/nanos/test_ltc_swap/00002.png b/test/python/snapshots/nanos/test_ltc_swap/00002.png
new file mode 100644
index 00000000..d8f39e1f
Binary files /dev/null and b/test/python/snapshots/nanos/test_ltc_swap/00002.png differ
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00003.png b/test/python/snapshots/nanos/test_ltc_swap/00003.png
similarity index 100%
rename from test/python/snapshots/nanos/test_swap_ltc_to_eth/00003.png
rename to test/python/snapshots/nanos/test_ltc_swap/00003.png
diff --git a/test/python/snapshots/nanos/test_ltc_swap/00004.png b/test/python/snapshots/nanos/test_ltc_swap/00004.png
new file mode 100644
index 00000000..251e5569
Binary files /dev/null and b/test/python/snapshots/nanos/test_ltc_swap/00004.png differ
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00008.png b/test/python/snapshots/nanos/test_ltc_swap/00005.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_sell/00008.png
rename to test/python/snapshots/nanos/test_ltc_swap/00005.png
diff --git a/test/python/snapshots/nanos/test_check_address_and_display_sell/00009.png b/test/python/snapshots/nanos/test_ltc_swap/00006.png
similarity index 100%
rename from test/python/snapshots/nanos/test_check_address_and_display_sell/00009.png
rename to test/python/snapshots/nanos/test_ltc_swap/00006.png
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00000.png b/test/python/snapshots/nanos/test_swap_ltc_to_eth/00000.png
deleted file mode 100644
index 8d84cc70..00000000
Binary files a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00000.png and /dev/null differ
diff --git a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00001.png b/test/python/snapshots/nanos/test_swap_ltc_to_eth/00001.png
deleted file mode 100644
index 9c1161a4..00000000
Binary files a/test/python/snapshots/nanos/test_swap_ltc_to_eth/00001.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00002.png b/test/python/snapshots/nanosp/test_check_address_and_display_fund/00002.png
deleted file mode 100644
index 3d99ad93..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00002.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00004.png b/test/python/snapshots/nanosp/test_check_address_and_display_fund/00004.png
deleted file mode 100644
index d52d909c..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00004.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00003.png b/test/python/snapshots/nanosp/test_check_address_and_display_sell/00003.png
deleted file mode 100644
index 3d99ad93..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00005.png b/test/python/snapshots/nanosp/test_check_address_and_display_sell/00005.png
deleted file mode 100644
index d52d909c..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00002.png b/test/python/snapshots/nanosp/test_check_address_and_display_swap/00002.png
deleted file mode 100644
index 8b0f7d73..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00002.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00003.png b/test/python/snapshots/nanosp/test_check_address_and_display_swap/00003.png
deleted file mode 100644
index 260ef552..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00004.png b/test/python/snapshots/nanosp/test_check_address_and_display_swap/00004.png
deleted file mode 100644
index d52d909c..00000000
Binary files a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00004.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00000.png b/test/python/snapshots/nanosp/test_ltc_fund/00000.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_fund/00000.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00000.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00001.png b/test/python/snapshots/nanosp/test_ltc_fund/00001.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_fund/00001.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00001.png
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00002.png b/test/python/snapshots/nanosp/test_ltc_fund/00002.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00002.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00002.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00003.png b/test/python/snapshots/nanosp/test_ltc_fund/00003.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_fund/00003.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00003.png
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00004.png b/test/python/snapshots/nanosp/test_ltc_fund/00004.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00004.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00004.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00005.png b/test/python/snapshots/nanosp/test_ltc_fund/00005.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_fund/00005.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00005.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_fund/00006.png b/test/python/snapshots/nanosp/test_ltc_fund/00006.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_fund/00006.png
rename to test/python/snapshots/nanosp/test_ltc_fund/00006.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00000.png b/test/python/snapshots/nanosp/test_ltc_sell/00000.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_sell/00000.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00000.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00001.png b/test/python/snapshots/nanosp/test_ltc_sell/00001.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_sell/00001.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00001.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00002.png b/test/python/snapshots/nanosp/test_ltc_sell/00002.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_sell/00002.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00002.png
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00002.png b/test/python/snapshots/nanosp/test_ltc_sell/00003.png
similarity index 100%
rename from test/python/snapshots/nanox/test_swap_ltc_to_eth/00002.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00003.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00004.png b/test/python/snapshots/nanosp/test_ltc_sell/00004.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_sell/00004.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00004.png
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00004.png b/test/python/snapshots/nanosp/test_ltc_sell/00005.png
similarity index 100%
rename from test/python/snapshots/nanox/test_swap_ltc_to_eth/00004.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00005.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00006.png b/test/python/snapshots/nanosp/test_ltc_sell/00006.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_sell/00006.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00006.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_sell/00007.png b/test/python/snapshots/nanosp/test_ltc_sell/00007.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_sell/00007.png
rename to test/python/snapshots/nanosp/test_ltc_sell/00007.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00000.png b/test/python/snapshots/nanosp/test_ltc_swap/00000.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_swap/00000.png
rename to test/python/snapshots/nanosp/test_ltc_swap/00000.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00001.png b/test/python/snapshots/nanosp/test_ltc_swap/00001.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_swap/00001.png
rename to test/python/snapshots/nanosp/test_ltc_swap/00001.png
diff --git a/test/python/snapshots/nanosp/test_ltc_swap/00002.png b/test/python/snapshots/nanosp/test_ltc_swap/00002.png
new file mode 100644
index 00000000..7d1c0c21
Binary files /dev/null and b/test/python/snapshots/nanosp/test_ltc_swap/00002.png differ
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00003.png b/test/python/snapshots/nanosp/test_ltc_swap/00003.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00003.png
rename to test/python/snapshots/nanosp/test_ltc_swap/00003.png
diff --git a/test/python/snapshots/nanosp/test_ltc_swap/00004.png b/test/python/snapshots/nanosp/test_ltc_swap/00004.png
new file mode 100644
index 00000000..5ae7a43f
Binary files /dev/null and b/test/python/snapshots/nanosp/test_ltc_swap/00004.png differ
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00005.png b/test/python/snapshots/nanosp/test_ltc_swap/00005.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_swap/00005.png
rename to test/python/snapshots/nanosp/test_ltc_swap/00005.png
diff --git a/test/python/snapshots/nanosp/test_check_address_and_display_swap/00006.png b/test/python/snapshots/nanosp/test_ltc_swap/00006.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_check_address_and_display_swap/00006.png
rename to test/python/snapshots/nanosp/test_ltc_swap/00006.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00002.png b/test/python/snapshots/nanox/test_check_address_and_display_fund/00002.png
deleted file mode 100644
index 3d99ad93..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_fund/00002.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00004.png b/test/python/snapshots/nanox/test_check_address_and_display_fund/00004.png
deleted file mode 100644
index d52d909c..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_fund/00004.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00003.png b/test/python/snapshots/nanox/test_check_address_and_display_sell/00003.png
deleted file mode 100644
index 3d99ad93..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_sell/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00005.png b/test/python/snapshots/nanox/test_check_address_and_display_sell/00005.png
deleted file mode 100644
index d52d909c..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_sell/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00000.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00000.png
deleted file mode 100644
index 487ea10f..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00000.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00001.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00001.png
deleted file mode 100644
index c9dacd5c..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00001.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00002.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00002.png
deleted file mode 100644
index 8b0f7d73..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00002.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00003.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00003.png
deleted file mode 100644
index 260ef552..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00003.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00004.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00004.png
deleted file mode 100644
index d52d909c..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00004.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00005.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00005.png
deleted file mode 100644
index 570ce28d..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_swap/00006.png b/test/python/snapshots/nanox/test_check_address_and_display_swap/00006.png
deleted file mode 100644
index 6c4d06b4..00000000
Binary files a/test/python/snapshots/nanox/test_check_address_and_display_swap/00006.png and /dev/null differ
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00000.png b/test/python/snapshots/nanox/test_ltc_fund/00000.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00000.png
rename to test/python/snapshots/nanox/test_ltc_fund/00000.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00001.png b/test/python/snapshots/nanox/test_ltc_fund/00001.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_fund/00001.png
rename to test/python/snapshots/nanox/test_ltc_fund/00001.png
diff --git a/test/python/snapshots/nanox/test_ltc_fund/00002.png b/test/python/snapshots/nanox/test_ltc_fund/00002.png
new file mode 100644
index 00000000..7d1c0c21
Binary files /dev/null and b/test/python/snapshots/nanox/test_ltc_fund/00002.png differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00003.png b/test/python/snapshots/nanox/test_ltc_fund/00003.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_fund/00003.png
rename to test/python/snapshots/nanox/test_ltc_fund/00003.png
diff --git a/test/python/snapshots/nanox/test_ltc_fund/00004.png b/test/python/snapshots/nanox/test_ltc_fund/00004.png
new file mode 100644
index 00000000..5ae7a43f
Binary files /dev/null and b/test/python/snapshots/nanox/test_ltc_fund/00004.png differ
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00005.png b/test/python/snapshots/nanox/test_ltc_fund/00005.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00005.png
rename to test/python/snapshots/nanox/test_ltc_fund/00005.png
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00006.png b/test/python/snapshots/nanox/test_ltc_fund/00006.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00006.png
rename to test/python/snapshots/nanox/test_ltc_fund/00006.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00000.png b/test/python/snapshots/nanox/test_ltc_sell/00000.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_fund/00000.png
rename to test/python/snapshots/nanox/test_ltc_sell/00000.png
diff --git a/test/python/snapshots/nanosp/test_swap_ltc_to_eth/00001.png b/test/python/snapshots/nanox/test_ltc_sell/00001.png
similarity index 100%
rename from test/python/snapshots/nanosp/test_swap_ltc_to_eth/00001.png
rename to test/python/snapshots/nanox/test_ltc_sell/00001.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00002.png b/test/python/snapshots/nanox/test_ltc_sell/00002.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_sell/00002.png
rename to test/python/snapshots/nanox/test_ltc_sell/00002.png
diff --git a/test/python/snapshots/nanox/test_ltc_sell/00003.png b/test/python/snapshots/nanox/test_ltc_sell/00003.png
new file mode 100644
index 00000000..7d1c0c21
Binary files /dev/null and b/test/python/snapshots/nanox/test_ltc_sell/00003.png differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00004.png b/test/python/snapshots/nanox/test_ltc_sell/00004.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_sell/00004.png
rename to test/python/snapshots/nanox/test_ltc_sell/00004.png
diff --git a/test/python/snapshots/nanox/test_ltc_sell/00005.png b/test/python/snapshots/nanox/test_ltc_sell/00005.png
new file mode 100644
index 00000000..5ae7a43f
Binary files /dev/null and b/test/python/snapshots/nanox/test_ltc_sell/00005.png differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00006.png b/test/python/snapshots/nanox/test_ltc_sell/00006.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_sell/00006.png
rename to test/python/snapshots/nanox/test_ltc_sell/00006.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00007.png b/test/python/snapshots/nanox/test_ltc_sell/00007.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_sell/00007.png
rename to test/python/snapshots/nanox/test_ltc_sell/00007.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00000.png b/test/python/snapshots/nanox/test_ltc_swap/00000.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_sell/00000.png
rename to test/python/snapshots/nanox/test_ltc_swap/00000.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_sell/00001.png b/test/python/snapshots/nanox/test_ltc_swap/00001.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_sell/00001.png
rename to test/python/snapshots/nanox/test_ltc_swap/00001.png
diff --git a/test/python/snapshots/nanox/test_ltc_swap/00002.png b/test/python/snapshots/nanox/test_ltc_swap/00002.png
new file mode 100644
index 00000000..7d1c0c21
Binary files /dev/null and b/test/python/snapshots/nanox/test_ltc_swap/00002.png differ
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00003.png b/test/python/snapshots/nanox/test_ltc_swap/00003.png
similarity index 100%
rename from test/python/snapshots/nanox/test_swap_ltc_to_eth/00003.png
rename to test/python/snapshots/nanox/test_ltc_swap/00003.png
diff --git a/test/python/snapshots/nanox/test_ltc_swap/00004.png b/test/python/snapshots/nanox/test_ltc_swap/00004.png
new file mode 100644
index 00000000..5ae7a43f
Binary files /dev/null and b/test/python/snapshots/nanox/test_ltc_swap/00004.png differ
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00005.png b/test/python/snapshots/nanox/test_ltc_swap/00005.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_fund/00005.png
rename to test/python/snapshots/nanox/test_ltc_swap/00005.png
diff --git a/test/python/snapshots/nanox/test_check_address_and_display_fund/00006.png b/test/python/snapshots/nanox/test_ltc_swap/00006.png
similarity index 100%
rename from test/python/snapshots/nanox/test_check_address_and_display_fund/00006.png
rename to test/python/snapshots/nanox/test_ltc_swap/00006.png
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00000.png b/test/python/snapshots/nanox/test_swap_ltc_to_eth/00000.png
deleted file mode 100644
index 487ea10f..00000000
Binary files a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00000.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00001.png b/test/python/snapshots/nanox/test_swap_ltc_to_eth/00001.png
deleted file mode 100644
index c9dacd5c..00000000
Binary files a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00001.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00005.png b/test/python/snapshots/nanox/test_swap_ltc_to_eth/00005.png
deleted file mode 100644
index 570ce28d..00000000
Binary files a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00005.png and /dev/null differ
diff --git a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00006.png b/test/python/snapshots/nanox/test_swap_ltc_to_eth/00006.png
deleted file mode 100644
index 6c4d06b4..00000000
Binary files a/test/python/snapshots/nanox/test_swap_ltc_to_eth/00006.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_fund/review/00000.png b/test/python/snapshots/stax/test_check_address_and_display_fund/review/00000.png
deleted file mode 100644
index 013e56c7..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_fund/review/00000.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_fund/review/00001.png b/test/python/snapshots/stax/test_check_address_and_display_fund/review/00001.png
deleted file mode 100644
index 08cf1b67..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_fund/review/00001.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_fund/review/00002.png b/test/python/snapshots/stax/test_check_address_and_display_fund/review/00002.png
deleted file mode 100644
index 2e591eec..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_fund/review/00002.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00000.png b/test/python/snapshots/stax/test_check_address_and_display_sell/review/00000.png
deleted file mode 100644
index a4344acd..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00000.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00001.png b/test/python/snapshots/stax/test_check_address_and_display_sell/review/00001.png
deleted file mode 100644
index f93d111c..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00001.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00002.png b/test/python/snapshots/stax/test_check_address_and_display_sell/review/00002.png
deleted file mode 100644
index cfb09a9f..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00002.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00003.png b/test/python/snapshots/stax/test_check_address_and_display_sell/review/00003.png
deleted file mode 100644
index 7a9d0a1b..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_sell/review/00003.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_swap/review/00000.png b/test/python/snapshots/stax/test_check_address_and_display_swap/review/00000.png
deleted file mode 100644
index 2451c3fa..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_swap/review/00000.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_swap/review/00001.png b/test/python/snapshots/stax/test_check_address_and_display_swap/review/00001.png
deleted file mode 100644
index a25e7af9..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_swap/review/00001.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_check_address_and_display_swap/review/00002.png b/test/python/snapshots/stax/test_check_address_and_display_swap/review/00002.png
deleted file mode 100644
index 942f0ee2..00000000
Binary files a/test/python/snapshots/stax/test_check_address_and_display_swap/review/00002.png and /dev/null differ
diff --git a/test/python/snapshots/stax/test_ltc_fund/review/00000.png b/test/python/snapshots/stax/test_ltc_fund/review/00000.png
new file mode 100644
index 00000000..2a36852e
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_fund/review/00000.png differ
diff --git a/test/python/snapshots/stax/test_ltc_fund/review/00001.png b/test/python/snapshots/stax/test_ltc_fund/review/00001.png
new file mode 100644
index 00000000..7695fe9e
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_fund/review/00001.png differ
diff --git a/test/python/snapshots/stax/test_ltc_fund/review/00002.png b/test/python/snapshots/stax/test_ltc_fund/review/00002.png
new file mode 100644
index 00000000..0c3f0eee
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_fund/review/00002.png differ
diff --git a/test/python/snapshots/stax/test_ltc_sell/review/00000.png b/test/python/snapshots/stax/test_ltc_sell/review/00000.png
new file mode 100644
index 00000000..36d02eb1
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_sell/review/00000.png differ
diff --git a/test/python/snapshots/stax/test_ltc_sell/review/00001.png b/test/python/snapshots/stax/test_ltc_sell/review/00001.png
new file mode 100644
index 00000000..3af52a2a
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_sell/review/00001.png differ
diff --git a/test/python/snapshots/stax/test_ltc_sell/review/00002.png b/test/python/snapshots/stax/test_ltc_sell/review/00002.png
new file mode 100644
index 00000000..8ac0c1f6
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_sell/review/00002.png differ
diff --git a/test/python/snapshots/stax/test_ltc_sell/review/00003.png b/test/python/snapshots/stax/test_ltc_sell/review/00003.png
new file mode 100644
index 00000000..c18e437b
Binary files /dev/null and b/test/python/snapshots/stax/test_ltc_sell/review/00003.png differ
diff --git a/test/python/snapshots/stax/test_swap_ltc_to_eth/review/00000.png b/test/python/snapshots/stax/test_ltc_swap/review/00000.png
similarity index 100%
rename from test/python/snapshots/stax/test_swap_ltc_to_eth/review/00000.png
rename to test/python/snapshots/stax/test_ltc_swap/review/00000.png
diff --git a/test/python/snapshots/stax/test_swap_ltc_to_eth/review/00001.png b/test/python/snapshots/stax/test_ltc_swap/review/00001.png
similarity index 100%
rename from test/python/snapshots/stax/test_swap_ltc_to_eth/review/00001.png
rename to test/python/snapshots/stax/test_ltc_swap/review/00001.png
diff --git a/test/python/snapshots/stax/test_swap_ltc_to_eth/review/00002.png b/test/python/snapshots/stax/test_ltc_swap/review/00002.png
similarity index 100%
rename from test/python/snapshots/stax/test_swap_ltc_to_eth/review/00002.png
rename to test/python/snapshots/stax/test_ltc_swap/review/00002.png
diff --git a/test/python/test_check_address_and_display.py b/test/python/test_check_address_and_display.py
deleted file mode 100644
index adb0b694..00000000
--- a/test/python/test_check_address_and_display.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import pytest
-from ragger.utils import prefix_with_len
-
-from .apps.exchange import ExchangeClient, Rate, SubCommand
-from .apps.litecoin import LitecoinClient
-
-from .apps.signing_authority import SigningAuthority, LEDGER_SIGNER
-from .apps.exchange_transaction_builder import get_partner_curve, craft_and_sign_tx, ALL_SUBCOMMANDS, get_credentials
-from .apps import cal as cal
-
-CURRENCY_FROM = cal.ETH_CURRENCY_CONFIGURATION
-CURRENCY_TO = cal.BTC_CURRENCY_CONFIGURATION
-
-SWAP_TX_INFOS = {
-     "payin_address": b"0xd692Cb1346262F584D17B4B470954501f6715a82",
-     "payin_extra_id": b"",
-     "refund_address": b"0xDad77910DbDFdE764fC21FCD4E74D71bBACA6D8D",
-     "refund_extra_id": b"",
-     "payout_address": b"bc1qqtl9jlrwcr3fsfcjj2du7pu6fcgaxl5dsw2vyg",
-     "payout_extra_id": b"",
-     "currency_from": CURRENCY_FROM.ticker,
-     "currency_to": CURRENCY_TO.ticker,
-     "amount_to_provider": bytes.fromhex("013fc3a717fb5000"),
-     "amount_to_wallet": b"\x0b\xeb\xc2\x00",
-}
-FUND_TX_INFOS = {
-    "user_id": "John Wick",
-    "account_name": "Remember Daisy",
-    "in_currency": CURRENCY_FROM.ticker,
-    "in_amount": b"\032\200\250]$T\000",
-    "in_address": "0x252fb4acbe0de4f0bd2409a5ed59a71e4ef1d2bc"
-}
-SELL_TX_INFOS = {
-    "trader_email": "john@doe.lost",
-    "out_currency": "USD",
-    "out_amount": {"coefficient": b"\x01", "exponent": 3},
-    "in_currency": CURRENCY_FROM.ticker,
-    "in_amount": b"\032\200\250]$T\000",
-    "in_address": "0x252fb4acbe0de4f0bd2409a5ed59a71e4ef1d2bc"
-}
-TX_INFOS = {
-    SubCommand.SWAP: SWAP_TX_INFOS,
-    SubCommand.SWAP_NG: SWAP_TX_INFOS,
-    SubCommand.FUND: FUND_TX_INFOS,
-    SubCommand.FUND_NG: FUND_TX_INFOS,
-    SubCommand.SELL: SELL_TX_INFOS,
-    SubCommand.SELL_NG: SELL_TX_INFOS,
-}
-
-class TestCheckAddressAndDisplay:
-
-    @pytest.mark.parametrize("subcommand", ALL_SUBCOMMANDS)
-    def test_check_address_and_display(self, backend, exchange_navigation_helper, subcommand):
-        suffix = "_" + str(subcommand).split('.')[1].split('_')[0].lower()
-        exchange_navigation_helper.set_test_name_suffix(suffix)
-
-        ex = ExchangeClient(backend, Rate.FIXED, subcommand)
-        partner = SigningAuthority(curve=get_partner_curve(subcommand), name="Default name")
-
-        transaction_id = ex.init_transaction().data
-        credentials = get_credentials(subcommand, partner)
-        ex.set_partner_key(credentials)
-        ex.check_partner_key(LEDGER_SIGNER.sign(credentials))
-
-        tx, tx_signature = craft_and_sign_tx(subcommand, TX_INFOS[subcommand], transaction_id, 339, partner)
-        ex.process_transaction(tx)
-        ex.check_transaction_signature(tx_signature)
-
-        if subcommand == SubCommand.SWAP or subcommand == SubCommand.SWAP_NG:
-            ex.check_payout_address(CURRENCY_TO.get_conf_for_ticker())
-            with ex.check_refund_address(CURRENCY_FROM.get_conf_for_ticker()):
-                exchange_navigation_helper.simple_accept()
-        else:
-            with ex.check_asset_in(CURRENCY_FROM.get_conf_for_ticker()):
-                exchange_navigation_helper.simple_accept()
diff --git a/test/python/test_swap_ltc_to_eth.py b/test/python/test_swap_ltc_to_eth.py
deleted file mode 100644
index 1d32e62d..00000000
--- a/test/python/test_swap_ltc_to_eth.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from ragger.utils import prefix_with_len
-
-from .apps.exchange import ExchangeClient, Rate, SubCommand
-from .apps.litecoin import LitecoinClient
-
-from .apps.signing_authority import SigningAuthority, LEDGER_SIGNER
-from .apps.exchange_transaction_builder import get_partner_curve, craft_and_sign_tx
-from .apps import cal as cal
-
-CURRENCY_FROM = cal.LTC_CURRENCY_CONFIGURATION
-CURRENCY_TO = cal.ETH_CURRENCY_CONFIGURATION
-
-def test_swap_ltc_to_eth(backend, exchange_navigation_helper):
-    ex = ExchangeClient(backend, Rate.FIXED, SubCommand.SWAP)
-    partner = SigningAuthority(curve=get_partner_curve(SubCommand.SWAP), name="Default name")
-
-    transaction_id = ex.init_transaction().data
-    ex.set_partner_key(partner.credentials)
-    ex.check_partner_key(LEDGER_SIGNER.sign(partner.credentials))
-
-    tx_infos = {
-        "payin_address": "LKY4hyq7ucxtdGoQ6ajkwv4ddTNA4WpYhF",
-        "refund_address": "MJovkMvQ2rXXUj7TGVvnQyVMWghSdqZsmu",
-        "payout_address": "0xDad77910DbDFdE764fC21FCD4E74D71bBACA6D8D",
-        "payin_extra_id": "",
-        "refund_extra_id": "",
-        "payout_extra_id": "",
-        "currency_from": "LTC",
-        "currency_to": "ETH",
-        "amount_to_provider": b"\010T2V",
-        "amount_to_wallet": b"\246\333t\233+\330\000",
-    }
-    fees = 339
-
-    tx, tx_signature = craft_and_sign_tx(SubCommand.SWAP, tx_infos, transaction_id, fees, partner)
-    ex.process_transaction(tx)
-    ex.check_transaction_signature(tx_signature)
-
-    ex.check_payout_address(CURRENCY_TO.get_conf_for_ticker())
-    with ex.check_refund_address(CURRENCY_FROM.get_conf_for_ticker()):
-        exchange_navigation_helper.simple_accept()
-    ex.start_signing_transaction()
-
-    ltc = LitecoinClient(backend)
-
-    ltc.get_public_key(bytes.fromhex('058000005480000002800000000000000000000001'))
-    ltc.get_coin_version()
-    ltc.get_trusted_input(bytes.fromhex('000000000200000001'))
-    ltc.get_trusted_input(bytes.fromhex('5afe770dd416a3e3a7852ffc7c2cb03ec2e4f1709f07d2a61776f27461e455290000000000'))
-    ltc.get_trusted_input(bytes.fromhex('ffffffff'))
-    ltc.get_trusted_input(bytes.fromhex('01'))
-    ltc.get_trusted_input(bytes.fromhex('a9335408000000001600146efd74d16ca7e5da5ce06d449fb9124fd6af05cd'))
-    result = ltc.get_trusted_input(bytes.fromhex('00000000')).data
-    ltc.get_public_key(bytes.fromhex('058000005480000002800000000000000000000000'))
-    ltc.hash_input(bytes.fromhex('0100000001'))
-    ltc.hash_input(bytes.fromhex('01') + prefix_with_len(result) + bytes.fromhex('00'))
-    ltc.hash_input(bytes.fromhex('00000000'))
-    ltc.hash_input(bytes.fromhex('0156325408000000001976a914036cdde130e7b93b86d27425145082bc2b6c724488ac'), finalize=True)