diff --git a/tests/suites/test_suite_mdx.data b/tests/suites/test_suite_mdx.data
index 0e2114e..72325d4 100644
--- a/tests/suites/test_suite_mdx.data
+++ b/tests/suites/test_suite_mdx.data
@@ -1,85 +1,64 @@
 md2 Test vector RFC1319 #1
-depends_on:POLARSSL_MD2_C
 md2_text:"":"8350e5a3e24c153df2275c9f80692773"
 
 md2 Test vector RFC1319 #2
-depends_on:POLARSSL_MD2_C
 md2_text:"a":"32ec01ec4a6dac72c0ab96fb34c0b5d1"
 
 md2 Test vector RFC1319 #3
-depends_on:POLARSSL_MD2_C
 md2_text:"abc":"da853b0d3f88d99b30283a69e6ded6bb"
 
 md2 Test vector RFC1319 #4
-depends_on:POLARSSL_MD2_C
 md2_text:"message digest":"ab4f496bfb2a530b219ff33031fe06b0"
 
 md2 Test vector RFC1319 #5
-depends_on:POLARSSL_MD2_C
 md2_text:"abcdefghijklmnopqrstuvwxyz":"4e8ddff3650292ab5a4108c3aa47940b"
 
 md2 Test vector RFC1319 #6
-depends_on:POLARSSL_MD2_C
 md2_text:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789":"da33def2a42df13975352846c30338cd"
 
 md2 Test vector RFC1319 #7
-depends_on:POLARSSL_MD2_C
 md2_text:"12345678901234567890123456789012345678901234567890123456789012345678901234567890":"d5976f79d83d3a0dc9806c3c66f3efd8"
 
 md4 Test vector RFC1320 #1
-depends_on:POLARSSL_MD4_C
 md4_text:"":"31d6cfe0d16ae931b73c59d7e0c089c0"
 
 md4 Test vector RFC1320 #2
-depends_on:POLARSSL_MD4_C
 md4_text:"a":"bde52cb31de33e46245e05fbdbd6fb24"
 
 md4 Test vector RFC1320 #3
-depends_on:POLARSSL_MD4_C
 md4_text:"abc":"a448017aaf21d8525fc10ae87aa6729d"
 
 md4 Test vector RFC1320 #4
-depends_on:POLARSSL_MD4_C
 md4_text:"message digest":"d9130a8164549fe818874806e1c7014b"
 
 md4 Test vector RFC1320 #5
-depends_on:POLARSSL_MD4_C
 md4_text:"abcdefghijklmnopqrstuvwxyz":"d79e1c308aa5bbcdeea8ed63df412da9"
 
 md4 Test vector RFC1320 #6
-depends_on:POLARSSL_MD4_C
 md4_text:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789":"043f8582f241db351ce627e153e7f0e4"
 
 md4 Test vector RFC1320 #7
-depends_on:POLARSSL_MD4_C
 md4_text:"12345678901234567890123456789012345678901234567890123456789012345678901234567890":"e33b4ddc9c38f2199c3e7b164fcc0536"
 
 md5 Test vector RFC1321 #1
-depends_on:POLARSSL_MD5_C
 md5_text:"":"d41d8cd98f00b204e9800998ecf8427e"
 
 md5 Test vector RFC1321 #2
-depends_on:POLARSSL_MD5_C
 md5_text:"a":"0cc175b9c0f1b6a831c399e269772661"
 
 md5 Test vector RFC1321 #3
-depends_on:POLARSSL_MD5_C
 md5_text:"abc":"900150983cd24fb0d6963f7d28e17f72"
 
 md5 Test vector RFC1321 #4
-depends_on:POLARSSL_MD5_C
 md5_text:"message digest":"f96b697d7cb7938d525a2f31aaf161d0"
 
 md5 Test vector RFC1321 #5
-depends_on:POLARSSL_MD5_C
 md5_text:"abcdefghijklmnopqrstuvwxyz":"c3fcd3d76192e4007dfb496cca67e13b"
 
 md5 Test vector RFC1321 #6
-depends_on:POLARSSL_MD5_C
 md5_text:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789":"d174ab98d277d9f5a5611c2c9f419d9f"
 
 md5 Test vector RFC1321 #7
-depends_on:POLARSSL_MD5_C
 md5_text:"12345678901234567890123456789012345678901234567890123456789012345678901234567890":"57edf4a22be3c955ac49da2e2107b67a"
 
 rmd160 Test vector from paper #1
@@ -107,127 +86,96 @@
 rmd160_text:"12345678901234567890123456789012345678901234567890123456789012345678901234567890":"9b752e45573d4b39f4dbd3323cab82bf63326bfb"
 
 HMAC-MD2 Hash File OpenSSL test #1
-depends_on:POLARSSL_MD2_C
 md2_hmac:16:"61616161616161616161616161616161":"b91ce5ac77d33c234e61002ed6":"d5732582f494f5ddf35efd166c85af9c"
 
 HMAC-MD2 Hash File OpenSSL test #2
-depends_on:POLARSSL_MD2_C
 md2_hmac:16:"61616161616161616161616161616161":"270fcf11f27c27448457d7049a7edb084a3e554e0b2acf5806982213f0ad516402e4c869c4ff2171e18e3489baa3125d2c3056ebb616296f9b6aa97ef68eeabcdc0b6dde47775004096a241efcf0a90d19b34e898cc7340cdc940f8bdd46e23e352f34bca131d4d67a7c2ddb8d0d68b67f06152a128168e1c341c37e0a66c5018999b7059bcc300beed2c19dd1152d2fe062853293b8f3c8b5":"54ab68503f7d1b5c7741340dff2722a9"
 
 HMAC-MD2 Hash File OpenSSL test #3
-depends_on:POLARSSL_MD2_C
 md2_hmac:16:"61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161":"b91ce5ac77d33c234e61002ed6":"d850e5f554558cf0fe79a0612e1d0365"
 
 HMAC-MD4 Hash File OpenSSL test #1
-depends_on:POLARSSL_MD4_C
 md4_hmac:16:"61616161616161616161616161616161":"b91ce5ac77d33c234e61002ed6":"eabd0fbefb82fb0063a25a6d7b8bdc0f"
 
 HMAC-MD4 Hash File OpenSSL test #2
-depends_on:POLARSSL_MD4_C
 md4_hmac:16:"61616161616161616161616161616161":"270fcf11f27c27448457d7049a7edb084a3e554e0b2acf5806982213f0ad516402e4c869c4ff2171e18e3489baa3125d2c3056ebb616296f9b6aa97ef68eeabcdc0b6dde47775004096a241efcf0a90d19b34e898cc7340cdc940f8bdd46e23e352f34bca131d4d67a7c2ddb8d0d68b67f06152a128168e1c341c37e0a66c5018999b7059bcc300beed2c19dd1152d2fe062853293b8f3c8b5":"cec3c5e421a7b783aa89cacf78daf6dc"
 
 HMAC-MD4 Hash File OpenSSL test #3
-depends_on:POLARSSL_MD4_C
 md4_hmac:16:"61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161":"b91ce5ac77d33c234e61002ed6":"ad5f0a04116109b397b57f9cc9b6df4b"
 
 HMAC-MD5 Hash File OpenSSL test #1
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"61616161616161616161616161616161":"b91ce5ac77d33c234e61002ed6":"42552882f00bd4633ea81135a184b284"
 
 HMAC-MD5 Hash File OpenSSL test #2
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"61616161616161616161616161616161":"270fcf11f27c27448457d7049a7edb084a3e554e0b2acf5806982213f0ad516402e4c869c4ff2171e18e3489baa3125d2c3056ebb616296f9b6aa97ef68eeabcdc0b6dde47775004096a241efcf0a90d19b34e898cc7340cdc940f8bdd46e23e352f34bca131d4d67a7c2ddb8d0d68b67f06152a128168e1c341c37e0a66c5018999b7059bcc300beed2c19dd1152d2fe062853293b8f3c8b5":"a16a842891786d01fe50ba7731db7464"
 
 HMAC-MD5 Hash File OpenSSL test #3
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161":"b91ce5ac77d33c234e61002ed6":"e97f623936f98a7f741c4bd0612fecc2"
 
 HMAC-MD5 Test Vector RFC2202 #1
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":"4869205468657265":"9294727a3638bb1c13f48ef8158bfc9d"
 
 HMAC-MD5 Test Vector RFC2202 #2
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"4a656665":"7768617420646f2079612077616e7420666f72206e6f7468696e673f":"750c783e6ab0b503eaa86e310a5db738"
 
 HMAC-MD5 Test Vector RFC2202 #3
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa":"dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd":"56be34521d144c88dbb8c733f0e8b3f6"
 
 HMAC-MD5 Test Vector RFC2202 #4
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"0102030405060708090a0b0c0d0e0f10111213141516171819":"cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd":"697eaf0aca3a3aea3a75164746ffaa79"
 
 HMAC-MD5 Test Vector RFC2202 #5
-depends_on:POLARSSL_MD5_C
 md5_hmac:12:"0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c":"546573742057697468205472756e636174696f6e":"56461ef2342edc00f9bab995"
 
 HMAC-MD5 Test Vector RFC2202 #6
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa":"54657374205573696e67204c6172676572205468616e20426c6f636b2d53697a65204b6579202d2048617368204b6579204669727374":"6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd"
 
 HMAC-MD5 Test Vector RFC2202 #7
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa":"54657374205573696e67204c6172676572205468616e20426c6f636b2d53697a65204b657920616e64204c6172676572205468616e204f6e6520426c6f636b2d53697a652044617461":"6f630fad67cda0ee1fb1f562db3aa53e"
 
 HMAC-MD2 Bouncy Castle test #1
-depends_on:POLARSSL_MD2_C
 md2_hmac:16:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":"4869205468657265":"dc1923ef5f161d35bef839ca8c807808"
 
 HMAC-MD4 Bouncy Castle test #1
-depends_on:POLARSSL_MD4_C
 md4_hmac:16:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":"4869205468657265":"5570ce964ba8c11756cdc3970278ff5a"
 
 HMAC-MD5 Bouncy Castle test #1
-depends_on:POLARSSL_MD5_C
 md5_hmac:16:"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b":"4869205468657265":"5ccec34ea9656392457fa1ac27f08fbc"
 
 MD2 Hash file #1
-depends_on:POLARSSL_MD2_C
 md2_file:"data_files/hash_file_1":"b593c098712d2e21628c8986695451a8"
 
 MD2 Hash file #2
-depends_on:POLARSSL_MD2_C
 md2_file:"data_files/hash_file_2":"3c027b7409909a4c4b26bbab69ad9f4f"
 
 MD2 Hash file #3
-depends_on:POLARSSL_MD2_C
 md2_file:"data_files/hash_file_3":"6bb43eb285e81f414083a94cdbe2989d"
 
 MD2 Hash file #4
-depends_on:POLARSSL_MD2_C
 md2_file:"data_files/hash_file_4":"8350e5a3e24c153df2275c9f80692773"
 
 MD4 Hash file #1
-depends_on:POLARSSL_MD4_C
 md4_file:"data_files/hash_file_1":"8d19772c176bd27153b9486715e2c0b9"
 
 MD4 Hash file #2
-depends_on:POLARSSL_MD4_C
 md4_file:"data_files/hash_file_2":"f2ac53b8542882a5a0007c6f84b4d9fd"
 
 MD4 Hash file #3
-depends_on:POLARSSL_MD4_C
 md4_file:"data_files/hash_file_3":"195c15158e2d07881d9a654095ce4a42"
 
 MD4 Hash file #4
-depends_on:POLARSSL_MD4_C
 md4_file:"data_files/hash_file_4":"31d6cfe0d16ae931b73c59d7e0c089c0"
 
 MD5 Hash file #1
-depends_on:POLARSSL_MD5_C
 md5_file:"data_files/hash_file_1":"52bcdc983c9ed64fc148a759b3c7a415"
 
 MD5 Hash file #2
-depends_on:POLARSSL_MD5_C
 md5_file:"data_files/hash_file_2":"d17d466f15891df10542207ae78277f0"
 
 MD5 Hash file #3
-depends_on:POLARSSL_MD5_C
 md5_file:"data_files/hash_file_3":"d945bcc6200ea95d061a2a818167d920"
 
 MD5 Hash file #4
-depends_on:POLARSSL_MD5_C
 md5_file:"data_files/hash_file_4":"d41d8cd98f00b204e9800998ecf8427e"
 
 RMD160 Hash file #0 (from paper)
@@ -246,17 +194,13 @@
 rmd160_file:"data_files/hash_file_4":"9c1185a5c5e9fc54612808977ee8f548b2258d31"
 
 MD2 Selftest
-depends_on:POLARSSL_MD2_C:POLARSSL_SELF_TEST
 md2_selftest:
 
 MD4 Selftest
-depends_on:POLARSSL_MD4_C:POLARSSL_SELF_TEST
 md4_selftest:
 
 MD5 Selftest
-depends_on:POLARSSL_MD5_C:POLARSSL_SELF_TEST
 md5_selftest:
 
 RMD160 Selftest
-depends_on:POLARSSL_RMD160_C:POLARSSL_SELF_TEST
 rmd160_selftest: