diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out b/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out
deleted file mode 100644
index d2a717dc26a5a2da784922af0c4f6cc9e1750a48..0000000000000000000000000000000000000000
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out
+++ /dev/null
@@ -1,3 +0,0 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/fail.tz]
-
-{ parameter unit ; storage unit ; code { { UNIT ; FAILWITH } } }
diff --git a/tests_python/tests_015/test_contract_macros.py b/tests_python/tests_015/test_contract_macros.py
deleted file mode 100644
index 354d0cd6a993a597bf319161a6ca38a65e48af7f..0000000000000000000000000000000000000000
--- a/tests_python/tests_015/test_contract_macros.py
+++ /dev/null
@@ -1,447 +0,0 @@
-import pytest
-from tools.utils import (
-    assert_run_script_failwith,
-    assert_transfer_failwith,
-    bake,
-    assert_storage_contains,
-)
-from tools.client_regression import ClientRegression
-from client.client import Client
-from .contract_paths import (
-    find_script,
-    find_script_by_name,
-    all_contracts,
-    init_with_transfer,
-)
-
-
-@pytest.mark.contract
-class TestContractMacros:
-    """Tests for contracts using macros that do not require origination."""
-
-    @pytest.mark.parametrize(
-        "contract,param,storage,expected",
-        [  # FORMAT: assert_output contract_file storage input expected_result
-            # Build list
-            ('build_list', '{}', '0', '{ 0 }'),
-            ('build_list', '{}', '3', '{ 0 ; 1 ; 2 ; 3 }'),
-            (
-                'build_list',
-                '{}',
-                '10',
-                '{ 0 ; 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 }',
-            ),
-            # Find maximum int in list -- returns None if not found
-            ('max_in_list', 'None', '{}', 'None'),
-            ('max_in_list', 'None', '{ 1 }', '(Some 1)'),
-            ('max_in_list', 'None', '{ -1 }', '(Some -1)'),
-            (
-                'max_in_list',
-                'None',
-                '{ 10 ; -1 ; -20 ; 100 ; 0 }',
-                '(Some 100)',
-            ),
-            (
-                'max_in_list',
-                'None',
-                '{ 10 ; -1 ; -20 ; 100 ; 0 }',
-                '(Some 100)',
-            ),
-            (
-                'max_in_list',
-                'None',
-                '{ -10 ; -1 ; -20 ; -100 }',
-                '(Some -1)',
-            ),
-            # Test comparisons on tez { EQ ; GT ; LT ; GE ; LE }
-            (
-                'compare',
-                '{}',
-                '(Pair 1000000 2000000)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare',
-                '{}',
-                '(Pair 2000000 1000000)',
-                '{ False ; True ; False ; True ; False }',
-            ),
-            (
-                'compare',
-                '{}',
-                '(Pair 2370000 2370000)',
-                '{ True ; False ; False ; True ; True }',
-            ),
-            # Test ASSERT
-            ('assert', 'Unit', 'True', 'Unit'),
-            # ASSERT_{OP}
-            ('assert_eq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_eq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_neq', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_lt', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_le', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_le', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_gt', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_ge', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_ge', 'Unit', '(Pair 0 -1)', 'Unit'),
-            # ASSERT_CMP{OP}
-            ('assert_cmpeq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_cmpneq', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmplt', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_cmple', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_cmple', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_cmpgt', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmpge', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmpge', 'Unit', '(Pair 0 0)', 'Unit'),
-            # Tests the SET_CAR and SET_CDR instructions
-            (
-                'set_caddaadr',
-                '(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)',
-                '3000000',
-                '(Pair (Pair 1 2 (Pair (Pair 3 3000000) 4) 5) 6)',
-            ),
-            (
-                'map_caddaadr',
-                '(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)',
-                'Unit',
-                '(Pair (Pair 1 2 (Pair (Pair 3 1000000) 4) 5) 6)',
-            ),
-            # Test comparisons on bytes { EQ ; GT ; LT ; GE ; LE }
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x34)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x33aa)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x33)',
-                '{ True ; False ; False ; True ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x34 0x33)',
-                '{ False ; True ; False ; True ; False }',
-            ),
-        ],
-    )
-    def test_contract_input_output(
-        self,
-        client: Client,
-        contract: str,
-        param: str,
-        storage: str,
-        expected: str,
-    ):
-        contract = find_script(['macros', contract])
-        run_script_res = client.run_script(contract, param, storage)
-        assert run_script_res.storage == expected
-
-    @pytest.mark.parametrize(
-        "contract,param,storage",
-        [  # FORMAT: assert_output contract_file storage input expected_result
-            ('assert', 'Unit', 'False'),
-            ('assert_eq', 'Unit', '(Pair 0 -1)'),
-            ('assert_eq', 'Unit', '(Pair 0 -1)'),
-            ('assert_neq', 'Unit', '(Pair -1 -1)'),
-            ('assert_lt', 'Unit', '(Pair 0 -1)'),
-            ('assert_lt', 'Unit', '(Pair 0 0)'),
-            ('assert_le', 'Unit', '(Pair 0 -1)'),
-            ('assert_gt', 'Unit', '(Pair -1 0)'),
-            ('assert_gt', 'Unit', '(Pair 0 0)'),
-            ('assert_ge', 'Unit', '(Pair -1 0)'),
-            ('assert_cmpeq', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmpneq', 'Unit', '(Pair -1 -1)'),
-            ('assert_cmplt', 'Unit', '(Pair 0 0)'),
-            ('assert_cmplt', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmple', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmpgt', 'Unit', '(Pair 0 0)'),
-            ('assert_cmpgt', 'Unit', '(Pair -1 0)'),
-            ('assert_cmpge', 'Unit', '(Pair -1 0)'),
-        ],
-    )
-    def test_contract_failures(self, client: Client, contract, param, storage):
-        contract = find_script(['macros', contract])
-        assert_run_script_failwith(client, contract, param, storage)
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestGuestBook:
-    """Test on the guestbook contract."""
-
-    def test_guestbook(self, client: Client):
-        contract = ['macros', 'guestbook']
-
-        init_with_transfer(
-            client,
-            contract,
-            '{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" None }',
-            100,
-            'bootstrap1',
-        )
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap2',
-            'guestbook',
-            ['--arg', '"Pas moi"', '--burn-cap', '10'],
-        )
-
-        client.transfer(
-            0,
-            'bootstrap1',
-            'guestbook',
-            ['-arg', '"Coucou"', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_storage_contains(
-            client,
-            'guestbook',
-            '{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" (Some "Coucou") }',
-        )
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap3',
-            'guestbook',
-            ['--arg', '"Pas moi non plus"', '--burn-cap', '10'],
-        )
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap1',
-            'guestbook',
-            ['--arg', '"Recoucou ?"', '--burn-cap', '10'],
-        )
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestBigmap:
-    """Tests on the big_map_mem contract."""
-
-    def test_bigmap(self, client: Client):
-        contract = ['macros', 'big_map_mem']
-
-        init_with_transfer(
-            client,
-            contract,
-            '(Pair { Elt 1 Unit ; Elt 2 Unit ; Elt 3 Unit } Unit)',
-            100,
-            'bootstrap1',
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['-arg', '(Pair 0 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 True)', '--burn-cap', '10'],
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 True)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 1 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 1 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 2 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 2 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 3 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 3 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 4 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 4 True)', '--burn-cap', '10'],
-        )
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestBigmapGetAdd:
-    """Tests on the big_map_get_add contract."""
-
-    def test_bigmap(self, client: Client):
-        contract = ['macros', 'big_map_get_add']
-
-        init_with_transfer(
-            client,
-            contract,
-            '(Pair { Elt 0 1 ; Elt 1 2 ; Elt 2 3 } Unit)',
-            100,
-            'bootstrap1',
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 (Some 2)) (Pair 200 (Some 2)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 None) (Pair 200 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 None) (Pair 300 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 1 None) (Pair 200 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 1 (Some 2)) (Pair 0 (Some 1)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 400 (Some 1232)) (Pair 400 (Some 1232)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 401 (Some 0)) (Pair 400 (Some 1232)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-
-
-@pytest.mark.regression
-class TestMacroExpansion:
-    """Test expanding macros"""
-
-    @pytest.mark.parametrize("contract", all_contracts(['macros']))
-    def test_macro_expansion(
-        self, client_regtest: ClientRegression, contract: str
-    ):
-        """This test expands macros in all macro test contracts, with
-        regression detection enabled. This test should fail if the definition
-        of any macros change.
-        """
-        client_regtest.expand_macros(find_script_by_name(contract))
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out b/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out
deleted file mode 100644
index 97baba6bf814751a7da07932cef9eca8bfb85f12..0000000000000000000000000000000000000000
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out
+++ /dev/null
@@ -1,3 +0,0 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/fail.tz]
-
-{ parameter unit ; storage unit ; code { { UNIT ; FAILWITH } } }
diff --git a/tests_python/tests_016/test_contract_macros.py b/tests_python/tests_016/test_contract_macros.py
deleted file mode 100644
index 354d0cd6a993a597bf319161a6ca38a65e48af7f..0000000000000000000000000000000000000000
--- a/tests_python/tests_016/test_contract_macros.py
+++ /dev/null
@@ -1,447 +0,0 @@
-import pytest
-from tools.utils import (
-    assert_run_script_failwith,
-    assert_transfer_failwith,
-    bake,
-    assert_storage_contains,
-)
-from tools.client_regression import ClientRegression
-from client.client import Client
-from .contract_paths import (
-    find_script,
-    find_script_by_name,
-    all_contracts,
-    init_with_transfer,
-)
-
-
-@pytest.mark.contract
-class TestContractMacros:
-    """Tests for contracts using macros that do not require origination."""
-
-    @pytest.mark.parametrize(
-        "contract,param,storage,expected",
-        [  # FORMAT: assert_output contract_file storage input expected_result
-            # Build list
-            ('build_list', '{}', '0', '{ 0 }'),
-            ('build_list', '{}', '3', '{ 0 ; 1 ; 2 ; 3 }'),
-            (
-                'build_list',
-                '{}',
-                '10',
-                '{ 0 ; 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 }',
-            ),
-            # Find maximum int in list -- returns None if not found
-            ('max_in_list', 'None', '{}', 'None'),
-            ('max_in_list', 'None', '{ 1 }', '(Some 1)'),
-            ('max_in_list', 'None', '{ -1 }', '(Some -1)'),
-            (
-                'max_in_list',
-                'None',
-                '{ 10 ; -1 ; -20 ; 100 ; 0 }',
-                '(Some 100)',
-            ),
-            (
-                'max_in_list',
-                'None',
-                '{ 10 ; -1 ; -20 ; 100 ; 0 }',
-                '(Some 100)',
-            ),
-            (
-                'max_in_list',
-                'None',
-                '{ -10 ; -1 ; -20 ; -100 }',
-                '(Some -1)',
-            ),
-            # Test comparisons on tez { EQ ; GT ; LT ; GE ; LE }
-            (
-                'compare',
-                '{}',
-                '(Pair 1000000 2000000)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare',
-                '{}',
-                '(Pair 2000000 1000000)',
-                '{ False ; True ; False ; True ; False }',
-            ),
-            (
-                'compare',
-                '{}',
-                '(Pair 2370000 2370000)',
-                '{ True ; False ; False ; True ; True }',
-            ),
-            # Test ASSERT
-            ('assert', 'Unit', 'True', 'Unit'),
-            # ASSERT_{OP}
-            ('assert_eq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_eq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_neq', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_lt', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_le', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_le', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_gt', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_ge', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_ge', 'Unit', '(Pair 0 -1)', 'Unit'),
-            # ASSERT_CMP{OP}
-            ('assert_cmpeq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_cmpneq', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmplt', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_cmple', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_cmple', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_cmpgt', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmpge', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmpge', 'Unit', '(Pair 0 0)', 'Unit'),
-            # Tests the SET_CAR and SET_CDR instructions
-            (
-                'set_caddaadr',
-                '(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)',
-                '3000000',
-                '(Pair (Pair 1 2 (Pair (Pair 3 3000000) 4) 5) 6)',
-            ),
-            (
-                'map_caddaadr',
-                '(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)',
-                'Unit',
-                '(Pair (Pair 1 2 (Pair (Pair 3 1000000) 4) 5) 6)',
-            ),
-            # Test comparisons on bytes { EQ ; GT ; LT ; GE ; LE }
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x34)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x33aa)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x33)',
-                '{ True ; False ; False ; True ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x34 0x33)',
-                '{ False ; True ; False ; True ; False }',
-            ),
-        ],
-    )
-    def test_contract_input_output(
-        self,
-        client: Client,
-        contract: str,
-        param: str,
-        storage: str,
-        expected: str,
-    ):
-        contract = find_script(['macros', contract])
-        run_script_res = client.run_script(contract, param, storage)
-        assert run_script_res.storage == expected
-
-    @pytest.mark.parametrize(
-        "contract,param,storage",
-        [  # FORMAT: assert_output contract_file storage input expected_result
-            ('assert', 'Unit', 'False'),
-            ('assert_eq', 'Unit', '(Pair 0 -1)'),
-            ('assert_eq', 'Unit', '(Pair 0 -1)'),
-            ('assert_neq', 'Unit', '(Pair -1 -1)'),
-            ('assert_lt', 'Unit', '(Pair 0 -1)'),
-            ('assert_lt', 'Unit', '(Pair 0 0)'),
-            ('assert_le', 'Unit', '(Pair 0 -1)'),
-            ('assert_gt', 'Unit', '(Pair -1 0)'),
-            ('assert_gt', 'Unit', '(Pair 0 0)'),
-            ('assert_ge', 'Unit', '(Pair -1 0)'),
-            ('assert_cmpeq', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmpneq', 'Unit', '(Pair -1 -1)'),
-            ('assert_cmplt', 'Unit', '(Pair 0 0)'),
-            ('assert_cmplt', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmple', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmpgt', 'Unit', '(Pair 0 0)'),
-            ('assert_cmpgt', 'Unit', '(Pair -1 0)'),
-            ('assert_cmpge', 'Unit', '(Pair -1 0)'),
-        ],
-    )
-    def test_contract_failures(self, client: Client, contract, param, storage):
-        contract = find_script(['macros', contract])
-        assert_run_script_failwith(client, contract, param, storage)
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestGuestBook:
-    """Test on the guestbook contract."""
-
-    def test_guestbook(self, client: Client):
-        contract = ['macros', 'guestbook']
-
-        init_with_transfer(
-            client,
-            contract,
-            '{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" None }',
-            100,
-            'bootstrap1',
-        )
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap2',
-            'guestbook',
-            ['--arg', '"Pas moi"', '--burn-cap', '10'],
-        )
-
-        client.transfer(
-            0,
-            'bootstrap1',
-            'guestbook',
-            ['-arg', '"Coucou"', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_storage_contains(
-            client,
-            'guestbook',
-            '{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" (Some "Coucou") }',
-        )
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap3',
-            'guestbook',
-            ['--arg', '"Pas moi non plus"', '--burn-cap', '10'],
-        )
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap1',
-            'guestbook',
-            ['--arg', '"Recoucou ?"', '--burn-cap', '10'],
-        )
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestBigmap:
-    """Tests on the big_map_mem contract."""
-
-    def test_bigmap(self, client: Client):
-        contract = ['macros', 'big_map_mem']
-
-        init_with_transfer(
-            client,
-            contract,
-            '(Pair { Elt 1 Unit ; Elt 2 Unit ; Elt 3 Unit } Unit)',
-            100,
-            'bootstrap1',
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['-arg', '(Pair 0 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 True)', '--burn-cap', '10'],
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 True)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 1 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 1 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 2 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 2 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 3 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 3 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 4 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 4 True)', '--burn-cap', '10'],
-        )
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestBigmapGetAdd:
-    """Tests on the big_map_get_add contract."""
-
-    def test_bigmap(self, client: Client):
-        contract = ['macros', 'big_map_get_add']
-
-        init_with_transfer(
-            client,
-            contract,
-            '(Pair { Elt 0 1 ; Elt 1 2 ; Elt 2 3 } Unit)',
-            100,
-            'bootstrap1',
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 (Some 2)) (Pair 200 (Some 2)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 None) (Pair 200 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 None) (Pair 300 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 1 None) (Pair 200 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 1 (Some 2)) (Pair 0 (Some 1)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 400 (Some 1232)) (Pair 400 (Some 1232)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 401 (Some 0)) (Pair 400 (Some 1232)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-
-
-@pytest.mark.regression
-class TestMacroExpansion:
-    """Test expanding macros"""
-
-    @pytest.mark.parametrize("contract", all_contracts(['macros']))
-    def test_macro_expansion(
-        self, client_regtest: ClientRegression, contract: str
-    ):
-        """This test expands macros in all macro test contracts, with
-        regression detection enabled. This test should fail if the definition
-        of any macros change.
-        """
-        client_regtest.expand_macros(find_script_by_name(contract))
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out
deleted file mode 100644
index 93da32c9827550c381feb7bca89f840bc4cd30ea..0000000000000000000000000000000000000000
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--fail.tz].out
+++ /dev/null
@@ -1,3 +0,0 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/fail.tz]
-
-{ parameter unit ; storage unit ; code { { UNIT ; FAILWITH } } }
diff --git a/tests_python/tests_alpha/test_contract_macros.py b/tests_python/tests_alpha/test_contract_macros.py
deleted file mode 100644
index 354d0cd6a993a597bf319161a6ca38a65e48af7f..0000000000000000000000000000000000000000
--- a/tests_python/tests_alpha/test_contract_macros.py
+++ /dev/null
@@ -1,447 +0,0 @@
-import pytest
-from tools.utils import (
-    assert_run_script_failwith,
-    assert_transfer_failwith,
-    bake,
-    assert_storage_contains,
-)
-from tools.client_regression import ClientRegression
-from client.client import Client
-from .contract_paths import (
-    find_script,
-    find_script_by_name,
-    all_contracts,
-    init_with_transfer,
-)
-
-
-@pytest.mark.contract
-class TestContractMacros:
-    """Tests for contracts using macros that do not require origination."""
-
-    @pytest.mark.parametrize(
-        "contract,param,storage,expected",
-        [  # FORMAT: assert_output contract_file storage input expected_result
-            # Build list
-            ('build_list', '{}', '0', '{ 0 }'),
-            ('build_list', '{}', '3', '{ 0 ; 1 ; 2 ; 3 }'),
-            (
-                'build_list',
-                '{}',
-                '10',
-                '{ 0 ; 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 }',
-            ),
-            # Find maximum int in list -- returns None if not found
-            ('max_in_list', 'None', '{}', 'None'),
-            ('max_in_list', 'None', '{ 1 }', '(Some 1)'),
-            ('max_in_list', 'None', '{ -1 }', '(Some -1)'),
-            (
-                'max_in_list',
-                'None',
-                '{ 10 ; -1 ; -20 ; 100 ; 0 }',
-                '(Some 100)',
-            ),
-            (
-                'max_in_list',
-                'None',
-                '{ 10 ; -1 ; -20 ; 100 ; 0 }',
-                '(Some 100)',
-            ),
-            (
-                'max_in_list',
-                'None',
-                '{ -10 ; -1 ; -20 ; -100 }',
-                '(Some -1)',
-            ),
-            # Test comparisons on tez { EQ ; GT ; LT ; GE ; LE }
-            (
-                'compare',
-                '{}',
-                '(Pair 1000000 2000000)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare',
-                '{}',
-                '(Pair 2000000 1000000)',
-                '{ False ; True ; False ; True ; False }',
-            ),
-            (
-                'compare',
-                '{}',
-                '(Pair 2370000 2370000)',
-                '{ True ; False ; False ; True ; True }',
-            ),
-            # Test ASSERT
-            ('assert', 'Unit', 'True', 'Unit'),
-            # ASSERT_{OP}
-            ('assert_eq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_eq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_neq', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_lt', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_le', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_le', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_gt', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_ge', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_ge', 'Unit', '(Pair 0 -1)', 'Unit'),
-            # ASSERT_CMP{OP}
-            ('assert_cmpeq', 'Unit', '(Pair -1 -1)', 'Unit'),
-            ('assert_cmpneq', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmplt', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_cmple', 'Unit', '(Pair -1 0)', 'Unit'),
-            ('assert_cmple', 'Unit', '(Pair 0 0)', 'Unit'),
-            ('assert_cmpgt', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmpge', 'Unit', '(Pair 0 -1)', 'Unit'),
-            ('assert_cmpge', 'Unit', '(Pair 0 0)', 'Unit'),
-            # Tests the SET_CAR and SET_CDR instructions
-            (
-                'set_caddaadr',
-                '(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)',
-                '3000000',
-                '(Pair (Pair 1 2 (Pair (Pair 3 3000000) 4) 5) 6)',
-            ),
-            (
-                'map_caddaadr',
-                '(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)',
-                'Unit',
-                '(Pair (Pair 1 2 (Pair (Pair 3 1000000) 4) 5) 6)',
-            ),
-            # Test comparisons on bytes { EQ ; GT ; LT ; GE ; LE }
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x34)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x33aa)',
-                '{ False ; False ; True ; False ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x33 0x33)',
-                '{ True ; False ; False ; True ; True }',
-            ),
-            (
-                'compare_bytes',
-                '{}',
-                '(Pair 0x34 0x33)',
-                '{ False ; True ; False ; True ; False }',
-            ),
-        ],
-    )
-    def test_contract_input_output(
-        self,
-        client: Client,
-        contract: str,
-        param: str,
-        storage: str,
-        expected: str,
-    ):
-        contract = find_script(['macros', contract])
-        run_script_res = client.run_script(contract, param, storage)
-        assert run_script_res.storage == expected
-
-    @pytest.mark.parametrize(
-        "contract,param,storage",
-        [  # FORMAT: assert_output contract_file storage input expected_result
-            ('assert', 'Unit', 'False'),
-            ('assert_eq', 'Unit', '(Pair 0 -1)'),
-            ('assert_eq', 'Unit', '(Pair 0 -1)'),
-            ('assert_neq', 'Unit', '(Pair -1 -1)'),
-            ('assert_lt', 'Unit', '(Pair 0 -1)'),
-            ('assert_lt', 'Unit', '(Pair 0 0)'),
-            ('assert_le', 'Unit', '(Pair 0 -1)'),
-            ('assert_gt', 'Unit', '(Pair -1 0)'),
-            ('assert_gt', 'Unit', '(Pair 0 0)'),
-            ('assert_ge', 'Unit', '(Pair -1 0)'),
-            ('assert_cmpeq', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmpneq', 'Unit', '(Pair -1 -1)'),
-            ('assert_cmplt', 'Unit', '(Pair 0 0)'),
-            ('assert_cmplt', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmple', 'Unit', '(Pair 0 -1)'),
-            ('assert_cmpgt', 'Unit', '(Pair 0 0)'),
-            ('assert_cmpgt', 'Unit', '(Pair -1 0)'),
-            ('assert_cmpge', 'Unit', '(Pair -1 0)'),
-        ],
-    )
-    def test_contract_failures(self, client: Client, contract, param, storage):
-        contract = find_script(['macros', contract])
-        assert_run_script_failwith(client, contract, param, storage)
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestGuestBook:
-    """Test on the guestbook contract."""
-
-    def test_guestbook(self, client: Client):
-        contract = ['macros', 'guestbook']
-
-        init_with_transfer(
-            client,
-            contract,
-            '{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" None }',
-            100,
-            'bootstrap1',
-        )
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap2',
-            'guestbook',
-            ['--arg', '"Pas moi"', '--burn-cap', '10'],
-        )
-
-        client.transfer(
-            0,
-            'bootstrap1',
-            'guestbook',
-            ['-arg', '"Coucou"', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_storage_contains(
-            client,
-            'guestbook',
-            '{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" (Some "Coucou") }',
-        )
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap3',
-            'guestbook',
-            ['--arg', '"Pas moi non plus"', '--burn-cap', '10'],
-        )
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap1',
-            'guestbook',
-            ['--arg', '"Recoucou ?"', '--burn-cap', '10'],
-        )
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestBigmap:
-    """Tests on the big_map_mem contract."""
-
-    def test_bigmap(self, client: Client):
-        contract = ['macros', 'big_map_mem']
-
-        init_with_transfer(
-            client,
-            contract,
-            '(Pair { Elt 1 Unit ; Elt 2 Unit ; Elt 3 Unit } Unit)',
-            100,
-            'bootstrap1',
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['-arg', '(Pair 0 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-
-        assert_transfer_failwith(
-            client,
-            0,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 True)', '--burn-cap', '10'],
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 0 True)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 1 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 1 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 2 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 2 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 3 True)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 3 False)', '--burn-cap', '10'],
-        )
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 4 False)', '--burn-cap', '10'],
-        )
-        bake(client)
-        assert_transfer_failwith(
-            client,
-            1,
-            'bootstrap1',
-            'big_map_mem',
-            ['--arg', '(Pair 4 True)', '--burn-cap', '10'],
-        )
-
-
-@pytest.mark.slow
-@pytest.mark.contract
-class TestBigmapGetAdd:
-    """Tests on the big_map_get_add contract."""
-
-    def test_bigmap(self, client: Client):
-        contract = ['macros', 'big_map_get_add']
-
-        init_with_transfer(
-            client,
-            contract,
-            '(Pair { Elt 0 1 ; Elt 1 2 ; Elt 2 3 } Unit)',
-            100,
-            'bootstrap1',
-        )
-
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 (Some 2)) (Pair 200 (Some 2)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 None) (Pair 200 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 200 None) (Pair 300 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 1 None) (Pair 200 None))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 1 (Some 2)) (Pair 0 (Some 1)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 400 (Some 1232)) (Pair 400 (Some 1232)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-        client.transfer(
-            1,
-            'bootstrap1',
-            'big_map_get_add',
-            [
-                '--arg',
-                '(Pair (Pair 401 (Some 0)) (Pair 400 (Some 1232)))',
-                '--burn-cap',
-                '10',
-            ],
-        )
-        bake(client)
-
-
-@pytest.mark.regression
-class TestMacroExpansion:
-    """Test expanding macros"""
-
-    @pytest.mark.parametrize("contract", all_contracts(['macros']))
-    def test_macro_expansion(
-        self, client_regtest: ClientRegression, contract: str
-    ):
-        """This test expands macros in all macro test contracts, with
-        regression detection enabled. This test should fail if the definition
-        of any macros change.
-        """
-        client_regtest.expand_macros(find_script_by_name(contract))
diff --git a/tezt/lib_tezos/client.ml b/tezt/lib_tezos/client.ml
index 80623d17c188b24a1b917db540a4767e564ff226..67a24e01c88744e9c340747c9001f4964addbf23 100644
--- a/tezt/lib_tezos/client.ml
+++ b/tezt/lib_tezos/client.ml
@@ -164,7 +164,7 @@ let mode_arg client =
 
 let spawn_command ?log_command ?log_status_on_exit ?log_output
     ?(env = String_map.empty) ?endpoint ?hooks ?(admin = false) ?protocol_hash
-    ?config_file client command =
+    ?config_file ?(no_base_dir_warnings = false) client command =
   let env =
     (* Set disclaimer to "Y" if unspecified, otherwise use given value *)
     String_map.update
@@ -174,6 +174,9 @@ let spawn_command ?log_command ?log_status_on_exit ?log_output
   in
   let protocol_arg = optional_arg "protocol" Fun.id protocol_hash in
   let config_file_arg = optional_arg "config-file" Fun.id config_file in
+  let no_base_dir_warnings_arg =
+    optional_switch "no-base-dir-warnings" no_base_dir_warnings
+  in
   Process.spawn
     ?runner:client.runner
     ~name:client.name
@@ -186,7 +189,7 @@ let spawn_command ?log_command ?log_status_on_exit ?log_output
     (if admin then client.admin_path else client.path)
   @@ endpoint_arg ?endpoint client
   @ protocol_arg @ media_type_arg client.mode @ mode_arg client
-  @ base_dir_arg client @ config_file_arg @ command
+  @ base_dir_arg client @ config_file_arg @ no_base_dir_warnings_arg @ command
 
 let spawn_command_with_stdin ?log_command ?log_status_on_exit ?log_output
     ?(env = String_map.empty) ?endpoint ?hooks ?(admin = false) ?protocol_hash
@@ -1578,12 +1581,11 @@ let stresstest ?endpoint ?source_aliases ?source_pkhs ?source_accounts ?seed
     client
   |> Process.check
 
-let spawn_run_script ?hooks ?protocol_hash ?(no_base_dir_warnings = false)
-    ?balance ?self_address ?source ?payer ?gas ?(trace_stack = false) ?level
-    ~prg ~storage ~input client =
-  spawn_command ?hooks ?protocol_hash client
-  @@ optional_switch "no-base-dir-warnings" no_base_dir_warnings
-  @ ["run"; "script"; prg; "on"; "storage"; storage; "and"; "input"; input]
+let spawn_run_script ?hooks ?protocol_hash ?no_base_dir_warnings ?balance
+    ?self_address ?source ?payer ?gas ?(trace_stack = false) ?level ~prg
+    ~storage ~input client =
+  spawn_command ?hooks ?protocol_hash ?no_base_dir_warnings client
+  @@ ["run"; "script"; prg; "on"; "storage"; storage; "and"; "input"; input]
   @ optional_arg "payer" Fun.id payer
   @ optional_arg "source" Fun.id source
   @ optional_arg "balance" Tez.to_string balance
@@ -1592,13 +1594,14 @@ let spawn_run_script ?hooks ?protocol_hash ?(no_base_dir_warnings = false)
   @ optional_arg "level" string_of_int level
   @ optional_switch "trace-stack" trace_stack
 
-let spawn_run_script_at ?hooks ?balance ?self_address ?source ?payer ?prefix
-    ~storage ~input client script_name protocol =
+let spawn_run_script_at ?hooks ?protocol_hash ?balance ?self_address ?source
+    ?payer ?prefix ~storage ~input client script_name protocol =
   let prg =
     Michelson_script.find ?prefix script_name protocol |> Michelson_script.path
   in
   spawn_run_script
     ?hooks
+    ?protocol_hash
     ?balance
     ?self_address
     ?source
@@ -1680,13 +1683,14 @@ let run_script ?hooks ?protocol_hash ?no_base_dir_warnings ?balance
         "Cannot extract new storage from client_output: %s"
         client_output
 
-let run_script_at ?hooks ?balance ?self_address ?source ?payer ?prefix ~storage
-    ~input client name protocol =
+let run_script_at ?hooks ?protocol_hash ?balance ?self_address ?source ?payer
+    ?prefix ~storage ~input client name protocol =
   let prg =
     Michelson_script.find name ?prefix protocol |> Michelson_script.path
   in
   run_script
     ?hooks
+    ?protocol_hash
     ?balance
     ?self_address
     ?source
@@ -1843,15 +1847,14 @@ let normalize_type ?hooks ~typ client =
 let typecheck_data ~data ~typ ?gas ?(legacy = false) client =
   spawn_typecheck_data ~data ~typ ?gas ~legacy client |> Process.check
 
-let spawn_typecheck_script ?hooks ?protocol_hash ~script
-    ?(no_base_dir_warnings = false) ?(details = false) ?(emacs = false)
-    ?(no_print_source = false) ?gas ?(legacy = false) client =
+let spawn_typecheck_script ?hooks ?protocol_hash ~script ?no_base_dir_warnings
+    ?(details = false) ?(emacs = false) ?(no_print_source = false) ?gas
+    ?(legacy = false) client =
   let gas_cmd =
     Option.map Int.to_string gas |> Option.map (fun g -> ["--gas"; g])
   in
-  spawn_command ?hooks ?protocol_hash client
-  @@ optional_switch "no-base-dir-warnings" no_base_dir_warnings
-  @ ["typecheck"; "script"; script]
+  spawn_command ?hooks ?protocol_hash ?no_base_dir_warnings client
+  @@ ["typecheck"; "script"; script]
   @ Option.value ~default:[] gas_cmd
   @ (if details then ["--details"] else [])
   @ (if emacs then ["--emacs"] else [])
@@ -3940,3 +3943,19 @@ let prepare_multisig_transaction_set_threshold_and_public_keys ~multisig
     |> Process.check_and_read_stdout
   in
   return (String.trim client_output)
+
+let spawn_expand_macros ?endpoint ?hooks ?protocol_hash ?no_base_dir_warnings
+    client path =
+  spawn_command ?endpoint ?hooks ?protocol_hash ?no_base_dir_warnings client
+  @@ ["expand"; "macros"; "in"; path]
+
+let expand_macros ?endpoint ?hooks ?protocol_hash ?no_base_dir_warnings client
+    path =
+  spawn_expand_macros
+    ?endpoint
+    ?hooks
+    ?protocol_hash
+    ?no_base_dir_warnings
+    client
+    path
+  |> Process.check_and_read_stdout
diff --git a/tezt/lib_tezos/client.mli b/tezt/lib_tezos/client.mli
index 9e0c51318e8fe32ff47278f187c86bff849d9189..5f829a727b6f62ba962afe531becccfbf7b71e2f 100644
--- a/tezt/lib_tezos/client.mli
+++ b/tezt/lib_tezos/client.mli
@@ -1283,6 +1283,7 @@ val spawn_run_script :
     Fails if the new storage cannot be extracted from the output. *)
 val run_script_at :
   ?hooks:Process.hooks ->
+  ?protocol_hash:string ->
   ?balance:Tez.t ->
   ?self_address:string ->
   ?source:string ->
@@ -1298,6 +1299,7 @@ val run_script_at :
 (** Same as [run_script_at] but do not wait for the process to exit. *)
 val spawn_run_script_at :
   ?hooks:Process.hooks ->
+  ?protocol_hash:string ->
   ?balance:Tez.t ->
   ?self_address:string ->
   ?source:string ->
@@ -2370,6 +2372,7 @@ val spawn_command :
   ?admin:bool ->
   ?protocol_hash:string ->
   ?config_file:string ->
+  ?no_base_dir_warnings:bool ->
   t ->
   string list ->
   Process.t
@@ -2836,3 +2839,23 @@ val spawn_prepare_multisig_transaction_set_threshold_and_public_keys :
   ?bytes_only:bool ->
   t ->
   Process.t
+
+(** Run [tezos-client expand macros in <script>]. *)
+val expand_macros :
+  ?endpoint:endpoint ->
+  ?hooks:Process_hooks.t ->
+  ?protocol_hash:string ->
+  ?no_base_dir_warnings:bool ->
+  t ->
+  string ->
+  string Lwt.t
+
+(** Same as [expand_macros], but do not wait for the process to exit. *)
+val spawn_expand_macros :
+  ?endpoint:endpoint ->
+  ?hooks:Process_hooks.t ->
+  ?protocol_hash:string ->
+  ?no_base_dir_warnings:bool ->
+  t ->
+  string ->
+  Process.t
diff --git a/tezt/lib_tezos/michelson_script.ml b/tezt/lib_tezos/michelson_script.ml
index 0fd860cf7a2c39fc757e410071ac913ce2ce4d2a..8eea2b95cdce3a0b6e64cf9484dece1c0f8fb169 100644
--- a/tezt/lib_tezos/michelson_script.ml
+++ b/tezt/lib_tezos/michelson_script.ml
@@ -309,6 +309,9 @@ let whitelist dirs ts =
   |> List.filter @@ fun (t : t) ->
      List.exists (fun dir -> List.equal String.equal dir t.dirname) dirs
 
+let find_all_in ?prefix ?maxdepth protocol dirs =
+  find_all ?prefix ?maxdepth protocol |> whitelist [dirs]
+
 let find_all_legacy ?prefix ?maxdepth protocol =
   find_all ?prefix ?maxdepth protocol |> whitelist [["legacy"]]
 
diff --git a/tezt/lib_tezos/michelson_script.mli b/tezt/lib_tezos/michelson_script.mli
index b30149ea199b32e24baf5ead436d8e1952efc818..26323013921e1ecd0b21f495e8f88aefa8feeedf 100644
--- a/tezt/lib_tezos/michelson_script.mli
+++ b/tezt/lib_tezos/michelson_script.mli
@@ -87,7 +87,7 @@ val default_prefix : string
 val find : ?prefix:string -> ?maxdepth:int -> string list -> Protocol.t -> t
 
 (** [find_all ?prefix ?maxdepth protocol] returns all Michelson scripts for a given
-    protocol respecting [filter] up to a maxdepth [maxdepth]. Setting [~maxdepth:1]
+    protocol up to a maxdepth [maxdepth]. Setting [~maxdepth:1]
     is useful when you don't want to recurse into subdirectories.
     
     For instance, assume the following files exist:
@@ -115,6 +115,10 @@ val find_all_res :
   Protocol.t ->
   (t list, string * string) result
 
+(** [find_all_in protocol dirs] returns all scripts in the folders [dirs] for the given protocol. *)
+val find_all_in :
+  ?prefix:string -> ?maxdepth:int -> Protocol.t -> string list -> t list
+
 (** Returns all scripts in the [legacy] directory for the given protocol. *)
 val find_all_legacy : ?prefix:string -> ?maxdepth:int -> Protocol.t -> t list
 
diff --git a/tezt/tests/contract_macros.ml b/tezt/tests/contract_macros.ml
new file mode 100644
index 0000000000000000000000000000000000000000..a877d1e669ba8e12912fc028c83c2b21ef5b1e5b
--- /dev/null
+++ b/tezt/tests/contract_macros.ml
@@ -0,0 +1,328 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* Open Source License                                                       *)
+(* Copyright (c) 2020 Nomadic Labs <contact@nomadic-labs.com>                *)
+(*                                                                           *)
+(* Permission is hereby granted, free of charge, to any person obtaining a   *)
+(* copy of this software and associated documentation files (the "Software"),*)
+(* to deal in the Software without restriction, including without limitation *)
+(* the rights to use, copy, modify, merge, publish, distribute, sublicense,  *)
+(* and/or sell copies of the Software, and to permit persons to whom the     *)
+(* Software is furnished to do so, subject to the following conditions:      *)
+(*                                                                           *)
+(* The above copyright notice and this permission notice shall be included   *)
+(* in all copies or substantial portions of the Software.                    *)
+(*                                                                           *)
+(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*)
+(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,  *)
+(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL   *)
+(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*)
+(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING   *)
+(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER       *)
+(* DEALINGS IN THE SOFTWARE.                                                 *)
+(*                                                                           *)
+(*****************************************************************************)
+
+(* Testing
+   -------
+   Component:    Michelson
+   Invocation:   dune exec tezt/tests/main.exe -- --file contract_macros.ml
+   Subject:      Tests for contracts using macros that do not require origination.
+*)
+
+let test_macros_tests parameterization protocols =
+  Fun.flip List.iter parameterization
+  @@ fun (script, storage, input, expected) ->
+  ( Protocol.register_test
+      ~__FILE__
+      ~title:
+        (sf
+           "macros [%s--storage%d--input%d]"
+           script
+           (Hashtbl.hash storage)
+           (Hashtbl.hash input))
+      ~tags:["michelson"; "macros"]
+  @@ fun protocol ->
+    let client = Client.create_with_mode Mockup in
+    let* run_script_res_storage =
+      Client.run_script_at
+        ~protocol_hash:(Protocol.hash protocol)
+        ~storage
+        ~input
+        client
+        ["macros"; script]
+        protocol
+    in
+    let error_msg =
+      "Expected storage %R, got %L when executing"
+      ^ sf " %s with input %s and storage %s" script input storage
+    in
+    Check.((run_script_res_storage = expected) string ~__LOC__ ~error_msg) ;
+    unit )
+    protocols
+
+let test_macros_tests =
+  test_macros_tests
+    [
+      (* FORMAT: contract_file storage input expected_result *)
+      ("build_list", "{}", "0", "{ 0 }");
+      ("build_list", "{}", "3", "{ 0 ; 1 ; 2 ; 3 }");
+      ( "build_list",
+        "{}",
+        "10",
+        "{ 0 ; 1 ; 2 ; 3 ; 4 ; 5 ; 6 ; 7 ; 8 ; 9 ; 10 }" );
+      (* Find maximum int in list -- returns None if not found *)
+      ("max_in_list", "None", "{}", "None");
+      ("max_in_list", "None", "{ 1 }", "(Some 1)");
+      ("max_in_list", "None", "{ -1 }", "(Some -1)");
+      ("max_in_list", "None", "{ 10 ; -1 ; -20 ; 100 ; 0 }", "(Some 100)");
+      ("max_in_list", "None", "{ -10 ; -1 ; -20 ; -100 }", "(Some -1)");
+      (* Test comparisons on tez { EQ ; GT ; LT ; GE ; LE } *)
+      ( "compare",
+        "{}",
+        "(Pair 1000000 2000000)",
+        "{ False ; False ; True ; False ; True }" );
+      ( "compare",
+        "{}",
+        "(Pair 2000000 1000000)",
+        "{ False ; True ; False ; True ; False }" );
+      ( "compare",
+        "{}",
+        "(Pair 2370000 2370000)",
+        "{ True ; False ; False ; True ; True }" );
+      (* Test ASSERT *)
+      ("assert", "Unit", "True", "Unit");
+      (* ASSERT_{OP} *)
+      ("assert_eq", "Unit", "(Pair -1 -1)", "Unit");
+      ("assert_neq", "Unit", "(Pair 0 -1)", "Unit");
+      ("assert_lt", "Unit", "(Pair -1 0)", "Unit");
+      ("assert_le", "Unit", "(Pair 0 0)", "Unit");
+      ("assert_le", "Unit", "(Pair -1 0)", "Unit");
+      ("assert_gt", "Unit", "(Pair 0 -1)", "Unit");
+      ("assert_ge", "Unit", "(Pair 0 0)", "Unit");
+      ("assert_ge", "Unit", "(Pair 0 -1)", "Unit");
+      (* ASSERT_CMP{OP} *)
+      ("assert_cmpeq", "Unit", "(Pair -1 -1)", "Unit");
+      ("assert_cmpneq", "Unit", "(Pair 0 -1)", "Unit");
+      ("assert_cmplt", "Unit", "(Pair -1 0)", "Unit");
+      ("assert_cmple", "Unit", "(Pair -1 0)", "Unit");
+      ("assert_cmple", "Unit", "(Pair 0 0)", "Unit");
+      ("assert_cmpgt", "Unit", "(Pair 0 -1)", "Unit");
+      ("assert_cmpge", "Unit", "(Pair 0 -1)", "Unit");
+      ("assert_cmpge", "Unit", "(Pair 0 0)", "Unit");
+      (* Tests the SET_CAR and SET_CDR instructions *)
+      ( "set_caddaadr",
+        "(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)",
+        "3000000",
+        "(Pair (Pair 1 2 (Pair (Pair 3 3000000) 4) 5) 6)" );
+      ( "map_caddaadr",
+        "(Pair (Pair 1 2 (Pair (Pair 3 0) 4) 5) 6)",
+        "Unit",
+        "(Pair (Pair 1 2 (Pair (Pair 3 1000000) 4) 5) 6)" );
+      (* Test comparisons on bytes { EQ ; GT ; LT ; GE ; LE } *)
+      ( "compare_bytes",
+        "{}",
+        "(Pair 0x33 0x34)",
+        "{ False ; False ; True ; False ; True }" );
+      ( "compare_bytes",
+        "{}",
+        "(Pair 0x33 0x33aa)",
+        "{ False ; False ; True ; False ; True }" );
+      ( "compare_bytes",
+        "{}",
+        "(Pair 0x33 0x33)",
+        "{ True ; False ; False ; True ; True }" );
+      ( "compare_bytes",
+        "{}",
+        "(Pair 0x34 0x33)",
+        "{ False ; True ; False ; True ; False }" );
+    ]
+
+let check_script_failwith =
+  Process.check_error ~msg:(rex "script reached FAILWITH instruction")
+
+let test_macros_failures protocols =
+  List.iter
+    (fun (script, storage, input) ->
+      ( Protocol.register_test
+          ~__FILE__
+          ~title:
+            (sf
+               "macro failure [%s--storage%d--input%d]"
+               script
+               (Hashtbl.hash storage)
+               (Hashtbl.hash input))
+          ~tags:["michelson"; "macros"]
+      @@ fun protocol ->
+        let client = Client.create_with_mode Mockup in
+        Client.spawn_run_script_at
+          ~protocol_hash:(Protocol.hash protocol)
+          ~storage
+          ~input
+          client
+          ["macros"; script]
+          protocol
+        |> check_script_failwith )
+        protocols)
+    [
+      ("assert", "Unit", "False");
+      ("assert_eq", "Unit", "(Pair 0 -1)");
+      ("assert_neq", "Unit", "(Pair -1 -1)");
+      ("assert_lt", "Unit", "(Pair 0 -1)");
+      ("assert_lt", "Unit", "(Pair 0 0)");
+      ("assert_le", "Unit", "(Pair 0 -1)");
+      ("assert_gt", "Unit", "(Pair -1 0)");
+      ("assert_gt", "Unit", "(Pair 0 0)");
+      ("assert_ge", "Unit", "(Pair -1 0)");
+      ("assert_cmpeq", "Unit", "(Pair 0 -1)");
+      ("assert_cmpneq", "Unit", "(Pair -1 -1)");
+      ("assert_cmplt", "Unit", "(Pair 0 0)");
+      ("assert_cmplt", "Unit", "(Pair 0 -1)");
+      ("assert_cmple", "Unit", "(Pair 0 -1)");
+      ("assert_cmpgt", "Unit", "(Pair 0 0)");
+      ("assert_cmpgt", "Unit", "(Pair -1 0)");
+      ("assert_cmpge", "Unit", "(Pair -1 0)");
+    ]
+
+let transfer client ~receiver ?(giver = Constant.bootstrap1) arg =
+  {
+    value =
+      Client.spawn_transfer
+        client
+        ~burn_cap:Tez.one
+        ~giver:giver.alias
+        ~amount:Tez.zero
+        ~receiver
+        ~arg;
+    run = Process.check;
+  }
+
+let check_script_failwith {value; _} = check_script_failwith value
+
+let test_guestbook =
+  Protocol.register_test
+    ~__FILE__
+    ~title:"test guestbook.tz"
+    ~tags:["michelson"; "macros"]
+  @@ fun protocol ->
+  let* client = Client.init_mockup ~protocol () in
+  let* guestbook, _address =
+    Client.originate_contract_at
+      ~amount:(Tez.of_int 100)
+      ~src:Constant.bootstrap1.alias
+      ~init:{|{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" None }|}
+      ~burn_cap:Tez.one
+      client
+      ["macros"; "guestbook"]
+      protocol
+  in
+  let transfer = transfer client ~receiver:guestbook in
+  let* () =
+    transfer ~giver:Constant.bootstrap2 {|"Pas moi"|} |> check_script_failwith
+  in
+  let*! () = transfer ~giver:Constant.bootstrap1 {|"Coucou"|} in
+  let* storage = Client.contract_storage guestbook client in
+  Check.(
+    (String.trim storage
+   = {|{ Elt "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" (Some "Coucou") }|})
+      string
+      ~__LOC__
+      ~error_msg:"Expected guestbook storage %R, got %L") ;
+  let* () =
+    transfer ~giver:Constant.bootstrap3 {|"Pas moi non plus"|}
+    |> check_script_failwith
+  in
+  transfer ~giver:Constant.bootstrap1 {|"Recoucou ?"|} |> check_script_failwith
+
+let test_big_map =
+  Protocol.register_test
+    ~__FILE__
+    ~title:"test big_map"
+    ~tags:["michelson"; "macros"]
+  @@ fun protocol ->
+  let* client = Client.init_mockup ~protocol () in
+  let* big_map_contract, _address =
+    Client.originate_contract_at
+      ~amount:(Tez.of_int 100)
+      ~src:Constant.bootstrap1.alias
+      ~init:"(Pair { Elt 1 Unit ; Elt 2 Unit ; Elt 3 Unit } Unit)"
+      ~burn_cap:Tez.one
+      client
+      ["macros"; "big_map_mem"]
+      protocol
+  in
+  let transfer = transfer client ~receiver:big_map_contract in
+  let*! () = transfer "(Pair 0 False)" in
+  let* () = transfer "(Pair 0 True)" |> check_script_failwith in
+  let*! () = transfer "(Pair 1 True)" in
+  let* () = transfer "(Pair 1 False)" |> check_script_failwith in
+  let*! () = transfer "(Pair 2 True)" in
+  let* () = transfer "(Pair 2 False)" |> check_script_failwith in
+  let*! () = transfer "(Pair 3 True)" in
+  let* () = transfer "(Pair 3 False)" |> check_script_failwith in
+  let*! () = transfer "(Pair 4 False)" in
+  let* () = transfer "(Pair 4 True)" |> check_script_failwith in
+  unit
+
+let test_big_map_get_add =
+  Protocol.register_test
+    ~__FILE__
+    ~title:"test big_map_get_add"
+    ~tags:["michelson"; "macros"]
+  @@ fun protocol ->
+  let* client = Client.init_mockup ~protocol () in
+  let* big_map_contract, _address =
+    Client.originate_contract_at
+      ~amount:(Tez.of_int 100)
+      ~src:Constant.bootstrap1.alias
+      ~init:"(Pair { Elt 0 1 ; Elt 1 2 ; Elt 2 3 } Unit)"
+      ~burn_cap:Tez.one
+      client
+      ["macros"; "big_map_get_add"]
+      protocol
+  in
+  Lwt_list.iter_s
+    (fun parameter ->
+      Runnable.run @@ transfer client ~receiver:big_map_contract parameter)
+    [
+      "(Pair (Pair 200 (Some 2)) (Pair 200 (Some 2)))";
+      "(Pair (Pair 200 None) (Pair 200 None))";
+      "(Pair (Pair 200 None) (Pair 300 None))";
+      "(Pair (Pair 1 None) (Pair 200 None))";
+      "(Pair (Pair 1 (Some 2)) (Pair 0 (Some 1)))";
+      "(Pair (Pair 400 (Some 1232)) (Pair 400 (Some 1232)))";
+      "(Pair (Pair 401 (Some 0)) (Pair 400 (Some 1232)))";
+    ]
+
+let test_macro_expansion protocols =
+  List.iter
+    (fun protocol ->
+      List.iter
+        (fun script ->
+          Protocol.register_regression_test
+            ~__FILE__
+            ~title:(sf "Macro expansion: %s" (Michelson_script.name_s script))
+            ~tags:["michelson"; "macros"]
+            (fun protocol ->
+              let client = Client.create_with_mode Mockup in
+              let script_path = Michelson_script.path script in
+              let* (expansion : string) =
+                Client.expand_macros
+                  ~protocol_hash:(Protocol.hash protocol)
+                  ~no_base_dir_warnings:true
+                  client
+                  script_path
+              in
+              Regression.capture expansion ;
+              unit)
+            [protocol])
+        Michelson_script.(find_all_in protocol ["macros"]))
+    protocols
+
+let register ~protocols =
+  test_macros_tests protocols ;
+  test_macros_failures protocols ;
+  test_guestbook protocols ;
+  test_big_map protocols ;
+  test_big_map_get_add protocols ;
+  test_macro_expansion protocols
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert.out
similarity index 62%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert.out
index 38721472134e1ce9b7f96991dcbfb85848a7084b..5931ced0f2885671e35fb8e5eef4a192b65132e1 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert.tz]
-
 { parameter bool ;
   storage unit ;
   code { CAR ;
@@ -7,3 +5,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpeq.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpeq.out
index 55de4e2f4c9791ff902a98b9eff0f8f6c0ed9676..bbe353a76a189a98ae79ea6c49e66ff0e5a2e283 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpeq.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpeq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpge.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpge.out
index e722ff098362683ab0893cf6574a12cd27264d6c..d56c3a72c717f4409c4b5417ac0714b91eb3568c 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpge.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpge.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpgt.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpgt.out
index 2d05af7960b4b41d10e20257286ff4f22fceaf70..ad6419cc57afa115c55795729bef4ccadd719d9e 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpgt.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpgt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmple.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmple.out
index 302a34f9892b11f6a1ecbc009e96d6928ec87a98..80d82ea4eb1e955cb430ec30a56e2294962b640d 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmple.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmple.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmplt.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmplt.out
index 54745dd5c13a2775989f3c3140623f6dbdd1e319..a0b5c69b4c9055716e73873da5bb90a1a31954a8 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmplt.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmplt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpneq.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpneq.out
index c51bc95ac31e420f7b7e519dd088657e28306be4..9ae5ea93cbd0d39b3292b27c9c78a51b268632a3 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_cmpneq.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpneq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_eq.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_eq.out
index 1219f0888f2a1f1bd5d0aa4ba5d3528e16d9ce50..ddbecad17d4a330eb6e145393dbe893cd2013284 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_eq.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_eq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_ge.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_ge.out
index b80888a2a11305e94e5617d607fc4fbc45a7aecd..d4c1645d0517dc41de8816756e48243d6d0ccb2d 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_ge.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_ge.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_gt.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_gt.out
index fce53219e57dc66c7dd1b688c326b5dc8fac2a3f..6cf69f3845cfeb14fb4f92a46a30a3d5c976d008 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_gt.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_gt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_le.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_le.out
index 63c86a9eb1d62585dce6aa0ef1606bd48525dda4..81938328c570b0166c42d185a2b6ce63c22fad71 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_le.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_le.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_lt.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_lt.out
index aa0440b47c3ccefdc22e972eec45bfb5523ea7e4..3faecebbb2be184a35ff7557eac73a07e9fd6c68 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_lt.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_lt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_neq.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_neq.out
index 96d9a0a5de1b9fe54b1d7f93592d0ea62d71c566..97ad56e0faf131260ad5612a73ffaf8da85bb954 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-assert_neq.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_neq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-big_map_get_add.out
similarity index 87%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-big_map_get_add.out
index e892de94adb532a81a958d045812f85cc5f90b19..fd1950c5e72d53e259f6fff982fc1e7b7ee10184 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-big_map_get_add.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/big_map_get_add.tz]
-
 { parameter (pair (pair %set_pair int (option int)) (pair %check_pair int (option int))) ;
   storage (pair (big_map int int) unit) ;
   code { DUP ;
@@ -21,3 +19,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          PAIR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-big_map_mem.out
similarity index 78%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-big_map_mem.out
index 0561b15ae30580b61c748fb6afd394d9d63eb199..7f58503d9114e46369f1526e539f05609b2a1df6 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-big_map_mem.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/big_map_mem.tz]
-
 { parameter (pair int bool) ;
   storage (pair (big_map int unit) unit) ;
   code { DUP ;
@@ -12,3 +10,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          PAIR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-build_list.out
similarity index 84%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-build_list.out
index 17c1c438d400a4c4e7e8d15e6f5fa11883888f0e..4ef9f940b1d09e5f091c44d92cd1e8120bed4ae8 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-build_list.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/build_list.tz]
-
 { parameter nat ;
   storage (list nat) ;
   code { CAR @counter ;
@@ -22,3 +20,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-carn_and_cdrn.out
similarity index 88%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-carn_and_cdrn.out
index 9c232f540b64702a3de90bb695d06895dc7cb1ae..4cda8ad36989edf874e1741e67a7208ec9bbb1c3 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-carn_and_cdrn.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/carn_and_cdrn.tz]
-
 { parameter (pair nat nat nat unit) ;
   storage unit ;
   code { CAR ;
@@ -27,3 +25,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-compare.out
similarity index 85%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-compare.out
index 36a540b39043c770f05dc4aa2b41cbec78f21628..4292f6769b9169727ec60fd90bee4b98841c42de 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-compare.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/compare.tz]
-
 { parameter (pair mutez mutez) ;
   storage (list bool) ;
   code { CAR ;
@@ -20,3 +18,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-compare_bytes.out
similarity index 85%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-compare_bytes.out
index 598d580825b4eddec238487232c555907f1298c5..0b52eb3a3741f4c1435b715eaae9c243c97abe81 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-compare_bytes.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/compare_bytes.tz]
-
 { parameter (pair bytes bytes) ;
   storage (list bool) ;
   code { CAR ;
@@ -20,3 +18,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-fail.out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-fail.out
new file mode 100644
index 0000000000000000000000000000000000000000..a3007c04a48a9142ad11df7d66d9a58a8ae3a58c
--- /dev/null
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-fail.out	
@@ -0,0 +1,2 @@
+{ parameter unit ; storage unit ; code { { UNIT ; FAILWITH } } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-guestbook.out
similarity index 80%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-guestbook.out
index cafda41c8d2aba59e7cc580cf02d0a1c15d3a00f..007315d9f5c1eb2bfe1b55ec41a92411593015a8 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-guestbook.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/guestbook.tz]
-
 { parameter string ;
   storage (map address (option string)) ;
   code { UNPAIR @message @guestbook ;
@@ -16,3 +14,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UPDATE ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-macro_annotations.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-macro_annotations.out
index 8cb7ad74302eb29a8a1a575eae32aa19a2f1954d..e0004b030af09d7c3e55c8453ddadc31f163cc42 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-macro_annotations.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/macro_annotations.tz]
-
 { parameter unit ;
   storage (pair (unit %truc) unit) ;
   code { DROP ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          DIP { DROP ; DROP } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-map_caddaadr.out
similarity index 94%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-map_caddaadr.out
index f7542e434f8f781bfe8bbca0909ebe5676c35ec9..58b5cf2acdeec0c5562e7958eed49119111f790e 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-map_caddaadr.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/map_caddaadr.tz]
-
 { parameter unit ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { { DUP ;
@@ -38,3 +36,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          NIL operation ;
          SWAP ;
          { CDR @%% ; SWAP ; PAIR % %@ } } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-max_in_list.out
similarity index 81%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-max_in_list.out
index 2d4925fa377b5f3a2189025eacbd7b1d1d519600..73b02aecae216bfe6604cb2eca077ae9653137ec 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-max_in_list.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/max_in_list.tz]
-
 { parameter (list int) ;
   storage (option int) ;
   code { CAR ;
@@ -15,3 +13,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
                     SOME } } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-min.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-min.out
index 8ab3b9e892e2982f993dac64fce135dba5cc8530..25b53381539f982059ea8c5849f2f7461302542f 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-min.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/min.tz]
-
 { parameter (pair int int) ;
   storage int ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          IF { CAR } { CDR } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-pair_macro.out
similarity index 78%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-pair_macro.out
index 8e61396471b672fa3e3d4092e500e96ae095a99a..c690e041b539e73b649228376196f6fc1e65b1ea 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-pair_macro.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/pair_macro.tz]
-
 { parameter unit ;
   storage unit ;
   code { UNIT ;
@@ -16,3 +14,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CDR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-set_caddaadr.out
similarity index 92%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-set_caddaadr.out
index 5591b4e6a082b0c65a116423cb39ebbed4ebca86..40e1f41cf5b3ebfd8eadc5bfa5c9a697bb9d1d19 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-set_caddaadr.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/set_caddaadr.tz]
-
 { parameter mutez ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { DUP ;
@@ -31,3 +29,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
            PAIR %@ %@ @toplevel_pair_name } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-take_my_money.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-take_my_money.out
index 45456ae733759de5f5de21e751ffbbdb5de53368..e337e046dd675429bc54557ed5d09fd463deea05 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-take_my_money.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/take_my_money.tz]
-
 { parameter key_hash ;
   storage unit ;
   code { CAR ;
@@ -12,3 +10,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          SWAP ;
          CONS ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-unpair_macro.out
similarity index 86%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out
rename to tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-unpair_macro.out
index 6ced70fa1c8de26cae302a9855965e2ef1e6aaec..54c838c9052c00e9a3df0a3d10a0a11c92f848da 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Alpha- Macro expansion- macros-unpair_macro.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/unpair_macro.tz]
-
 { parameter (unit :param_unit) ;
   storage (unit :u1) ;
   code { DROP ;
@@ -18,3 +16,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          DIP { DROP ; DROP ; DROP } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert.out
similarity index 62%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert.out
index 9d25272c43d3ef808a6556bdaae43237552bc52e..5931ced0f2885671e35fb8e5eef4a192b65132e1 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert.tz]
-
 { parameter bool ;
   storage unit ;
   code { CAR ;
@@ -7,3 +5,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpeq.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpeq.out
index a466693ff6046def3ac0eebaebf72d19075bb4ca..bbe353a76a189a98ae79ea6c49e66ff0e5a2e283 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpeq.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpeq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpge.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpge.out
index e2a467035092feb0a61da9b2821cae2258194add..d56c3a72c717f4409c4b5417ac0714b91eb3568c 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpge.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpge.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpgt.out
similarity index 70%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpgt.out
index 512b297bbf42b167cded4088c4f42e9e5f4ddb0e..ad6419cc57afa115c55795729bef4ccadd719d9e 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpgt.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpgt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmple.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmple.out
index 62dadfc741d4c4583807b3731d113ad9c1c3b9c4..80d82ea4eb1e955cb430ec30a56e2294962b640d 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmple.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmple.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmplt.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmplt.out
index d178c78c16b08006bee66494b4cd7be8ffb6e6db..a0b5c69b4c9055716e73873da5bb90a1a31954a8 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmplt.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmplt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpneq.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpneq.out
index 41288cac1bdfbfc1286ef53a85e4608abd212c72..9ae5ea93cbd0d39b3292b27c9c78a51b268632a3 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_cmpneq.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpneq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_eq.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_eq.out
index b318d5148938ee50e98b7273673fc379cdb83478..ddbecad17d4a330eb6e145393dbe893cd2013284 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_eq.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_eq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_ge.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_ge.out
index 4b58537d3bcc2299da40b5f8feb9e82e4e2c6dbb..d4c1645d0517dc41de8816756e48243d6d0ccb2d 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_ge.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_ge.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_gt.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_gt.out
index 612c9f2f7a67bd843758faf6cf57af133282ece8..6cf69f3845cfeb14fb4f92a46a30a3d5c976d008 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_gt.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_gt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_le.out
similarity index 71%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_le.out
index c0830e98ac6c2a723baf3658eb2e4ac7e6f53792..81938328c570b0166c42d185a2b6ce63c22fad71 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_le.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_le.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_lt.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_lt.out
index aba419d9878a4c0ef5ec1794b6c3b141c4d0fc17..3faecebbb2be184a35ff7557eac73a07e9fd6c68 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_lt.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_lt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_neq.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_neq.out
index afb4f08ea54a4a9e89bd379a985e936f03c8f6db..97ad56e0faf131260ad5612a73ffaf8da85bb954 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-assert_neq.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_neq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-big_map_get_add.out
similarity index 87%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-big_map_get_add.out
index 25451dd2ba9151839440ca14f7573a25a9bd6faa..fd1950c5e72d53e259f6fff982fc1e7b7ee10184 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-big_map_get_add.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/big_map_get_add.tz]
-
 { parameter (pair (pair %set_pair int (option int)) (pair %check_pair int (option int))) ;
   storage (pair (big_map int int) unit) ;
   code { DUP ;
@@ -21,3 +19,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          PAIR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-big_map_mem.out
similarity index 78%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-big_map_mem.out
index 186af4263c26c9224cef5c9c3615ffa984fa44e4..7f58503d9114e46369f1526e539f05609b2a1df6 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-big_map_mem.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/big_map_mem.tz]
-
 { parameter (pair int bool) ;
   storage (pair (big_map int unit) unit) ;
   code { DUP ;
@@ -12,3 +10,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          PAIR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-build_list.out
similarity index 84%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-build_list.out
index 4291b8b736c835e0abed9ccfc1d552ec03e662eb..4ef9f940b1d09e5f091c44d92cd1e8120bed4ae8 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-build_list.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/build_list.tz]
-
 { parameter nat ;
   storage (list nat) ;
   code { CAR @counter ;
@@ -22,3 +20,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-carn_and_cdrn.out
similarity index 88%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-carn_and_cdrn.out
index a15d1455251ec780e60556283ea91289598121af..4cda8ad36989edf874e1741e67a7208ec9bbb1c3 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-carn_and_cdrn.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/carn_and_cdrn.tz]
-
 { parameter (pair nat nat nat unit) ;
   storage unit ;
   code { CAR ;
@@ -27,3 +25,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-compare.out
similarity index 85%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-compare.out
index 864b8d2d431b105add718bfb5bdcf6793a01d849..4292f6769b9169727ec60fd90bee4b98841c42de 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-compare.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/compare.tz]
-
 { parameter (pair mutez mutez) ;
   storage (list bool) ;
   code { CAR ;
@@ -20,3 +18,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-compare_bytes.out
similarity index 85%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-compare_bytes.out
index 3143fc4251d5dfae73a57a9ed8d2a33809ef9996..0b52eb3a3741f4c1435b715eaae9c243c97abe81 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-compare_bytes.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/compare_bytes.tz]
-
 { parameter (pair bytes bytes) ;
   storage (list bool) ;
   code { CAR ;
@@ -20,3 +18,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-fail.out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-fail.out
new file mode 100644
index 0000000000000000000000000000000000000000..a3007c04a48a9142ad11df7d66d9a58a8ae3a58c
--- /dev/null
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-fail.out	
@@ -0,0 +1,2 @@
+{ parameter unit ; storage unit ; code { { UNIT ; FAILWITH } } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-guestbook.out
similarity index 80%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-guestbook.out
index fdb6853a806fa26c9c2580e504af831a96e5f6d8..007315d9f5c1eb2bfe1b55ec41a92411593015a8 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-guestbook.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/guestbook.tz]
-
 { parameter string ;
   storage (map address (option string)) ;
   code { UNPAIR @message @guestbook ;
@@ -16,3 +14,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          UPDATE ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-macro_annotations.out
similarity index 70%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-macro_annotations.out
index a2bc58c76575c1dbbd18ff57ba81da04727280f3..e0004b030af09d7c3e55c8453ddadc31f163cc42 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-macro_annotations.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/macro_annotations.tz]
-
 { parameter unit ;
   storage (pair (unit %truc) unit) ;
   code { DROP ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          DIP { DROP ; DROP } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-map_caddaadr.out
similarity index 94%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-map_caddaadr.out
index 1b00beab2dc395eebb9412aeeb5d8638c8182d73..58b5cf2acdeec0c5562e7958eed49119111f790e 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-map_caddaadr.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/map_caddaadr.tz]
-
 { parameter unit ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { { DUP ;
@@ -38,3 +36,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          NIL operation ;
          SWAP ;
          { CDR @%% ; SWAP ; PAIR % %@ } } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-max_in_list.out
similarity index 81%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-max_in_list.out
index dbcc1f87cb85b661fb2b0406f733f0e534bd81ee..73b02aecae216bfe6604cb2eca077ae9653137ec 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-max_in_list.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/max_in_list.tz]
-
 { parameter (list int) ;
   storage (option int) ;
   code { CAR ;
@@ -15,3 +13,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
                     SOME } } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-min.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-min.out
index 69d91fb64904d8530d8a2851479fa28365b992c4..25b53381539f982059ea8c5849f2f7461302542f 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-min.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/min.tz]
-
 { parameter (pair int int) ;
   storage int ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          IF { CAR } { CDR } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-pair_macro.out
similarity index 78%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-pair_macro.out
index e20c0190d19b313e1185bf6888471cd395b17a43..c690e041b539e73b649228376196f6fc1e65b1ea 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-pair_macro.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/pair_macro.tz]
-
 { parameter unit ;
   storage unit ;
   code { UNIT ;
@@ -16,3 +14,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          CDR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-set_caddaadr.out
similarity index 92%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-set_caddaadr.out
index 971f9e1568d384e6e0664e5d8777eff951079d0b..40e1f41cf5b3ebfd8eadc5bfa5c9a697bb9d1d19 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-set_caddaadr.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/set_caddaadr.tz]
-
 { parameter mutez ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { DUP ;
@@ -31,3 +29,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
            PAIR %@ %@ @toplevel_pair_name } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-take_my_money.out
similarity index 71%
rename from tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-take_my_money.out
index 65caa48a40258183f404f51b9118f4aa774f5c66..e337e046dd675429bc54557ed5d09fd463deea05 100644
--- a/tests_python/tests_016/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-take_my_money.out	
@@ -1,5 +1,3 @@
-tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/take_my_money.tz]
-
 { parameter key_hash ;
   storage unit ;
   code { CAR ;
@@ -12,3 +10,4 @@ tests_016/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          SWAP ;
          CONS ;
          PAIR } }
+
diff --git a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-unpair_macro.out
similarity index 86%
rename from tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out
rename to tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-unpair_macro.out
index c39ad4b3c3a3488172a0d729497530a48ca5dd80..54c838c9052c00e9a3df0a3d10a0a11c92f848da 100644
--- a/tests_python/tests_015/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Lima- Macro expansion- macros-unpair_macro.out	
@@ -1,5 +1,3 @@
-tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/unpair_macro.tz]
-
 { parameter (unit :param_unit) ;
   storage (unit :u1) ;
   code { DROP ;
@@ -18,3 +16,4 @@ tests_015/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macr
          DIP { DROP ; DROP ; DROP } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert.out
similarity index 61%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert.out
index c99726527afb4d381acacedd8dd18b86690d49af..5931ced0f2885671e35fb8e5eef4a192b65132e1 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert.tz]
-
 { parameter bool ;
   storage unit ;
   code { CAR ;
@@ -7,3 +5,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpeq.out
similarity index 70%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpeq.out
index 0f10e097b54ac52d107b48e258874e50bfbcc240..bbe353a76a189a98ae79ea6c49e66ff0e5a2e283 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpeq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpeq.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpeq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpge.out
similarity index 70%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpge.out
index 804048ae368b9de5cc745b70ee2b1224e31dd1d5..d56c3a72c717f4409c4b5417ac0714b91eb3568c 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpge.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpge.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpge.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpgt.out
similarity index 70%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpgt.out
index 8b94cea30462040e5fe9e3b8696e404689f842cd..ad6419cc57afa115c55795729bef4ccadd719d9e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpgt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpgt.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpgt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmple.out
similarity index 70%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmple.out
index 31c9ecdb285855509f533183784f67505cb33612..80d82ea4eb1e955cb430ec30a56e2294962b640d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmple.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmple.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmple.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmplt.out
similarity index 70%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmplt.out
index 7e1dad32b27df89137b3536ebf45c11a9b364da4..a0b5c69b4c9055716e73873da5bb90a1a31954a8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmplt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmplt.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmplt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpneq.out
similarity index 69%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpneq.out
index fe27ed940f3b77270de74196708d30675263282e..9ae5ea93cbd0d39b3292b27c9c78a51b268632a3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_cmpneq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_cmpneq.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_cmpneq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -10,3 +8,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_eq.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_eq.out
index c3aa58da38e4a608f02b9daa7e63754858dc7fc4..ddbecad17d4a330eb6e145393dbe893cd2013284 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_eq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_eq.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_eq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_ge.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_ge.out
index faae7df4723c7e76b70920e9222c213cdc9460c0..d4c1645d0517dc41de8816756e48243d6d0ccb2d 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_ge.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_ge.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_ge.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_gt.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_gt.out
index 9f83af2a2d9e259a29a5d45357cd0e931c76649d..6cf69f3845cfeb14fb4f92a46a30a3d5c976d008 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_gt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_gt.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_gt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_le.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_le.out
index 7eb227f904e2231759dacc5ff7b2667992456e99..81938328c570b0166c42d185a2b6ce63c22fad71 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_le.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_le.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_le.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_lt.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_lt.out
index 3692548f82590f88377055e31b2fc50378b01d9b..3faecebbb2be184a35ff7557eac73a07e9fd6c68 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_lt.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_lt.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_lt.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_neq.out
similarity index 70%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_neq.out
index 34422ae6ed57b849162788d86fde8e4c933bbac6..97ad56e0faf131260ad5612a73ffaf8da85bb954 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--assert_neq.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-assert_neq.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/assert_neq.tz]
-
 { parameter (pair int int) ;
   storage unit ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-big_map_get_add.out
similarity index 86%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-big_map_get_add.out
index afb71b8e493a60d48d579163d644547ec023116d..fd1950c5e72d53e259f6fff982fc1e7b7ee10184 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_get_add.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-big_map_get_add.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/big_map_get_add.tz]
-
 { parameter (pair (pair %set_pair int (option int)) (pair %check_pair int (option int))) ;
   storage (pair (big_map int int) unit) ;
   code { DUP ;
@@ -21,3 +19,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          PAIR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-big_map_mem.out
similarity index 77%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-big_map_mem.out
index 0b525ef111fd56f4dd94181579eb8dc1ac92c5bd..7f58503d9114e46369f1526e539f05609b2a1df6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--big_map_mem.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-big_map_mem.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/big_map_mem.tz]
-
 { parameter (pair int bool) ;
   storage (pair (big_map int unit) unit) ;
   code { DUP ;
@@ -12,3 +10,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          PAIR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-build_list.out
similarity index 84%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-build_list.out
index 8dd2bc81f1d85ee7af9d34fe82e10183d278d23c..4ef9f940b1d09e5f091c44d92cd1e8120bed4ae8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--build_list.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-build_list.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/build_list.tz]
-
 { parameter nat ;
   storage (list nat) ;
   code { CAR @counter ;
@@ -22,3 +20,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-carn_and_cdrn.out
similarity index 87%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-carn_and_cdrn.out
index 995928cfa1194da141829ed62a271c051d99f697..4cda8ad36989edf874e1741e67a7208ec9bbb1c3 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--carn_and_cdrn.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-carn_and_cdrn.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/carn_and_cdrn.tz]
-
 { parameter (pair nat nat nat unit) ;
   storage unit ;
   code { CAR ;
@@ -27,3 +25,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UNIT ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-compare.out
similarity index 85%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-compare.out
index 0d507cf27e7fa3c66e0a075e043b7cd8e0e42cf6..4292f6769b9169727ec60fd90bee4b98841c42de 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-compare.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/compare.tz]
-
 { parameter (pair mutez mutez) ;
   storage (list bool) ;
   code { CAR ;
@@ -20,3 +18,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-compare_bytes.out
similarity index 84%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-compare_bytes.out
index deb4163ec9519b1a3624e7f19ededdd33d1ad92e..0b52eb3a3741f4c1435b715eaae9c243c97abe81 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--compare_bytes.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-compare_bytes.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/compare_bytes.tz]
-
 { parameter (pair bytes bytes) ;
   storage (list bool) ;
   code { CAR ;
@@ -20,3 +18,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          CONS ;
          NIL operation ;
          PAIR } }
+
diff --git a/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-fail.out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-fail.out
new file mode 100644
index 0000000000000000000000000000000000000000..a3007c04a48a9142ad11df7d66d9a58a8ae3a58c
--- /dev/null
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-fail.out	
@@ -0,0 +1,2 @@
+{ parameter unit ; storage unit ; code { { UNIT ; FAILWITH } } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-guestbook.out
similarity index 80%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-guestbook.out
index 80feac1f2dfa9a77191f67d6f80fe9afaf758efe..007315d9f5c1eb2bfe1b55ec41a92411593015a8 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--guestbook.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-guestbook.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/guestbook.tz]
-
 { parameter string ;
   storage (map address (option string)) ;
   code { UNPAIR @message @guestbook ;
@@ -16,3 +14,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          UPDATE ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-macro_annotations.out
similarity index 69%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-macro_annotations.out
index e30263d775be61c2c127c78f9dc1ffe0ed3254ec..e0004b030af09d7c3e55c8453ddadc31f163cc42 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--macro_annotations.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-macro_annotations.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/macro_annotations.tz]
-
 { parameter unit ;
   storage (pair (unit %truc) unit) ;
   code { DROP ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          DIP { DROP ; DROP } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-map_caddaadr.out
similarity index 94%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-map_caddaadr.out
index 40a4c9dfd07873cf5adbb6cc00d88fa548584950..58b5cf2acdeec0c5562e7958eed49119111f790e 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--map_caddaadr.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-map_caddaadr.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/map_caddaadr.tz]
-
 { parameter unit ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { { DUP ;
@@ -38,3 +36,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          NIL operation ;
          SWAP ;
          { CDR @%% ; SWAP ; PAIR % %@ } } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-max_in_list.out
similarity index 80%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-max_in_list.out
index 27bc45e440f3a7fda73d0a1c831720a1b0e1d708..73b02aecae216bfe6604cb2eca077ae9653137ec 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--max_in_list.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-max_in_list.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/max_in_list.tz]
-
 { parameter (list int) ;
   storage (option int) ;
   code { CAR ;
@@ -15,3 +13,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
                     SOME } } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-min.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-min.out
index 0f06a38036f889334db905f79ac22c71e045e227..25b53381539f982059ea8c5849f2f7461302542f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--min.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-min.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/min.tz]
-
 { parameter (pair int int) ;
   storage int ;
   code { CAR ;
@@ -11,3 +9,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          IF { CAR } { CDR } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-pair_macro.out
similarity index 78%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-pair_macro.out
index a401a6acf10e6b7a08d35be176155d2de67210c6..c690e041b539e73b649228376196f6fc1e65b1ea 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--pair_macro.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-pair_macro.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/pair_macro.tz]
-
 { parameter unit ;
   storage unit ;
   code { UNIT ;
@@ -16,3 +14,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          CDR ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-set_caddaadr.out
similarity index 92%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-set_caddaadr.out
index 57935e9e501aca36a106fe40647fb0e00e3259b1..40e1f41cf5b3ebfd8eadc5bfa5c9a697bb9d1d19 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--set_caddaadr.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-set_caddaadr.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/set_caddaadr.tz]
-
 { parameter mutez ;
   storage (pair (pair nat (pair nat (pair (pair (pair (nat %p) (mutez %value)) nat) nat))) nat) ;
   code { DUP ;
@@ -31,3 +29,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
            PAIR %@ %@ @toplevel_pair_name } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-take_my_money.out
similarity index 71%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-take_my_money.out
index 6121622c49521faf18ea8ed1d27898b5bd4bce7f..e337e046dd675429bc54557ed5d09fd463deea05 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--take_my_money.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-take_my_money.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/take_my_money.tz]
-
 { parameter key_hash ;
   storage unit ;
   code { CAR ;
@@ -12,3 +10,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          SWAP ;
          CONS ;
          PAIR } }
+
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-unpair_macro.out
similarity index 86%
rename from tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out
rename to tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-unpair_macro.out
index 692aac72f1eaa98fa89687fd2e1f4a8a89bef3a3..54c838c9052c00e9a3df0a3d10a0a11c92f848da 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_macros.TestMacroExpansion::test_macro_expansion[macros--unpair_macro.tz].out
+++ b/tezt/tests/expected/contract_macros.ml/Mumbai- Macro expansion- macros-unpair_macro.out	
@@ -1,5 +1,3 @@
-tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[macros/unpair_macro.tz]
-
 { parameter (unit :param_unit) ;
   storage (unit :u1) ;
   code { DROP ;
@@ -18,3 +16,4 @@ tests_alpha/test_contract_macros.py::TestMacroExpansion::test_macro_expansion[ma
          DIP { DROP ; DROP ; DROP } ;
          NIL operation ;
          PAIR } }
+
diff --git a/tezt/tests/main.ml b/tezt/tests/main.ml
index 85cb6a98553f665ceb1aa94cbf8f3525be671f43..145caa4fc8c2bd77e2f69a5abe4c8f41d5fc97f7 100644
--- a/tezt/tests/main.ml
+++ b/tezt/tests/main.ml
@@ -126,6 +126,7 @@ let register_protocol_tests_that_use_supports_correctly () =
   Contract_opcodes.register ~protocols ;
   Contract_typecheck_contract.register ~protocols ;
   Contract_typecheck_regression.register ~protocols ;
+  Contract_macros.register ~protocols ;
   Contract_mini_scenarios.register ~protocols ;
   Create_contract.register ~protocols ;
   Deposits_limit.register ~protocols ;