diff --git a/tests/suites/test_suite_bignum_core.misc.data b/tests/suites/test_suite_bignum_core.misc.data
index 28de243..30c767c 100644
--- a/tests/suites/test_suite_bignum_core.misc.data
+++ b/tests/suites/test_suite_bignum_core.misc.data
@@ -431,82 +431,42 @@
 Fill random core: 42 bytes, 5 missing limbs
 mpi_core_fill_random:42:0:-5:0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA
 
-BEGIN MERGE SLOT 1
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 1
 
-END MERGE SLOT 1
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 1
 
-BEGIN MERGE SLOT 2
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 2
 
-END MERGE SLOT 2
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 2
 
-BEGIN MERGE SLOT 3
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 3
 
-END MERGE SLOT 3
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 3
 
-BEGIN MERGE SLOT 4
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 4
 
-END MERGE SLOT 4
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 4
 
-BEGIN MERGE SLOT 5
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 5
 
-END MERGE SLOT 5
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 5
 
-BEGIN MERGE SLOT 6
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 6
 
-END MERGE SLOT 6
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 6
 
-BEGIN MERGE SLOT 7
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 7
 
-END MERGE SLOT 7
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 7
 
-BEGIN MERGE SLOT 8
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 8
 
-END MERGE SLOT 8
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 8
 
-BEGIN MERGE SLOT 9
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 9
 
-END MERGE SLOT 9
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 9
 
-BEGIN MERGE SLOT 10
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# BEGIN MERGE SLOT 10
 
-END MERGE SLOT 10
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_core_io_null
+# END MERGE SLOT 10
diff --git a/tests/suites/test_suite_bignum_mod.data b/tests/suites/test_suite_bignum_mod.data
index c80bfa3..d06541f 100644
--- a/tests/suites/test_suite_bignum_mod.data
+++ b/tests/suites/test_suite_bignum_mod.data
@@ -25,82 +25,43 @@
 Test mbedtls_mpi_mod_setup #9 (Both representations valid)
 mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
 
-BEGIN MERGE SLOT 1
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 1
 
-END MERGE SLOT 1
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 1
 
-BEGIN MERGE SLOT 2
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 2
 
-END MERGE SLOT 2
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 2
 
-BEGIN MERGE SLOT 3
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 3
 
-END MERGE SLOT 3
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 3
 
-BEGIN MERGE SLOT 4
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 4
 
-END MERGE SLOT 4
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 4
 
-BEGIN MERGE SLOT 5
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 5
 
-END MERGE SLOT 5
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 5
 
-BEGIN MERGE SLOT 6
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 6
 
-END MERGE SLOT 6
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 6
 
-BEGIN MERGE SLOT 7
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 7
 
-END MERGE SLOT 7
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 7
 
-BEGIN MERGE SLOT 8
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 8
 
-END MERGE SLOT 8
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 8
 
-BEGIN MERGE SLOT 9
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 9
 
-END MERGE SLOT 9
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 9
 
-BEGIN MERGE SLOT 10
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# BEGIN MERGE SLOT 10
 
-END MERGE SLOT 10
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_setup:MBEDTLS_MPI_MOD_EXT_REP_LE:MBEDTLS_MPI_MOD_REP_MONTGOMERY:0
+# END MERGE SLOT 10
+
diff --git a/tests/suites/test_suite_bignum_mod_raw.data b/tests/suites/test_suite_bignum_mod_raw.data
index c47d473..6644b1e 100644
--- a/tests/suites/test_suite_bignum_mod_raw.data
+++ b/tests/suites/test_suite_bignum_mod_raw.data
@@ -179,82 +179,43 @@
 mbedtls_mpi_mod_raw_cond_swap: copy half of the limbs
 mpi_mod_raw_cond_swap:"00000000FFFFFFFF55555555AAAAAAAA":"FEDCBA9876543210FEDCBA9876543210":8
 
-BEGIN MERGE SLOT 1
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 1
 
-END MERGE SLOT 1
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 1
 
-BEGIN MERGE SLOT 2
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 2
 
-END MERGE SLOT 2
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 2
 
-BEGIN MERGE SLOT 3
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 3
 
-END MERGE SLOT 3
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 3
 
-BEGIN MERGE SLOT 4
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 4
 
-END MERGE SLOT 4
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 4
 
-BEGIN MERGE SLOT 5
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 5
 
-END MERGE SLOT 5
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 5
 
-BEGIN MERGE SLOT 6
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 6
 
-END MERGE SLOT 6
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 6
 
-BEGIN MERGE SLOT 7
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 7
 
-END MERGE SLOT 7
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 7
 
-BEGIN MERGE SLOT 8
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 8
 
-END MERGE SLOT 8
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 8
 
-BEGIN MERGE SLOT 9
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 9
 
-END MERGE SLOT 9
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 9
 
-BEGIN MERGE SLOT 10
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# BEGIN MERGE SLOT 10
 
-END MERGE SLOT 10
-depends_on:MBEDTLS_BIGNUM_MERGE
-mpi_mod_raw_io:"00":1:1:MBEDTLS_MPI_MOD_EXT_REP_BE:0:0
+# END MERGE SLOT 10
+