kc3-lang/kc3

diff --git a/test/bool_test.c b/test/bool_test.c
index c5a61db..5e953e2 100644
--- a/test/bool_test.c
+++ b/test/bool_test.c
@@ -36,7 +36,7 @@ void bool_test ()
   bool_test_inspect();
 }
 
-void bool_test_compat ()
+TEST_CASE(test__bool_compat)
 {
   TEST_EQ(true, 1);
   TEST_EQ(false, 0);
@@ -46,7 +46,7 @@ void bool_test_compat ()
   TEST_ASSERT(! (bool) false);
 }
 
-void bool_test_inspect ()
+TEST_CASE(test__bool_inspect)
 {
   BOOL_TEST_INSPECT(true, "true");
   BOOL_TEST_INSPECT(false, "false");
diff --git a/test/buf_file_test.c b/test/buf_file_test.c
index f2e615a..6e47d88 100644
--- a/test/buf_file_test.c
+++ b/test/buf_file_test.c
@@ -27,7 +27,7 @@ void buf_file_test ()
   buf_file_test_open_w_close();
 }
 
-void buf_file_test_open_r_close ()
+TEST_CASE(test__buf_file_open_r_close)
 {
   s8 b[16];
   s_buf buf;
@@ -41,7 +41,7 @@ void buf_file_test_open_r_close ()
   fclose(fp);
 }
 
-void buf_file_test_open_r_refill ()
+TEST_CASE(test__buf_file_open_r_refill)
 {
   u8 b = 0x80;
   s8 bu[16];
@@ -62,6 +62,6 @@ void buf_file_test_open_r_refill ()
   test_context(NULL);
 }
 
-void buf_file_test_open_w_close ()
+TEST_CASE(test__buf_file_open_w_close)
 {
 }
diff --git a/test/buf_inspect_test.c b/test/buf_inspect_test.c
index 0bef72e..8079e11 100644
--- a/test/buf_inspect_test.c
+++ b/test/buf_inspect_test.c
@@ -179,13 +179,13 @@ void buf_inspect_test ()
   buf_inspect_test_tag();
 }
 
-void buf_inspect_test_bool ()
+TEST_CASE(test__buf_inspect_bool)
 {
   BUF_INSPECT_TEST_BOOL(true, "true");
   BUF_INSPECT_TEST_BOOL(false, "false");
 }
 
-void buf_inspect_test_character ()
+TEST_CASE(test__buf_inspect_character)
 {
   BUF_INSPECT_TEST_CHARACTER(0, "'\\0'");
   BUF_INSPECT_TEST_CHARACTER(1, "'\\x01'");
@@ -206,7 +206,7 @@ void buf_inspect_test_character ()
   BUF_INSPECT_TEST_CHARACTER(129321, "'🤩'");
 }
 
-void buf_inspect_test_f32 ()
+TEST_CASE(test__buf_inspect_f32)
 {
   BUF_INSPECT_TEST_F32(0.0, "0");
   BUF_INSPECT_TEST_F32(0.1, "0.1");
@@ -219,7 +219,7 @@ void buf_inspect_test_f32 ()
   BUF_INSPECT_TEST_F32(-123456789.0, "-1.23457e+08");
 }
 
-void buf_inspect_test_f64 ()
+TEST_CASE(test__buf_inspect_f64)
 {
   BUF_INSPECT_TEST_F64(0.0, "0");
   BUF_INSPECT_TEST_F64(0.1, "0.1");
@@ -232,7 +232,7 @@ void buf_inspect_test_f64 ()
   BUF_INSPECT_TEST_F64(-123456789.0, "-1.23457e+08");
 }
 
-void buf_inspect_test_integer ()
+TEST_CASE(test__buf_inspect_integer)
 {
   BUF_INSPECT_TEST_INTEGER("0", "0");
   BUF_INSPECT_TEST_INTEGER("1234", "1234");
@@ -251,12 +251,12 @@ void buf_inspect_test_integer ()
 			   "123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131");
 }
 
-void buf_inspect_test_list ()
+TEST_CASE(test__buf_inspect_list)
 {
   BUF_INSPECT_TEST_LIST("()", "()");
 }
  
-void buf_inspect_test_str ()
+TEST_CASE(test__buf_inspect_str)
 {
   BUF_INSPECT_TEST_STR("", "\"\"");
   BUF_INSPECT_TEST_STR(" ", "\" \"");
@@ -294,7 +294,7 @@ void buf_inspect_test_str ()
   BUF_INSPECT_TEST_STR("éoπꝝ꒴𐅀🎳😄🟣🤩", "\"éoπꝝ꒴𐅀🎳😄🟣🤩\"");
 }
 
-void buf_inspect_test_str_character ()
+TEST_CASE(test__buf_inspect_str_character)
 {
   BUF_INSPECT_TEST_STR_CHARACTER(0, "\\0");
   BUF_INSPECT_TEST_STR_CHARACTER(1, "\\x01");
@@ -315,7 +315,7 @@ void buf_inspect_test_str_character ()
   BUF_INSPECT_TEST_STR_CHARACTER(129321, "🤩");
 }
 
-void buf_inspect_test_str_character_size ()
+TEST_CASE(test__buf_inspect_str_character_size)
 {
   BUF_INSPECT_TEST_STR_CHARACTER_SIZE(0, 2);
   BUF_INSPECT_TEST_STR_CHARACTER_SIZE(1, 4);
@@ -332,7 +332,7 @@ void buf_inspect_test_str_character_size ()
   BUF_INSPECT_TEST_STR_CHARACTER_SIZE(65856, 4);
 }
 
-void buf_inspect_test_tag ()
+TEST_CASE(test__buf_inspect_tag)
 {
   s_tag tag;
   tag_init(&tag);
diff --git a/test/buf_parse_test.c b/test/buf_parse_test.c
index 4c918ea..2e41749 100644
--- a/test/buf_parse_test.c
+++ b/test/buf_parse_test.c
@@ -672,7 +672,6 @@ void buf_parse_test_integer_oct ();
 void buf_parse_test_integer_bin ();
 void buf_parse_test_ident ();
 void buf_parse_test_list ();
-void buf_parse_test_s ();
 BUF_PARSE_TEST_S_PROTOTYPE(8);
 BUF_PARSE_TEST_S_PROTOTYPE(16);
 BUF_PARSE_TEST_S_PROTOTYPE(32);
@@ -684,7 +683,6 @@ void buf_parse_test_str_u8 ();
 void buf_parse_test_sym ();
 void buf_parse_test_tag ();
 void buf_parse_test_tuple ();
-void buf_parse_test_u ();
 BUF_PARSE_TEST_U_PROTOTYPE(8);
 BUF_PARSE_TEST_U_PROTOTYPE(16);
 BUF_PARSE_TEST_U_PROTOTYPE(32);
@@ -717,14 +715,60 @@ void buf_parse_test ()
   buf_parse_test_list();
   buf_parse_test_tag();
   buf_parse_test_tuple();
-  buf_parse_test_u();
+  buf_parse_test_u8_binary();
+  buf_parse_test_u8_octal();
+  buf_parse_test_u8_hexadecimal();
+  buf_parse_test_u8_decimal();
+  buf_parse_test_u16_binary();
+  buf_parse_test_u16_octal();
+  buf_parse_test_u16_hexadecimal();
+  buf_parse_test_u16_decimal();
+  buf_parse_test_u32_binary();
+  buf_parse_test_u32_octal();
+  buf_parse_test_u32_hexadecimal();
+  buf_parse_test_u32_decimal();
+  buf_parse_test_u64_binary();
+  buf_parse_test_u64_octal();
+  buf_parse_test_u64_hexadecimal();
+  buf_parse_test_u64_decimal();
   buf_parse_test_uw();
-  buf_parse_test_s();
+  buf_parse_test_s16_binary();
+  buf_parse_test_s16_binary_negative();
+  buf_parse_test_s16_octal();
+  buf_parse_test_s16_octal_negative();
+  buf_parse_test_s16_hexadecimal();
+  buf_parse_test_s16_hexadecimal_negative();
+  buf_parse_test_s16_decimal();
+  buf_parse_test_s16_decimal_negative();
+  buf_parse_test_s32_binary();
+  buf_parse_test_s32_binary_negative();
+  buf_parse_test_s32_octal();
+  buf_parse_test_s32_octal_negative();
+  buf_parse_test_s32_hexadecimal();
+  buf_parse_test_s32_hexadecimal_negative();
+  buf_parse_test_s32_decimal();
+  buf_parse_test_s32_decimal_negative();
+  buf_parse_test_s64_binary();
+  buf_parse_test_s64_binary_negative();
+  buf_parse_test_s64_octal();
+  buf_parse_test_s64_octal_negative();
+  buf_parse_test_s64_hexadecimal();
+  buf_parse_test_s64_hexadecimal_negative();
+  buf_parse_test_s64_decimal();
+  buf_parse_test_s64_decimal_negative();
+  buf_parse_test_s8_binary();
+  buf_parse_test_s8_binary_negative();
+  buf_parse_test_s8_octal();
+  buf_parse_test_s8_octal_negative();
+  buf_parse_test_s8_hexadecimal();
+  buf_parse_test_s8_hexadecimal_negative();
+  buf_parse_test_s8_decimal();
+  buf_parse_test_s8_decimal_negative();
   buf_parse_test_sw();
   buf_parse_test_cfn();
 }
 
-void buf_parse_test_bool ()
+TEST_CASE(test__buf_parse_bool)
 {
   BUF_PARSE_TEST_NOT_BOOL("0");
   BUF_PARSE_TEST_NOT_BOOL("1");
@@ -743,7 +787,7 @@ void buf_parse_test_bool ()
   BUF_PARSE_TEST_BOOL("true", 1);
 }
 
-void buf_parse_test_call ()
+TEST_CASE(test__buf_parse_call)
 {
   BUF_PARSE_TEST_NOT_CALL("0");
   BUF_PARSE_TEST_NOT_CALL("9");
@@ -769,7 +813,7 @@ void buf_parse_test_call ()
   BUF_PARSE_TEST_CALL("a(B.c(D.e(f, g), H.i(j, k)))");
 }
 
-void buf_parse_test_call_op ()
+TEST_CASE(test__buf_parse_call_op)
 {
   BUF_PARSE_TEST_CALL_OP("1 + 2");
   /*
@@ -780,7 +824,7 @@ void buf_parse_test_call_op ()
   */
 }
 
-void buf_parse_test_cfn ()
+TEST_CASE(test__buf_parse_cfn)
 {
   BUF_PARSE_TEST_NOT_CFN("0");
   BUF_PARSE_TEST_NOT_CFN("9");
@@ -794,7 +838,7 @@ void buf_parse_test_cfn ()
   BUF_PARSE_TEST_CFN("cfn :tag \"tag_add\" (:tag, :tag, :tag)");
 }
 
-void buf_parse_test_character ()
+TEST_CASE(test__buf_parse_character)
 {
   BUF_PARSE_TEST_NOT_CHARACTER("\x01");
   BUF_PARSE_TEST_NOT_CHARACTER("\xFF");
@@ -864,7 +908,7 @@ void buf_parse_test_character ()
   BUF_PARSE_TEST_CHARACTER("'𐅀'", 65856);
 }
 
-void buf_parse_test_digit_bin ()
+TEST_CASE(test__buf_parse_digit_bin)
 {
   BUF_PARSE_TEST_NOT_DIGIT_BIN("\x01");
   BUF_PARSE_TEST_NOT_DIGIT_BIN("\x02");
@@ -881,7 +925,7 @@ void buf_parse_test_digit_bin ()
   BUF_PARSE_TEST_DIGIT_BIN("1", 1);
 }
 
-void buf_parse_test_digit_hex ()
+TEST_CASE(test__buf_parse_digit_hex)
 {
   BUF_PARSE_TEST_NOT_DIGIT_HEX("\x01");
   BUF_PARSE_TEST_NOT_DIGIT_HEX("\x02");
@@ -902,7 +946,7 @@ void buf_parse_test_digit_hex ()
   BUF_PARSE_TEST_DIGIT_HEX("f", 0x0F);
 }
 
-void buf_parse_test_digit_oct ()
+TEST_CASE(test__buf_parse_digit_oct)
 {
   BUF_PARSE_TEST_NOT_DIGIT_OCT("\x01");
   BUF_PARSE_TEST_NOT_DIGIT_OCT("\x02");
@@ -919,7 +963,7 @@ void buf_parse_test_digit_oct ()
   BUF_PARSE_TEST_DIGIT_OCT("7", 7);
 }
 
-void buf_parse_test_digit_dec ()
+TEST_CASE(test__buf_parse_digit_dec)
 {
   BUF_PARSE_TEST_NOT_DIGIT_DEC("\x01");
   BUF_PARSE_TEST_NOT_DIGIT_DEC("\x02");
@@ -947,14 +991,14 @@ void buf_parse_test_f64()
 {
 }
 
-void buf_parse_test_fn ()
+TEST_CASE(test__buf_parse_fn)
 {
   BUF_PARSE_TEST_FN("fn () { () }");
   BUF_PARSE_TEST_FN("fn (x) { x }");
   BUF_PARSE_TEST_FN("fn (x, y) { x }");
 }
 
-void buf_parse_test_ident ()
+TEST_CASE(test__buf_parse_ident)
 {
   BUF_PARSE_TEST_NOT_IDENT("0");
   BUF_PARSE_TEST_NOT_IDENT("9");
@@ -1009,7 +1053,7 @@ void buf_parse_test_ident ()
   BUF_PARSE_TEST_IDENT("Module.ident_az09AZ", "ident_az09AZ");
 }
 
-void buf_parse_test_integer ()
+TEST_CASE(test__buf_parse_integer)
 {
   BUF_PARSE_TEST_NOT_INTEGER("-");
   BUF_PARSE_TEST_NOT_INTEGER("A");
@@ -1057,7 +1101,7 @@ void buf_parse_test_integer ()
   BUF_PARSE_TEST_INTEGER("0O100");
 }
 
-void buf_parse_test_integer_bin ()
+TEST_CASE(test__buf_parse_integer_bin)
 {
   BUF_PARSE_TEST_NOT_INTEGER_UNSIGNED_BIN("A");
   BUF_PARSE_TEST_NOT_INTEGER_UNSIGNED_BIN("STR");
@@ -1103,7 +1147,7 @@ void buf_parse_test_integer_oct()
   BUF_PARSE_TEST_INTEGER_UNSIGNED_OCT("777");
 }
 
-void buf_parse_test_list ()
+TEST_CASE(test__buf_parse_list)
 {
   BUF_PARSE_TEST_LIST("()");
   BUF_PARSE_TEST_LIST("((), ())");
@@ -1115,48 +1159,12 @@ void buf_parse_test_list ()
   BUF_PARSE_TEST_LIST("(a, b, c | d)");
 }
 
-void buf_parse_test_s ()
-{
-  buf_parse_test_s16_binary();
-  buf_parse_test_s16_binary_negative();
-  buf_parse_test_s16_octal();
-  buf_parse_test_s16_octal_negative();
-  buf_parse_test_s16_hexadecimal();
-  buf_parse_test_s16_hexadecimal_negative();
-  buf_parse_test_s16_decimal();
-  buf_parse_test_s16_decimal_negative();
-  buf_parse_test_s32_binary();
-  buf_parse_test_s32_binary_negative();
-  buf_parse_test_s32_octal();
-  buf_parse_test_s32_octal_negative();
-  buf_parse_test_s32_hexadecimal();
-  buf_parse_test_s32_hexadecimal_negative();
-  buf_parse_test_s32_decimal();
-  buf_parse_test_s32_decimal_negative();
-  buf_parse_test_s64_binary();
-  buf_parse_test_s64_binary_negative();
-  buf_parse_test_s64_octal();
-  buf_parse_test_s64_octal_negative();
-  buf_parse_test_s64_hexadecimal();
-  buf_parse_test_s64_hexadecimal_negative();
-  buf_parse_test_s64_decimal();
-  buf_parse_test_s64_decimal_negative();
-  buf_parse_test_s8_binary();
-  buf_parse_test_s8_binary_negative();
-  buf_parse_test_s8_octal();
-  buf_parse_test_s8_octal_negative();
-  buf_parse_test_s8_hexadecimal();
-  buf_parse_test_s8_hexadecimal_negative();
-  buf_parse_test_s8_decimal();
-  buf_parse_test_s8_decimal_negative();
-}
-
-void buf_parse_test_sw ()
+TEST_CASE(test__buf_parse_sw)
 {
 }
 
 
-void buf_parse_test_str ()
+TEST_CASE(test__buf_parse_str)
 {
   BUF_PARSE_TEST_NOT_STR("");
   BUF_PARSE_TEST_NOT_STR("\x00");
@@ -1204,7 +1212,7 @@ void buf_parse_test_str ()
   BUF_PARSE_TEST_STR("\"ꇤ\"", "ꇤ");
 }
 
-void buf_parse_test_str_character ()
+TEST_CASE(test__buf_parse_str_character)
 {
   BUF_PARSE_TEST_STR_CHARACTER("0", '0');
   BUF_PARSE_TEST_STR_CHARACTER("9", '9');
@@ -1231,7 +1239,7 @@ void buf_parse_test_str_character ()
   BUF_PARSE_TEST_STR_CHARACTER("🤩", 129321);
 }
 
-void buf_parse_test_str_u8 ()
+TEST_CASE(test__buf_parse_str_u8)
 {
   BUF_PARSE_TEST_STR_U8_EOF("");
   BUF_PARSE_TEST_STR_U8("\x01", 1, 0x01);
@@ -1270,7 +1278,7 @@ void buf_parse_test_str_u8 ()
   BUF_PARSE_TEST_STR_U8("\\xFF8", 4, 0xFF);
 }
 
-void buf_parse_test_sym ()
+TEST_CASE(test__buf_parse_sym)
 {
   BUF_PARSE_TEST_NOT_SYM("0");
   BUF_PARSE_TEST_NOT_SYM("9");
@@ -1297,14 +1305,14 @@ void buf_parse_test_sym ()
   BUF_PARSE_TEST_SYM(":az09AZ", "az09AZ");
 }
 
-void buf_parse_test_tag ()
+TEST_CASE(test__buf_parse_tag)
 {
   BUF_PARSE_TEST_TAG("x");
   BUF_PARSE_TEST_TAG("_x");
   BUF_PARSE_TEST_TAG("(x | _y)");
 }
 
-void buf_parse_test_tuple ()
+TEST_CASE(test__buf_parse_tuple)
 {
   BUF_PARSE_TEST_TUPLE("{a, b}");
   BUF_PARSE_TEST_TUPLE("{a, b, c}");
@@ -1315,26 +1323,10 @@ void buf_parse_test_tuple ()
   BUF_PARSE_TEST_TUPLE("{{a, b}, {c, d}}");
 }
 
-void buf_parse_test_u ()
+TEST_CASE(test__buf_parse_u)
 {
-  buf_parse_test_u8_binary();
-  buf_parse_test_u8_octal();
-  buf_parse_test_u8_hexadecimal();
-  buf_parse_test_u8_decimal();
-  buf_parse_test_u16_binary();
-  buf_parse_test_u16_octal();
-  buf_parse_test_u16_hexadecimal();
-  buf_parse_test_u16_decimal();
-  buf_parse_test_u32_binary();
-  buf_parse_test_u32_octal();
-  buf_parse_test_u32_hexadecimal();
-  buf_parse_test_u32_decimal();
-  buf_parse_test_u64_binary();
-  buf_parse_test_u64_octal();
-  buf_parse_test_u64_hexadecimal();
-  buf_parse_test_u64_decimal();
 }
 
-void buf_parse_test_uw ()
+TEST_CASE(test__buf_parse_uw)
 {
 }
diff --git a/test/buf_parse_test_s16.c b/test/buf_parse_test_s16.c
index 9c1c140..8768b77 100644
--- a/test/buf_parse_test_s16.c
+++ b/test/buf_parse_test_s16.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_s16_binary ()
+TEST_CASE(test__buf_parse_s16_binary)
 {
   BUF_PARSE_TEST_S(16, "0b0",   0);
   BUF_PARSE_TEST_S(16, "0b00",  0);
@@ -34,7 +34,7 @@ void buf_parse_test_s16_binary ()
   BUF_PARSE_TEST_S(16, "0b111111111111111", 32767);
 }
 
-void buf_parse_test_s16_binary_negative ()
+TEST_CASE(test__buf_parse_s16_binary_negative)
 {
   BUF_PARSE_TEST_S(16, "-0b0",    0);
   BUF_PARSE_TEST_S(16, "-0b00",   0);
@@ -56,7 +56,7 @@ void buf_parse_test_s16_binary_negative ()
   BUF_PARSE_TEST_S(16, "-0b1000000000000000", -32768);
 }
 
-void buf_parse_test_s16_octal ()
+TEST_CASE(test__buf_parse_s16_octal)
 {
   BUF_PARSE_TEST_S(16, "0o0",   0);
   BUF_PARSE_TEST_S(16, "0o00",  0);
@@ -646,7 +646,7 @@ void buf_parse_test_s16_octal ()
   BUF_PARSE_TEST_S(16, "0o77777", 32767);
 }
 
-void buf_parse_test_s16_octal_negative ()
+TEST_CASE(test__buf_parse_s16_octal_negative)
 {
   BUF_PARSE_TEST_S(16, "-0o0",    0);
   BUF_PARSE_TEST_S(16, "-0o00",   0);
@@ -1236,7 +1236,7 @@ void buf_parse_test_s16_octal_negative ()
   BUF_PARSE_TEST_S(16, "-0o100000", -32768);
 }
 
-void buf_parse_test_s16_hexadecimal ()
+TEST_CASE(test__buf_parse_s16_hexadecimal)
 {
   BUF_PARSE_TEST_S(16, "0x0",   0);
   BUF_PARSE_TEST_S(16, "0x00",  0);
@@ -8870,7 +8870,7 @@ void buf_parse_test_s16_hexadecimal ()
   BUF_PARSE_TEST_S(16, "0x7FFF", 32767);
 }
 
-void buf_parse_test_s16_hexadecimal_negative ()
+TEST_CASE(test__buf_parse_s16_hexadecimal_negative)
 {
   BUF_PARSE_TEST_S(16, "-0x0",    0);
   BUF_PARSE_TEST_S(16, "-0x00",   0);
@@ -16503,7 +16503,7 @@ void buf_parse_test_s16_hexadecimal_negative ()
   BUF_PARSE_TEST_S(16, "-0x8000", -32768);
 }
 
-void buf_parse_test_s16_decimal ()
+TEST_CASE(test__buf_parse_s16_decimal)
 {
   BUF_PARSE_TEST_S(16, "0",   0);
   BUF_PARSE_TEST_S(16, "00",  0);
@@ -17619,7 +17619,7 @@ void buf_parse_test_s16_decimal ()
   BUF_PARSE_TEST_S(16, "32767", 32767);
 }
 
-void buf_parse_test_s16_decimal_negative ()
+TEST_CASE(test__buf_parse_s16_decimal_negative)
 {
   BUF_PARSE_TEST_S(16, "-0",    0);
   BUF_PARSE_TEST_S(16, "-00",   0);
diff --git a/test/buf_parse_test_s32.c b/test/buf_parse_test_s32.c
index e7c1ccb..5f82007 100644
--- a/test/buf_parse_test_s32.c
+++ b/test/buf_parse_test_s32.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_s32_binary ()
+TEST_CASE(test__buf_parse_s32_binary)
 {
   BUF_PARSE_TEST_S(32, "0b0",   0);
   BUF_PARSE_TEST_S(32, "0b00",  0);
@@ -36,7 +36,7 @@ void buf_parse_test_s32_binary ()
   BUF_PARSE_TEST_S(32, "0b1111111111111111111111111111111", 2147483647);
 }
 
-void buf_parse_test_s32_binary_negative ()
+TEST_CASE(test__buf_parse_s32_binary_negative)
 {
   BUF_PARSE_TEST_S(32, "-0b0",    0);
   BUF_PARSE_TEST_S(32, "-0b00",   0);
@@ -60,7 +60,7 @@ void buf_parse_test_s32_binary_negative ()
   BUF_PARSE_TEST_S(32, "-0b10000000000000000000000000000000", -2147483648);
 }
 
-void buf_parse_test_s32_octal ()
+TEST_CASE(test__buf_parse_s32_octal)
 {
   BUF_PARSE_TEST_S(32, "0o0",   0);
   BUF_PARSE_TEST_S(32, "0o00",  0);
@@ -652,7 +652,7 @@ void buf_parse_test_s32_octal ()
   BUF_PARSE_TEST_S(32, "0o17777777777", 2147483647);
 }
 
-void buf_parse_test_s32_octal_negative ()
+TEST_CASE(test__buf_parse_s32_octal_negative)
 {
   BUF_PARSE_TEST_S(32, "-0o0",    0);
   BUF_PARSE_TEST_S(32, "-0o00",   0);
@@ -1244,7 +1244,7 @@ void buf_parse_test_s32_octal_negative ()
   BUF_PARSE_TEST_S(32, "-0o20000000000", -2147483648);
 }
 
-void buf_parse_test_s32_hexadecimal ()
+TEST_CASE(test__buf_parse_s32_hexadecimal)
 {
   BUF_PARSE_TEST_S(32, "0x0",   0);
   BUF_PARSE_TEST_S(32, "0x00",  0);
@@ -8882,7 +8882,7 @@ void buf_parse_test_s32_hexadecimal ()
   BUF_PARSE_TEST_S(32, "0x7FFFFFFF", 2147483647);
 }
 
-void buf_parse_test_s32_hexadecimal_negative ()
+TEST_CASE(test__buf_parse_s32_hexadecimal_negative)
 {
   BUF_PARSE_TEST_S(32, "-0x0",    0);
   BUF_PARSE_TEST_S(32, "-0x00",   0);
@@ -16518,7 +16518,7 @@ void buf_parse_test_s32_hexadecimal_negative ()
   BUF_PARSE_TEST_S(32, "-0x80000000", -2147483648);
 }
 
-void buf_parse_test_s32_decimal ()
+TEST_CASE(test__buf_parse_s32_decimal)
 {
   BUF_PARSE_TEST_S(32, "0",   0);
   BUF_PARSE_TEST_S(32, "00",  0);
@@ -17636,7 +17636,7 @@ void buf_parse_test_s32_decimal ()
   BUF_PARSE_TEST_S(32, "2147483647", 2147483647);
 }
 
-void buf_parse_test_s32_decimal_negative ()
+TEST_CASE(test__buf_parse_s32_decimal_negative)
 {
   BUF_PARSE_TEST_S(32, "-0",    0);
   BUF_PARSE_TEST_S(32, "-00",   0);
diff --git a/test/buf_parse_test_s64.c b/test/buf_parse_test_s64.c
index f332588..b1b056c 100644
--- a/test/buf_parse_test_s64.c
+++ b/test/buf_parse_test_s64.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_s64_binary ()
+TEST_CASE(test__buf_parse_s64_binary)
 {
   BUF_PARSE_TEST_S(64, "0b0",   0);
   BUF_PARSE_TEST_S(64, "0b00",  0);
@@ -38,7 +38,7 @@ void buf_parse_test_s64_binary ()
   BUF_PARSE_TEST_S(64, "0b111111111111111111111111111111111111111111111111111111111111111", 9223372036854775807);
 }
 
-void buf_parse_test_s64_binary_negative ()
+TEST_CASE(test__buf_parse_s64_binary_negative)
 {
   BUF_PARSE_TEST_S(64, "-0b0",    0);
   BUF_PARSE_TEST_S(64, "-0b00",   0);
@@ -64,7 +64,7 @@ void buf_parse_test_s64_binary_negative ()
   BUF_PARSE_TEST_S(64, "-0b1000000000000000000000000000000000000000000000000000000000000000", -9223372036854775807 - 1);
 }
 
-void buf_parse_test_s64_octal ()
+TEST_CASE(test__buf_parse_s64_octal)
 {
   BUF_PARSE_TEST_S(64, "0o0",   0);
   BUF_PARSE_TEST_S(64, "0o00",  0);
@@ -658,7 +658,7 @@ void buf_parse_test_s64_octal ()
   BUF_PARSE_TEST_S(64, "0o777777777777777777777", 9223372036854775807);
 }
 
-void buf_parse_test_s64_octal_negative ()
+TEST_CASE(test__buf_parse_s64_octal_negative)
 {
   BUF_PARSE_TEST_S(64, "-0o0",    0);
   BUF_PARSE_TEST_S(64, "-0o00",   0);
@@ -1252,7 +1252,7 @@ void buf_parse_test_s64_octal_negative ()
   BUF_PARSE_TEST_S(64, "-0o1000000000000000000000", -9223372036854775807 - 1);
 }
 
-void buf_parse_test_s64_hexadecimal ()
+TEST_CASE(test__buf_parse_s64_hexadecimal)
 {
   BUF_PARSE_TEST_S(64, "0x0",   0);
   BUF_PARSE_TEST_S(64, "0x00",  0);
@@ -8894,7 +8894,7 @@ void buf_parse_test_s64_hexadecimal ()
   BUF_PARSE_TEST_S(64, "0x7FFFFFFFFFFFFFFF", 9223372036854775807);
 }
 
-void buf_parse_test_s64_hexadecimal_negative ()
+TEST_CASE(test__buf_parse_s64_hexadecimal_negative)
 {
   BUF_PARSE_TEST_S(64, "-0x0",    0);
   BUF_PARSE_TEST_S(64, "-0x00",   0);
@@ -16533,7 +16533,7 @@ void buf_parse_test_s64_hexadecimal_negative ()
   BUF_PARSE_TEST_S(64, "-0x8000000000000000", -9223372036854775807 - 1);
 }
 
-void buf_parse_test_s64_decimal ()
+TEST_CASE(test__buf_parse_s64_decimal)
 {
   BUF_PARSE_TEST_S(64, "0",   0);
   BUF_PARSE_TEST_S(64, "00",  0);
@@ -17653,7 +17653,7 @@ void buf_parse_test_s64_decimal ()
   BUF_PARSE_TEST_S(64, "9223372036854775807", 9223372036854775807);
 }
 
-void buf_parse_test_s64_decimal_negative ()
+TEST_CASE(test__buf_parse_s64_decimal_negative)
 {
   BUF_PARSE_TEST_S(64, "-0",    0);
   BUF_PARSE_TEST_S(64, "-00",   0);
diff --git a/test/buf_parse_test_s8.c b/test/buf_parse_test_s8.c
index d62cbd8..2d8ba56 100644
--- a/test/buf_parse_test_s8.c
+++ b/test/buf_parse_test_s8.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_s8_binary ()
+TEST_CASE(test__buf_parse_s8_binary)
 {
   BUF_PARSE_TEST_S(8, "0b0",   0);
   BUF_PARSE_TEST_S(8, "0b00",  0);
@@ -32,7 +32,7 @@ void buf_parse_test_s8_binary ()
   BUF_PARSE_TEST_S(8, "0b1111111", 127);
 }
 
-void buf_parse_test_s8_binary_negative ()
+TEST_CASE(test__buf_parse_s8_binary_negative)
 {
   BUF_PARSE_TEST_S(8, "-0b0",    0);
   BUF_PARSE_TEST_S(8, "-0b00",   0);
@@ -52,7 +52,7 @@ void buf_parse_test_s8_binary_negative ()
   BUF_PARSE_TEST_S(8, "-0b10000000", -128);
 }
 
-void buf_parse_test_s8_octal ()
+TEST_CASE(test__buf_parse_s8_octal)
 {
   BUF_PARSE_TEST_S(8, "0o0",   0);
   BUF_PARSE_TEST_S(8, "0o00",  0);
@@ -256,7 +256,7 @@ void buf_parse_test_s8_octal ()
   BUF_PARSE_TEST_S(8, "0o177", 127);
 }
 
-void buf_parse_test_s8_octal_negative ()
+TEST_CASE(test__buf_parse_s8_octal_negative)
 {
   BUF_PARSE_TEST_S(8, "-0o0",    0);
   BUF_PARSE_TEST_S(8, "-0o00",   0);
@@ -461,7 +461,7 @@ void buf_parse_test_s8_octal_negative ()
   BUF_PARSE_TEST_S(8, "-0o200", -128);
 }
 
-void buf_parse_test_s8_hexadecimal ()
+TEST_CASE(test__buf_parse_s8_hexadecimal)
 {
   BUF_PARSE_TEST_S(8, "0x0",   0);
   BUF_PARSE_TEST_S(8, "0x00",  0);
@@ -839,7 +839,7 @@ void buf_parse_test_s8_hexadecimal ()
   BUF_PARSE_TEST_S(8, "0x07F", 127);
 }
 
-void buf_parse_test_s8_hexadecimal_negative ()
+TEST_CASE(test__buf_parse_s8_hexadecimal_negative)
 {
   BUF_PARSE_TEST_S(8, "-0x0",    0);
   BUF_PARSE_TEST_S(8, "-0x00",   0);
@@ -1219,7 +1219,7 @@ void buf_parse_test_s8_hexadecimal_negative ()
   BUF_PARSE_TEST_S(8, "-0x080", -128);
 }
 
-void buf_parse_test_s8_decimal ()
+TEST_CASE(test__buf_parse_s8_decimal)
 {
   BUF_PARSE_TEST_S(8, "0",   0);
   BUF_PARSE_TEST_S(8, "00",  0);
@@ -1461,7 +1461,7 @@ void buf_parse_test_s8_decimal ()
   BUF_PARSE_TEST_S(8, "127", 127);
 }
 
-void buf_parse_test_s8_decimal_negative ()
+TEST_CASE(test__buf_parse_s8_decimal_negative)
 {
   BUF_PARSE_TEST_S(8, "-0",    0);
   BUF_PARSE_TEST_S(8, "-00",   0);
diff --git a/test/buf_parse_test_u16.c b/test/buf_parse_test_u16.c
index 440fb19..8745192 100644
--- a/test/buf_parse_test_u16.c
+++ b/test/buf_parse_test_u16.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_u16_binary ()
+TEST_CASE(test__buf_parse_u16_binary)
 {
   BUF_PARSE_TEST_U(16, "0b0",   0U);
   BUF_PARSE_TEST_U(16, "0b00",  0U);
@@ -34,7 +34,7 @@ void buf_parse_test_u16_binary ()
   BUF_PARSE_TEST_U(16, "0b1111111111111111", 65535U);
 }
 
-void buf_parse_test_u16_octal ()
+TEST_CASE(test__buf_parse_u16_octal)
 {
   BUF_PARSE_TEST_U(16, "0o0",   0U);
   BUF_PARSE_TEST_U(16, "0o00",  0U);
@@ -624,7 +624,7 @@ void buf_parse_test_u16_octal ()
   BUF_PARSE_TEST_U(16, "0o177777", 65535U);
 }
 
-void buf_parse_test_u16_hexadecimal ()
+TEST_CASE(test__buf_parse_u16_hexadecimal)
 {
   BUF_PARSE_TEST_U(16, "0x0",   0U);
   BUF_PARSE_TEST_U(16, "0x00",  0U);
@@ -8258,7 +8258,7 @@ void buf_parse_test_u16_hexadecimal ()
   BUF_PARSE_TEST_U(16, "0xFFFF", 65535U);
 }
 
-void buf_parse_test_u16_decimal ()
+TEST_CASE(test__buf_parse_u16_decimal)
 {
   BUF_PARSE_TEST_U(16, "0",   0U);
   BUF_PARSE_TEST_U(16, "00",  0U);
diff --git a/test/buf_parse_test_u32.c b/test/buf_parse_test_u32.c
index d0c969d..cf3d5c0 100644
--- a/test/buf_parse_test_u32.c
+++ b/test/buf_parse_test_u32.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_u32_binary ()
+TEST_CASE(test__buf_parse_u32_binary)
 {
   BUF_PARSE_TEST_U(32, "0b0",   0U);
   BUF_PARSE_TEST_U(32, "0b00",  0U);
@@ -36,7 +36,7 @@ void buf_parse_test_u32_binary ()
   BUF_PARSE_TEST_U(32, "0b11111111111111111111111111111111", 4294967295U);
 }
 
-void buf_parse_test_u32_octal ()
+TEST_CASE(test__buf_parse_u32_octal)
 {
   BUF_PARSE_TEST_U(32, "0o0",   0U);
   BUF_PARSE_TEST_U(32, "0o00",  0U);
@@ -628,7 +628,7 @@ void buf_parse_test_u32_octal ()
   BUF_PARSE_TEST_U(32, "0o37777777777", 4294967295U);
 }
 
-void buf_parse_test_u32_hexadecimal ()
+TEST_CASE(test__buf_parse_u32_hexadecimal)
 {
   BUF_PARSE_TEST_U(32, "0x0",   0U);
   BUF_PARSE_TEST_U(32, "0x00",  0U);
@@ -8266,7 +8266,7 @@ void buf_parse_test_u32_hexadecimal ()
   BUF_PARSE_TEST_U(32, "0xFFFFFFFF", 4294967295U);
 }
 
-void buf_parse_test_u32_decimal ()
+TEST_CASE(test__buf_parse_u32_decimal)
 {
   BUF_PARSE_TEST_U(32, "0",   0U);
   BUF_PARSE_TEST_U(32, "00",  0U);
diff --git a/test/buf_parse_test_u64.c b/test/buf_parse_test_u64.c
index aff22f4..a5a9eef 100644
--- a/test/buf_parse_test_u64.c
+++ b/test/buf_parse_test_u64.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_u64_binary ()
+TEST_CASE(test__buf_parse_u64_binary)
 {
   BUF_PARSE_TEST_U(64, "0b0",   0U);
   BUF_PARSE_TEST_U(64, "0b00",  0U);
@@ -38,7 +38,7 @@ void buf_parse_test_u64_binary ()
   BUF_PARSE_TEST_U(64, "0b1111111111111111111111111111111111111111111111111111111111111111", 18446744073709551615U);
 }
 
-void buf_parse_test_u64_octal ()
+TEST_CASE(test__buf_parse_u64_octal)
 {
   BUF_PARSE_TEST_U(64, "0o0",   0U);
   BUF_PARSE_TEST_U(64, "0o00",  0U);
@@ -632,7 +632,7 @@ void buf_parse_test_u64_octal ()
   BUF_PARSE_TEST_U(64, "0o1777777777777777777777", 18446744073709551615U);
 }
 
-void buf_parse_test_u64_hexadecimal ()
+TEST_CASE(test__buf_parse_u64_hexadecimal)
 {
   BUF_PARSE_TEST_U(64, "0x0",   0U);
   BUF_PARSE_TEST_U(64, "0x00",  0U);
@@ -8274,7 +8274,7 @@ void buf_parse_test_u64_hexadecimal ()
   BUF_PARSE_TEST_U(64, "0xFFFFFFFFFFFFFFFF", 18446744073709551615U);
 }
 
-void buf_parse_test_u64_decimal ()
+TEST_CASE(test__buf_parse_u64_decimal)
 {
   BUF_PARSE_TEST_U(64, "0",   0U);
   BUF_PARSE_TEST_U(64, "00",  0U);
diff --git a/test/buf_parse_test_u8.c b/test/buf_parse_test_u8.c
index 47ca153..985920a 100644
--- a/test/buf_parse_test_u8.c
+++ b/test/buf_parse_test_u8.c
@@ -12,7 +12,7 @@
  */
 #include "buf_parse_test.h"
 
-void buf_parse_test_u8_binary ()
+TEST_CASE(test__buf_parse_u8_binary)
 {
   BUF_PARSE_TEST_U(8, "0b0",   0U);
   BUF_PARSE_TEST_U(8, "0b00",  0U);
@@ -32,7 +32,7 @@ void buf_parse_test_u8_binary ()
   BUF_PARSE_TEST_U(8, "0b11111111", 255U);
 }
 
-void buf_parse_test_u8_octal ()
+TEST_CASE(test__buf_parse_u8_octal)
 {
   BUF_PARSE_TEST_U(8, "0o0",   0U);
   BUF_PARSE_TEST_U(8, "0o00",  0U);
@@ -364,7 +364,7 @@ void buf_parse_test_u8_octal ()
   BUF_PARSE_TEST_U(8, "0o377", 255U);
 }
 
-void buf_parse_test_u8_hexadecimal ()
+TEST_CASE(test__buf_parse_u8_hexadecimal)
 {
   BUF_PARSE_TEST_U(8, "0x0",   0U);
   BUF_PARSE_TEST_U(8, "0x00",  0U);
@@ -1214,7 +1214,7 @@ void buf_parse_test_u8_hexadecimal ()
   BUF_PARSE_TEST_U(8, "0x0FF", 255U);
 }
 
-void buf_parse_test_u8_decimal ()
+TEST_CASE(test__buf_parse_u8_decimal)
 {
   BUF_PARSE_TEST_U(8, "0",   0U);
   BUF_PARSE_TEST_U(8, "00",  0U);
diff --git a/test/buf_test.c b/test/buf_test.c
index bc4c297..4adc0f4 100644
--- a/test/buf_test.c
+++ b/test/buf_test.c
@@ -211,7 +211,7 @@ void buf_test ()
   buf_test_ignore();
 }
 
-void buf_test_f ()
+TEST_CASE(test__buf_f)
 {
   s8 b[32];
   s_buf buf;
@@ -228,7 +228,7 @@ void buf_test_f ()
              "ÉoàΠ꒴𐅀 \n\r\t\v\\\"");
 }
 
-void buf_test_ignore ()
+TEST_CASE(test__buf_ignore)
 {
   BUF_TEST_IGNORE("", 0, 0);
   BUF_TEST_IGNORE("", 1, -1);
@@ -248,7 +248,7 @@ void buf_test_ignore ()
   BUF_TEST_IGNORE("1234567890", 10, 10);
 }
 
-void buf_test_init_clean ()
+TEST_CASE(test__buf_init_clean)
 {
   char a[4] = "test";
   size_t len;
@@ -272,7 +272,7 @@ void buf_test_init_clean ()
   BUF_TEST_CLEAN(buf);
 }
 
-void buf_test_new_delete ()
+TEST_CASE(test__buf_new_delete)
 {
   char a[4] = "test";
   size_t len;
@@ -296,7 +296,7 @@ void buf_test_new_delete ()
   BUF_TEST_DELETE(buf);
 }
 
-void buf_test_new_alloc_delete ()
+TEST_CASE(test__buf_new_alloc_delete)
 {
   size_t len;
   s_buf *buf;
@@ -311,7 +311,7 @@ void buf_test_new_alloc_delete ()
   }
 }
 
-void buf_test_peek_1 ()
+TEST_CASE(test__buf_peek_1)
 {
   BUF_TEST_PEEK_1("");
   BUF_TEST_PEEK_1("\x01");
@@ -336,12 +336,12 @@ void buf_test_peek_1 ()
   BUF_TEST_PEEK_1("\x01\x02\x03" "ABCabcÀÉΠꝜ꒴𐅀àéπꝝ");
 }
 
-void buf_test_peek_character_utf8 ()
+TEST_CASE(test__buf_peek_character_utf8)
 {
   BUF_TEST_PEEK_CHARACTER_UTF8("0", 1, '0');
 }
 
-void buf_test_peek_s8 ()
+TEST_CASE(test__buf_peek_s8)
 {
   char a[4] = "ABCD";
   s_buf buf;
@@ -357,7 +357,7 @@ void buf_test_peek_s8 ()
   TEST_EQ(buf.wpos, 1);
 }
 
-void buf_test_peek_s16 ()
+TEST_CASE(test__buf_peek_s16)
 {
   s8 b[8];
   s_buf buf;
@@ -371,7 +371,7 @@ void buf_test_peek_s16 ()
   TEST_EQ(buf.rpos, 0);
 }
 
-void buf_test_peek_u8 ()
+TEST_CASE(test__buf_peek_u8)
 {
   char a[4] = "ABCD";
   s_buf buf;
@@ -387,7 +387,7 @@ void buf_test_peek_u8 ()
   TEST_EQ(buf.wpos, 1);
 }
 
-void buf_test_read_1 ()
+TEST_CASE(test__buf_read_1)
 {
   BUF_TEST_READ_1("");
   BUF_TEST_READ_1("\x01");
@@ -417,7 +417,7 @@ void buf_test_read_1 ()
   BUF_TEST_READ_1_("abc", "", 0);
 }
 
-void buf_test_read_character_utf8 ()
+TEST_CASE(test__buf_read_character_utf8)
 {
   BUF_TEST_READ_CHARACTER_UTF8("0", '0');
   BUF_TEST_READ_CHARACTER_UTF8("9", '9');
@@ -459,7 +459,7 @@ void buf_test_read_f32()
   buf_clean(&buf);
 }
 
-void buf_test_read_f64 ()
+TEST_CASE(test__buf_read_f64)
 {
   s8 b[32];
   s_buf buf;
@@ -487,7 +487,7 @@ void buf_test_read_f64 ()
   TEST_DOUBLE_EQ(f, DBL_MAX);
 }
 
-void buf_test_read_s8 ()
+TEST_CASE(test__buf_read_s8)
 {
   char a[8] = "ABCDEFGH";
   s_buf buf;
@@ -530,7 +530,7 @@ void buf_test_read_s8 ()
   buf_clean(&buf);
 }
 
-void buf_test_read_s16 ()
+TEST_CASE(test__buf_read_s16)
 {
   s8 b[8];
   s_buf buf;
@@ -612,7 +612,7 @@ void buf_test_read_s64()
   buf_clean(&buf);
 }
 
-void buf_test_read_to_str ()
+TEST_CASE(test__buf_read_to_str)
 {
   BUF_TEST_READ_TO_STR("");
   BUF_TEST_READ_TO_STR("0");
@@ -628,7 +628,7 @@ void buf_test_read_to_str ()
   BUF_TEST_READ_TO_STR("09AZÀÉazàé");
 }
 
-void buf_test_read_u8 ()
+TEST_CASE(test__buf_read_u8)
 {
   s_buf buf;
   u8 byte;
@@ -740,7 +740,7 @@ void buf_test_read_u64()
   buf_clean(&buf);
 }
 
-void buf_test_write_s8 ()
+TEST_CASE(test__buf_write_s8)
 {
   s8 b[4];
   s_buf buf;
@@ -763,7 +763,7 @@ void buf_test_write_s8 ()
   TEST_EQ(buf.ptr.ps8[3], -1);
 }
 
-void buf_test_write_s16 ()
+TEST_CASE(test__buf_write_s16)
 {
   s8 b[8];
   s_buf buf;
@@ -786,7 +786,7 @@ void buf_test_write_s16 ()
   TEST_EQ(*((s16 *) (buf.ptr.ps8 + 6)), -1);
 }
 
-void buf_test_write_s32 ()
+TEST_CASE(test__buf_write_s32)
 {
   s8 b[16];
   s_buf buf;
@@ -809,7 +809,7 @@ void buf_test_write_s32 ()
   TEST_EQ(*((s32 *) (buf.ptr.ps8 + 12)), -1);
 }
 
-void buf_test_write_s64 ()
+TEST_CASE(test__buf_write_s64)
 {
   s8 b[32];
   s_buf buf;
@@ -832,7 +832,7 @@ void buf_test_write_s64 ()
   TEST_EQ(*((s64 *) (buf.ptr.ps8 + 24)), -1);
 }
 
-void buf_test_write_u8 ()
+TEST_CASE(test__buf_write_u8)
 {
   s8 b[4];
   s_buf buf;
@@ -855,7 +855,7 @@ void buf_test_write_u8 ()
   TEST_EQ(buf.ptr.pu8[3], 0xFF);
 }
 
-void buf_test_write_u16 ()
+TEST_CASE(test__buf_write_u16)
 {
   s8 b[8];
   s_buf buf;
@@ -878,7 +878,7 @@ void buf_test_write_u16 ()
   TEST_EQ(*((u16 *) (buf.ptr.pu8 + 6)), 0xFFFF);
 }
 
-void buf_test_write_u32 ()
+TEST_CASE(test__buf_write_u32)
 {
   s8 b[16];
   s_buf buf;
@@ -901,7 +901,7 @@ void buf_test_write_u32 ()
   TEST_EQ(*((u32 *) (buf.ptr.pu8 + 12)), 0xFFFFFFFF);
 }
 
-void buf_test_write_u64 ()
+TEST_CASE(test__buf_write_u64)
 {
   s8 b[32];
   s_buf buf;
@@ -924,11 +924,11 @@ void buf_test_write_u64 ()
   TEST_EQ(*((u64 *) (buf.ptr.pu8 + 24)), 0xFFFFFFFFFFFFFFFF);
 }
 
-void buf_test_write_str ()
+TEST_CASE(test__buf_write_str)
 {
 }
 
-void buf_test_xfer ()
+TEST_CASE(test__buf_xfer)
 {
   s8 d[16];
   s_buf dest;
diff --git a/test/call_test.c b/test/call_test.c
index 4bde132..42907fc 100644
--- a/test/call_test.c
+++ b/test/call_test.c
@@ -45,7 +45,7 @@ void call_test ()
   call_test_inspect();
 }
 
-void call_test_init_1 ()
+TEST_CASE(test__call_init_1)
 {
   CALL_TEST_INIT_1("a()");
   CALL_TEST_INIT_1("a(b)");
@@ -57,7 +57,7 @@ void call_test_init_1 ()
   CALL_TEST_INIT_1("A.b(c, d, e)");
 }
 
-void call_test_inspect ()
+TEST_CASE(test__call_inspect)
 {
   CALL_TEST_INSPECT("a()");
   CALL_TEST_INSPECT("a(b)");
diff --git a/test/cfn_test.c b/test/cfn_test.c
index 07a70a9..5464e3e 100644
--- a/test/cfn_test.c
+++ b/test/cfn_test.c
@@ -39,7 +39,7 @@ void cfn_test ()
   cfn_test_apply();
 }
 
-void cfn_test_apply ()
+TEST_CASE(test__cfn_apply)
 {
   s_list *args;
   s_tag result;
@@ -58,7 +58,7 @@ void cfn_test_apply ()
   cfn_clean(&a);
 }
 
-void cfn_test_copy ()
+TEST_CASE(test__cfn_copy)
 {
   s_cfn a;
   s_list *a_arg_types;
@@ -93,7 +93,7 @@ void cfn_test_copy ()
   cfn_clean(&a);
 }
 
-void cfn_test_init_clean ()
+TEST_CASE(test__cfn_init_clean)
 {
   s_cfn a;
   TEST_EQ(cfn_init(&a, sym_1("cfn_test_not"),
@@ -119,7 +119,7 @@ void cfn_test_init_clean ()
   test_ok();
 }
 
-void cfn_test_link ()
+TEST_CASE(test__cfn_link)
 {
   s_cfn a;
   s_cfn b;
@@ -148,7 +148,7 @@ bool cfn_test_not (bool a)
   return a ? false : true;
 }
 
-void cfn_test_prep_cif ()
+TEST_CASE(test__cfn_prep_cif)
 {
   s_cfn a;
   s_cfn b;
diff --git a/test/character_test.c b/test/character_test.c
index ea28e14..0882ad7 100644
--- a/test/character_test.c
+++ b/test/character_test.c
@@ -37,7 +37,7 @@ void character_test ()
 #define CHARACTER_TEST_1_ASCII(string)        \
   TEST_EQ(character_1(string), string[0])
 
-void character_test_1 ()
+TEST_CASE(test__character_1)
 {
   CHARACTER_TEST_1_ASCII("_");
   CHARACTER_TEST_1_ASCII("0");
@@ -73,7 +73,7 @@ void character_test_1 ()
   TEST_EQ(character_1("ꝝ"), 42845);
 }
 
-void character_test_is_digit ()
+TEST_CASE(test__character_is_digit)
 {
   character c;
   for (c = -10; c < 40; c++)
@@ -118,7 +118,7 @@ void character_test_is_digit ()
   TEST_ASSERT(! character_is_digit(character_1("ꝝ")));
 }
 
-void character_test_is_lowercase ()
+TEST_CASE(test__character_is_lowercase)
 {
   character c;
   for (c = -10; c < 40; c++)
@@ -157,7 +157,7 @@ void character_test_is_lowercase ()
   TEST_ASSERT(character_is_lowercase(character_1("ꝝ")));
 }
 
-void character_test_is_space ()
+TEST_CASE(test__character_is_space)
 {
   TEST_ASSERT(character_is_space('\n'));
   TEST_ASSERT(character_is_space('\r'));
@@ -193,7 +193,7 @@ void character_test_is_space ()
   TEST_ASSERT(! character_is_space(character_1("Ꝝ")));
 }
 
-void character_test_is_uppercase ()
+TEST_CASE(test__character_is_uppercase)
 {
   character c;
   for (c = -10; c < 40; c++)
@@ -228,11 +228,11 @@ void character_test_is_uppercase ()
   TEST_ASSERT(character_is_uppercase(character_1("Ꝝ")));
 }
 
-void character_test_utf8 ()
+TEST_CASE(test__character_utf8)
 {
 }
 
-void character_test_utf8_size ()
+TEST_CASE(test__character_utf8_size)
 {
   character c;
   for (c = -10; c < 0; c++)
diff --git a/test/compare_test.c b/test/compare_test.c
index b39215e..8d40b18 100644
--- a/test/compare_test.c
+++ b/test/compare_test.c
@@ -58,7 +58,7 @@ void compare_test ()
   compare_test_tuple();
 }
 
-void compare_test_bool ()
+TEST_CASE(test__compare_bool)
 {
   TEST_EQ(compare_bool(false, false), 0);
   TEST_EQ(compare_bool(false, true), -1);
@@ -66,7 +66,7 @@ void compare_test_bool ()
   TEST_EQ(compare_bool(true, true), 0);
 }
 
-void compare_test_character ()
+TEST_CASE(test__compare_character)
 {
   TEST_EQ(compare_character('0', '0'), 0);
   TEST_EQ(compare_character('0', '1'), -1);
@@ -81,7 +81,7 @@ void compare_test_character ()
   TEST_EQ(compare_character('a', 'A'), 1);
 }
 
-void compare_test_f32 ()
+TEST_CASE(test__compare_f32)
 {
   TEST_EQ(compare_f32('0', '0'), 0);
   TEST_EQ(compare_f32('0', '1'), -1);
@@ -109,7 +109,7 @@ void compare_test_f32 ()
           1);
 }
 
-void compare_test_f64 ()
+TEST_CASE(test__compare_f64)
 {
   TEST_EQ(compare_f64(0.0, 0.0), 0);
   TEST_EQ(compare_f64(0.0, 1.0), -1);
@@ -132,14 +132,14 @@ void compare_test_f64 ()
           1);
 }
 
-void compare_test_list ()
+TEST_CASE(test__compare_list)
 {
   COMPARE_TEST_LIST(NULL, NULL, 0);
   COMPARE_TEST_LIST(list_1("(A, B)"), list_1("(A, C)"), -1);
   COMPARE_TEST_LIST(list_1("(A, C)"), list_1("(A, B)"), 1);
 }
 
-void compare_test_str ()
+TEST_CASE(test__compare_str)
 {
   s_str *p;
   s_str a;
@@ -167,7 +167,7 @@ void compare_test_str ()
   COMPARE_TEST_STR(str_init_1(&a, NULL, "012"), str_init_1(&b, NULL, "ABC"), -1);
 }
 
-void compare_test_tag ()
+TEST_CASE(test__compare_tag)
 {
   s_tag a;
   s_tag b;
@@ -358,7 +358,7 @@ void compare_test_tag ()
   tag_clean(&b);
 }
 
-void compare_test_tuple ()
+TEST_CASE(test__compare_tuple)
 {
   s_tuple a;
   s_tuple b;
diff --git a/test/env_test.c b/test/env_test.c
index 7d6666b..1ef5fea 100644
--- a/test/env_test.c
+++ b/test/env_test.c
@@ -27,7 +27,7 @@ void env_test ()
   env_test_eval_equal_tag();
 }
 
-void env_test_eval_equal_tag ()
+TEST_CASE(test__env_eval_equal_tag)
 {
   s_env env;
   s_frame frame;
@@ -90,7 +90,7 @@ void env_test_eval_equal_tag ()
   test_context(NULL);
 }
 
-void env_test_init_clean ()
+TEST_CASE(test__env_init_clean)
 {
   s_env env;
   env_init(&env);
diff --git a/test/fact_test.c b/test/fact_test.c
index 0bbda53..60abf66 100644
--- a/test/fact_test.c
+++ b/test/fact_test.c
@@ -50,7 +50,7 @@ void fact_test_clean_3 (s_fact *fact)
   tag_delete((s_tag *) fact->object);
 }
 
-void fact_test_init ()
+TEST_CASE(test__fact_init)
 {
   s_tag sym[3];
   s_fact fact;
@@ -80,7 +80,7 @@ s_fact * fact_test_init_3 (s_fact *fact, const s8 *subject,
   return fact;
 }
 
-void fact_test_inspect ()
+TEST_CASE(test__fact_inspect)
 {
   s_tag tag[3];
   s_fact fact;
diff --git a/test/facts_cursor_test.c b/test/facts_cursor_test.c
index f560907..fe281da 100644
--- a/test/facts_cursor_test.c
+++ b/test/facts_cursor_test.c
@@ -26,7 +26,7 @@ void facts_cursor_test ()
   facts_cursor_test_next();
 }
 
-void facts_cursor_test_init ()
+TEST_CASE(test__facts_cursor_init)
 {
   s_facts_cursor cursor;
   uw i = 0;
@@ -108,7 +108,7 @@ void facts_cursor_test_init ()
   facts_clean(&facts);
 }
 
-void facts_cursor_test_next ()
+TEST_CASE(test__facts_cursor_next)
 {
   s_facts_cursor cursor;
   uw i = 0;
diff --git a/test/facts_test.c b/test/facts_test.c
index fec9556..cdafc7b 100644
--- a/test/facts_test.c
+++ b/test/facts_test.c
@@ -47,7 +47,7 @@ void facts_test ()
   facts_test_open_file();
 }
 
-void facts_test_add ()
+TEST_CASE(test__facts_add)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -100,7 +100,7 @@ void facts_test_add ()
   facts_clean(&facts);
 }
 
-void facts_test_dump_file ()
+TEST_CASE(test__facts_dump_file)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -150,7 +150,7 @@ void facts_test_dump_file ()
   facts_clean(&facts);
 }
 
-void facts_test_find ()
+TEST_CASE(test__facts_find)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -203,7 +203,7 @@ void facts_test_find ()
   facts_clean(&facts);
 }
 
-void facts_test_init_clean ()
+TEST_CASE(test__facts_init_clean)
 {
   s_facts facts;
   TEST_EQ(facts_init(&facts), &facts);
@@ -220,7 +220,7 @@ void facts_test_init_clean ()
   test_ok();
 }
 
-void facts_test_load ()
+TEST_CASE(test__facts_load)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -265,7 +265,7 @@ void facts_test_load ()
   facts_clean(&facts);
 }
 
-void facts_test_log_add ()
+TEST_CASE(test__facts_log_add)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -315,7 +315,7 @@ void facts_test_log_add ()
     unlink("facts_test_log_add.facts");
 }
 
-void facts_test_log_remove ()
+TEST_CASE(test__facts_log_remove)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -372,7 +372,7 @@ void facts_test_log_remove ()
     unlink("facts_test_log_remove.facts");
 }
 
-void facts_test_new_delete ()
+TEST_CASE(test__facts_new_delete)
 {
   s_facts *facts;
   s_buf buf;
@@ -394,7 +394,7 @@ void facts_test_new_delete ()
   }
 }
 
-void facts_test_open_file ()
+TEST_CASE(test__facts_open_file)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -543,7 +543,7 @@ void facts_test_open_file ()
     unlink("facts_test_open_file.3.facts");
 }
 
-void facts_test_remove ()
+TEST_CASE(test__facts_remove)
 {
   uw i = 0;
   s8 *p[24] = {
@@ -592,7 +592,7 @@ void facts_test_remove ()
   facts_clean(&facts);
 }
 
-void facts_test_save ()
+TEST_CASE(test__facts_save)
 {
   uw i = 0;
   s8 *p[24] = {
diff --git a/test/facts_with_test.c b/test/facts_with_test.c
index 4375c21..ca6bb40 100644
--- a/test/facts_with_test.c
+++ b/test/facts_with_test.c
@@ -28,7 +28,7 @@ void facts_with_test ()
   facts_with_test_();
 }
 
-void facts_with_test_ ()
+TEST_CASE(test__facts_with_)
 {
   s_facts_with_cursor cursor;
   s_fact fact;
@@ -178,7 +178,7 @@ void facts_with_test_ ()
   facts_clean(&facts);
 }
 
-void facts_with_test_tags ()
+TEST_CASE(test__facts_with_tags)
 {
   s_facts_cursor cursor;
   s_fact fact;
diff --git a/test/ident_test.c b/test/ident_test.c
index 66c554b..45b3ab7 100644
--- a/test/ident_test.c
+++ b/test/ident_test.c
@@ -47,7 +47,7 @@ void ident_test_character_is_reserved ();
 void ident_test_first_character_is_reserved ();
 void ident_test_inspect ();
 
-void ident_test_character_is_reserved ()
+TEST_CASE(test__ident_character_is_reserved)
 {
   IDENT_TEST_CHARACTER_IS_RESERVED('_', false);
   IDENT_TEST_CHARACTER_IS_RESERVED('0', false);
@@ -71,7 +71,7 @@ void ident_test_character_is_reserved ()
   IDENT_TEST_CHARACTER_IS_RESERVED(character_1("🤩"), false);
 }
 
-void ident_test_first_character_is_reserved ()
+TEST_CASE(test__ident_first_character_is_reserved)
 {
   IDENT_TEST_FIRST_CHARACTER_IS_RESERVED('_', false);
   IDENT_TEST_FIRST_CHARACTER_IS_RESERVED('0', true);
@@ -102,7 +102,7 @@ void ident_test ()
   ident_test_character_is_reserved();
 }
 
-void ident_test_inspect ()
+TEST_CASE(test__ident_inspect)
 {
   IDENT_TEST_INSPECT("", "_\"\"");
   IDENT_TEST_INSPECT(" ", "_\" \"");
diff --git a/test/list_test.c b/test/list_test.c
index e0ef39b..3b49445 100644
--- a/test/list_test.c
+++ b/test/list_test.c
@@ -49,7 +49,7 @@ void list_test ()
   list_test_inspect();
 }
 
-void list_test_1 ()
+TEST_CASE(test__list_1)
 {
   TEST_ASSERT(! list_1("()"));
   LIST_TEST_1("(() | ())");
@@ -63,7 +63,7 @@ void list_test_1 ()
   LIST_TEST_1("(A, B, C | D)");
 }
 
-void list_test_inspect ()
+TEST_CASE(test__list_inspect)
 {
   LIST_TEST_INSPECT("()", "()");
   LIST_TEST_INSPECT("(() | ())", "(())");
diff --git a/test/set__fact_test.c b/test/set__fact_test.c
index dcf76ef..bd9c97a 100644
--- a/test/set__fact_test.c
+++ b/test/set__fact_test.c
@@ -90,7 +90,7 @@ void set__fact_test ()
   set__fact_test_cursor();
 }
 
-void set__fact_test_add ()
+TEST_CASE(test__set__fact_add)
 {
   s_fact fact[24];
   sw i;
@@ -138,7 +138,7 @@ void set__fact_test_add ()
   set_clean__fact(&set);
 }
 
-void set__fact_test_cursor ()
+TEST_CASE(test__set__fact_cursor)
 {
   sw i;
   s8 *p[24] = {
@@ -187,7 +187,7 @@ void set__fact_test_cursor ()
   set_clean__fact(&set);
 }
 
-void set__fact_test_init_clean ()
+TEST_CASE(test__set__fact_init_clean)
 {
   SET__FACT_TEST_INIT_CLEAN(1);
   SET__FACT_TEST_INIT_CLEAN(8);
@@ -221,7 +221,7 @@ void set__fact_test_init_clean ()
   SET__FACT_TEST_INIT_CLEAN(1024 * 1024);
 }
 
-void set__fact_test_remove ()
+TEST_CASE(test__set__fact_remove)
 {
   sw i;
   s8 *p[24] = {
@@ -267,7 +267,7 @@ void set__fact_test_remove ()
   set_clean__fact(&set);
 }
 
-void set__fact_test_resize ()
+TEST_CASE(test__set__fact_resize)
 {
   sw i;
   s8 *p[24] = {
diff --git a/test/set__tag_test.c b/test/set__tag_test.c
index 7af40d0..d78acab 100644
--- a/test/set__tag_test.c
+++ b/test/set__tag_test.c
@@ -111,7 +111,7 @@ void set__tag_test ()
   set__tag_test_cursor();
 }
 
-void set__tag_test_add ()
+TEST_CASE(test__set__tag_add)
 {
   uw i = 0;
   const s8 *p[] = {
@@ -160,7 +160,7 @@ void set__tag_test_add ()
   set_clean__tag(&set);
 }
 
-void set__tag_test_cursor ()
+TEST_CASE(test__set__tag_cursor)
 {
   sw i = 0;
   s_tag tag;
@@ -265,7 +265,7 @@ void set__tag_test_cursor ()
   set_clean__tag(&set);
 }
 
-void set__tag_test_init_clean ()
+TEST_CASE(test__set__tag_init_clean)
 {
   SET__TAG_TEST_INIT_CLEAN(1);
   SET__TAG_TEST_INIT_CLEAN(8);
@@ -299,7 +299,7 @@ void set__tag_test_init_clean ()
   SET__TAG_TEST_INIT_CLEAN(1024 * 1024);
 }
 
-void set__tag_test_remove ()
+TEST_CASE(test__set__tag_remove)
 {
   sw i;
   s_tag tag;
@@ -379,7 +379,7 @@ void set__tag_test_remove ()
   set_clean__tag(&set);
 }
 
-void set__tag_test_resize ()
+TEST_CASE(test__set__tag_resize)
 {
   s_tag tag;
   s_set__tag set;
diff --git a/test/skiplist__fact_test.c b/test/skiplist__fact_test.c
index e47524b..a5d1edb 100644
--- a/test/skiplist__fact_test.c
+++ b/test/skiplist__fact_test.c
@@ -64,7 +64,7 @@ void skiplist__fact_test ()
   skiplist__fact_test_find();
 }
 
-void skiplist__fact_test_find ()
+TEST_CASE(test__skiplist__fact_find)
 {
   s_fact fact[24];
   const u8 *h;
@@ -120,7 +120,7 @@ void skiplist__fact_test_find ()
   }
 }
 
-void skiplist__fact_test_insert ()
+TEST_CASE(test__skiplist__fact_insert)
 {
   sw i;
   const u8 *h;
@@ -178,7 +178,7 @@ void skiplist__fact_test_insert ()
   }
 }
 
-void skiplist__fact_test_new_delete ()
+TEST_CASE(test__skiplist__fact_new_delete)
 {
   const u8 *h;
   const u8  height[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 0};
@@ -191,7 +191,7 @@ void skiplist__fact_test_new_delete ()
   }
 }
 
-void skiplist__fact_test_remove ()
+TEST_CASE(test__skiplist__fact_remove)
 {
   s_fact fact[24];
   const u8 *h;
diff --git a/test/str_test.c b/test/str_test.c
index d69908b..b154ab8 100644
--- a/test/str_test.c
+++ b/test/str_test.c
@@ -91,7 +91,7 @@ void str_test ()
   str_test_to_sym();
 }
 
-void str_test_character_is_reserved ()
+TEST_CASE(test__str_character_is_reserved)
 {
   TEST_ASSERT(str_character_is_reserved('\0'));
   TEST_ASSERT(str_character_is_reserved('\x01'));
@@ -125,7 +125,7 @@ void str_test_character_is_reserved ()
   TEST_ASSERT(str_character_is_reserved('\\'));
 }
 
-void str_test_init_clean ()
+TEST_CASE(test__str_init_clean)
 {
   size_t len;
   char *m;
@@ -147,7 +147,7 @@ void str_test_init_clean ()
   test_ok();
 }
 
-void str_test_init_dup ()
+TEST_CASE(test__str_init_dup)
 {
   size_t len;
   char *m;
@@ -174,7 +174,7 @@ void str_test_init_dup ()
   test_ok();
 }
 
-void str_test_init_dup_1 ()
+TEST_CASE(test__str_init_dup_1)
 {
   size_t len;
   char *m;
@@ -197,7 +197,7 @@ void str_test_init_dup_1 ()
   test_ok();
 }
 
-void str_test_inspect ()
+TEST_CASE(test__str_inspect)
 {
   s8 zero[16];
   bzero(zero, sizeof(zero));
@@ -279,21 +279,21 @@ void str_test_inspect ()
                    "\\0\"");
 }
 
-void str_test_new_1 ()
+TEST_CASE(test__str_new_1)
 {
   s_str *str;
   TEST_ASSERT((str = str_new_1(NULL, "test")));
   str_delete(str);
 }
 
-void str_test_new_cpy ()
+TEST_CASE(test__str_new_cpy)
 {
   s_str *str;
   TEST_ASSERT((str = str_new_cpy(4, "test")));
   str_delete(str);
 }
 
-void str_test_new_delete ()
+TEST_CASE(test__str_new_delete)
 {
   size_t len;
   char *m;
@@ -314,7 +314,7 @@ void str_test_new_delete ()
   test_ok();
 }
 
-void str_test_new_dup ()
+TEST_CASE(test__str_new_dup)
 {
   size_t len;
   char *m;
@@ -340,7 +340,7 @@ void str_test_new_dup ()
   test_ok();
 }
 
-void str_test_new_f ()
+TEST_CASE(test__str_new_f)
 {
   s_str *str;
   TEST_ASSERT((str = str_new_f("test%d", 42)));
@@ -351,7 +351,7 @@ void str_test_new_f ()
   str_delete(str);
 }
 
-void str_test_to_hex ()
+TEST_CASE(test__str_to_hex)
 {
   s8 zero[32];
   bzero(zero, sizeof(zero));
@@ -431,7 +431,7 @@ void str_test_to_hex ()
                   "7172737475767778797A");
 }
 
-void str_test_to_sym ()
+TEST_CASE(test__str_to_sym)
 {
   STR_TEST_TO_SYM("");
   STR_TEST_TO_SYM("0");
diff --git a/test/sym_test.c b/test/sym_test.c
index 6c48f7e..63c82fe 100644
--- a/test/sym_test.c
+++ b/test/sym_test.c
@@ -41,7 +41,7 @@ void sym_test ()
   sym_test_1();
   sym_test_inspect();
 }
-void sym_test_1 ()
+TEST_CASE(test__sym_1)
 {
   const s_sym *mod;
   const s_sym *mod_t;
@@ -104,7 +104,7 @@ const s_sym * sym_test_1_test (const s8 *p)
   return sym;
 }
 
-void sym_test_inspect ()
+TEST_CASE(test__sym_inspect)
 {
   SYM_TEST_INSPECT("", ":\"\"");
   SYM_TEST_INSPECT(" ", ":\" \"");
diff --git a/test/tag_test.c b/test/tag_test.c
index ef4e561..90bd310 100644
--- a/test/tag_test.c
+++ b/test/tag_test.c
@@ -33,7 +33,7 @@ void tag_test ()
   tag_test_hash_u64();
 }
 
-void tag_test_hash_u64 ()
+TEST_CASE(test__tag_hash_u64)
 {
   s_tag a;
   s_tag b;
@@ -47,7 +47,7 @@ void tag_test_hash_u64 ()
   tag_clean(&b);
 }
 
-void tag_test_init_1 ()
+TEST_CASE(test__tag_init_1)
 {
   s_tag a;
   TEST_ASSERT(tag_init_1(&a, "fn () { () }"));
diff --git a/test/tuple_test.c b/test/tuple_test.c
index c595c98..80e4426 100644
--- a/test/tuple_test.c
+++ b/test/tuple_test.c
@@ -88,7 +88,7 @@ void tuple_test ()
   tuple_test_inspect();
 }
 
-void tuple_test_init_clean ()
+TEST_CASE(test__tuple_init_clean)
 {
   TUPLE_TEST_INIT_CLEAN(2);
   TUPLE_TEST_INIT_CLEAN(3);
@@ -111,7 +111,7 @@ void tuple_test_init_clean ()
   TUPLE_TEST_INIT_CLEAN(20);
 }
 
-void tuple_test_init_1 ()
+TEST_CASE(test__tuple_init_1)
 {
   TUPLE_TEST_INIT_1("{:a, :b}");
   TUPLE_TEST_INIT_1("{:a, :b, :c}");
@@ -122,7 +122,7 @@ void tuple_test_init_1 ()
   TUPLE_TEST_INIT_1("{{:a, :b}, {:c, :d}, {:e, :f}, {:g, :h}, {:i, :j}}");
 }
 
-void tuple_test_inspect ()
+TEST_CASE(test__tuple_inspect)
 {
   TUPLE_TEST_INSPECT("{:a, :b}", "{:a, :b}");
   TUPLE_TEST_INSPECT("{{:a, :b}, {:c, :d}}", "{{:a, :b}, {:c, :d}}");
@@ -130,7 +130,7 @@ void tuple_test_inspect ()
                      "{{:a, :b}, {:c, :d}, {:e, :f}}");
 }
 
-void tuple_test_new_1 ()
+TEST_CASE(test__tuple_new_1)
 {
   TUPLE_TEST_NEW_1("{:a, :b}");
   TUPLE_TEST_NEW_1("{:a, :b, :c}");
@@ -141,7 +141,7 @@ void tuple_test_new_1 ()
   TUPLE_TEST_NEW_1("{{:a, :b}, {:c, :d}, {:e, :f}, {:g, :h}, {:i, :j}}");
 }
 
-void tuple_test_new_delete ()
+TEST_CASE(test__tuple_new_delete)
 {
   TUPLE_TEST_NEW_DELETE(2);
   TUPLE_TEST_NEW_DELETE(3);
diff --git a/test/types_test.c b/test/types_test.c
index 3b967ae..2d9660b 100644
--- a/test/types_test.c
+++ b/test/types_test.c
@@ -21,7 +21,7 @@ void types_test ()
   types_test_sizeof();
 }
 
-void types_test_sizeof ()
+TEST_CASE(test__types_sizeof)
 {
   TEST_EQ(sizeof(s8), 1);
   TEST_EQ(sizeof(s16), 2);