kc3-lang/kc3

diff --git a/test/bool_test.c b/test/bool_test.c
index 4f357b5..bb297db 100644
--- a/test/bool_test.c
+++ b/test/bool_test.c
@@ -45,9 +45,11 @@ TEST_CASE(bool_compat)
   TEST_ASSERT((bool) true);
   TEST_ASSERT(! (bool) false);
 }
+TEST_CASE_END(bool_compat)
 
 TEST_CASE(bool_inspect)
 {
   BOOL_TEST_INSPECT(true, "true");
   BOOL_TEST_INSPECT(false, "false");
 }
+TEST_CASE_END(bool_inspect)
diff --git a/test/buf_file_test.c b/test/buf_file_test.c
index d29b760..1e8c953 100644
--- a/test/buf_file_test.c
+++ b/test/buf_file_test.c
@@ -40,6 +40,7 @@ TEST_CASE(buf_file_open_r_close)
   test_ok();
   fclose(fp);
 }
+TEST_CASE_END(buf_file_open_r_close)
 
 TEST_CASE(buf_file_open_r_refill)
 {
@@ -61,7 +62,9 @@ TEST_CASE(buf_file_open_r_refill)
   fclose(fp);
   test_context(NULL);
 }
+TEST_CASE_END(buf_file_open_r_refill)
 
 TEST_CASE(buf_file_open_w_close)
 {
 }
+TEST_CASE_END(buf_file_open_w_close)
diff --git a/test/buf_inspect_test.c b/test/buf_inspect_test.c
index 9809508..bb52cf8 100644
--- a/test/buf_inspect_test.c
+++ b/test/buf_inspect_test.c
@@ -184,6 +184,7 @@ TEST_CASE(buf_inspect_bool)
   BUF_INSPECT_TEST_BOOL(true, "true");
   BUF_INSPECT_TEST_BOOL(false, "false");
 }
+TEST_CASE_END(buf_inspect_bool)
 
 TEST_CASE(buf_inspect_character)
 {
@@ -205,6 +206,7 @@ TEST_CASE(buf_inspect_character)
   BUF_INSPECT_TEST_CHARACTER(128995, "'🟣'");
   BUF_INSPECT_TEST_CHARACTER(129321, "'🤩'");
 }
+TEST_CASE_END(buf_inspect_character)
 
 TEST_CASE(buf_inspect_f32)
 {
@@ -218,6 +220,7 @@ TEST_CASE(buf_inspect_f32)
   BUF_INSPECT_TEST_F32(-1.23456789, "-1.23457");
   BUF_INSPECT_TEST_F32(-123456789.0, "-1.23457e+08");
 }
+TEST_CASE_END(buf_inspect_f32)
 
 TEST_CASE(buf_inspect_f64)
 {
@@ -231,6 +234,7 @@ TEST_CASE(buf_inspect_f64)
   BUF_INSPECT_TEST_F64(-1.23456789, "-1.23457");
   BUF_INSPECT_TEST_F64(-123456789.0, "-1.23457e+08");
 }
+TEST_CASE_END(buf_inspect_f64)
 
 TEST_CASE(buf_inspect_integer)
 {
@@ -250,11 +254,13 @@ TEST_CASE(buf_inspect_integer)
   BUF_INSPECT_TEST_INTEGER("123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131",
 			   "123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131123456789012345678901234567890123321321311234567890123456789012345678901233213213112345678901234567890123456789012332132131");
 }
+TEST_CASE_END(buf_inspect_integer)
 
 TEST_CASE(buf_inspect_list)
 {
   BUF_INSPECT_TEST_LIST("()", "()");
 }
+TEST_CASE_END(buf_inspect_list)
  
 TEST_CASE(buf_inspect_str)
 {
@@ -293,6 +299,7 @@ TEST_CASE(buf_inspect_str)
   BUF_INSPECT_TEST_STR("é", "\"é\"");
   BUF_INSPECT_TEST_STR("éoπꝝ꒴𐅀🎳😄🟣🤩", "\"éoπꝝ꒴𐅀🎳😄🟣🤩\"");
 }
+TEST_CASE_END(buf_inspect_str)
 
 TEST_CASE(buf_inspect_str_character)
 {
@@ -314,6 +321,7 @@ TEST_CASE(buf_inspect_str_character)
   BUF_INSPECT_TEST_STR_CHARACTER(128995, "🟣");
   BUF_INSPECT_TEST_STR_CHARACTER(129321, "🤩");
 }
+TEST_CASE_END(buf_inspect_str_character)
 
 TEST_CASE(buf_inspect_str_character_size)
 {
@@ -331,6 +339,7 @@ TEST_CASE(buf_inspect_str_character_size)
   BUF_INSPECT_TEST_STR_CHARACTER_SIZE(42164, 3);
   BUF_INSPECT_TEST_STR_CHARACTER_SIZE(65856, 4);
 }
+TEST_CASE_END(buf_inspect_str_character_size)
 
 TEST_CASE(buf_inspect_tag)
 {
@@ -367,3 +376,4 @@ TEST_CASE(buf_inspect_tag)
   BUF_INSPECT_TEST_TAG(tag_void(&tag), "");
   tag_clean(&tag);
 }
+TEST_CASE_END(buf_inspect_tag)
diff --git a/test/buf_parse_test.c b/test/buf_parse_test.c
index 078b07d..77781b8 100644
--- a/test/buf_parse_test.c
+++ b/test/buf_parse_test.c
@@ -786,6 +786,7 @@ TEST_CASE(buf_parse_bool)
   BUF_PARSE_TEST_BOOL("false", 0);
   BUF_PARSE_TEST_BOOL("true", 1);
 }
+TEST_CASE_END(buf_parse_bool)
 
 TEST_CASE(buf_parse_call)
 {
@@ -812,6 +813,7 @@ TEST_CASE(buf_parse_call)
   BUF_PARSE_TEST_CALL("a(B.c(d))");
   BUF_PARSE_TEST_CALL("a(B.c(D.e(f, g), H.i(j, k)))");
 }
+TEST_CASE_END(buf_parse_call)
 
 TEST_CASE(buf_parse_call_op)
 {
@@ -823,6 +825,7 @@ TEST_CASE(buf_parse_call_op)
   BUF_PARSE_TEST_CALL_OP("1 + 2 / 3 * 4 - 5");
   */
 }
+TEST_CASE_END(buf_parse_call_op)
 
 TEST_CASE(buf_parse_cfn)
 {
@@ -837,6 +840,7 @@ TEST_CASE(buf_parse_cfn)
   BUF_PARSE_TEST_CFN("cfn :tag \"tag_add\" (:tag, :tag)");
   BUF_PARSE_TEST_CFN("cfn :tag \"tag_add\" (:tag, :tag, :tag)");
 }
+TEST_CASE_END(buf_parse_cfn)
 
 TEST_CASE(buf_parse_character)
 {
@@ -907,6 +911,7 @@ TEST_CASE(buf_parse_character)
   BUF_PARSE_TEST_CHARACTER("'꒴'", 42164);
   BUF_PARSE_TEST_CHARACTER("'𐅀'", 65856);
 }
+TEST_CASE_END(buf_parse_character)
 
 TEST_CASE(buf_parse_digit_bin)
 {
@@ -924,6 +929,7 @@ TEST_CASE(buf_parse_digit_bin)
   BUF_PARSE_TEST_DIGIT_BIN("0", 0);
   BUF_PARSE_TEST_DIGIT_BIN("1", 1);
 }
+TEST_CASE_END(buf_parse_digit_bin)
 
 TEST_CASE(buf_parse_digit_hex)
 {
@@ -945,6 +951,7 @@ TEST_CASE(buf_parse_digit_hex)
   BUF_PARSE_TEST_DIGIT_HEX("a", 0x0A);
   BUF_PARSE_TEST_DIGIT_HEX("f", 0x0F);
 }
+TEST_CASE_END(buf_parse_digit_hex)
 
 TEST_CASE(buf_parse_digit_oct)
 {
@@ -962,6 +969,7 @@ TEST_CASE(buf_parse_digit_oct)
   BUF_PARSE_TEST_DIGIT_OCT("0", 0);
   BUF_PARSE_TEST_DIGIT_OCT("7", 7);
 }
+TEST_CASE_END(buf_parse_digit_oct)
 
 TEST_CASE(buf_parse_digit_dec)
 {
@@ -979,6 +987,7 @@ TEST_CASE(buf_parse_digit_dec)
   BUF_PARSE_TEST_DIGIT_DEC("0", 0);
   BUF_PARSE_TEST_DIGIT_DEC("9", 9);
 }
+TEST_CASE_END(buf_parse_digit_dec)
 
 void buf_parse_test_f32()
 {
@@ -986,10 +995,12 @@ void buf_parse_test_f32()
   BUF_PARSE_TEST_F32("3.14159", 3.14159, 3.141589641571045);
   BUF_PARSE_TEST_F32("2.1e+2", 210, 209.9999847412109);
 }
+TEST_CASE_END(buf_parse_digit_dec)
 
 void buf_parse_test_f64()
 {
 }
+TEST_CASE_END(buf_parse_digit_dec)
 
 TEST_CASE(buf_parse_fn)
 {
@@ -997,6 +1008,7 @@ TEST_CASE(buf_parse_fn)
   BUF_PARSE_TEST_FN("fn (x) { x }");
   BUF_PARSE_TEST_FN("fn (x, y) { x }");
 }
+TEST_CASE_END(buf_parse_fn)
 
 TEST_CASE(buf_parse_ident)
 {
@@ -1052,6 +1064,7 @@ TEST_CASE(buf_parse_ident)
   BUF_PARSE_TEST_IDENT("Module.i", "i");
   BUF_PARSE_TEST_IDENT("Module.ident_az09AZ", "ident_az09AZ");
 }
+TEST_CASE_END(buf_parse_ident)
 
 TEST_CASE(buf_parse_integer)
 {
@@ -1100,6 +1113,7 @@ TEST_CASE(buf_parse_integer)
   BUF_PARSE_TEST_INTEGER("0O11");
   BUF_PARSE_TEST_INTEGER("0O100");
 }
+TEST_CASE_END(buf_parse_integer)
 
 TEST_CASE(buf_parse_integer_bin)
 {
@@ -1111,6 +1125,7 @@ TEST_CASE(buf_parse_integer_bin)
   BUF_PARSE_TEST_INTEGER_UNSIGNED_BIN("11");
   BUF_PARSE_TEST_INTEGER_UNSIGNED_BIN("100");
 }
+TEST_CASE_END(buf_parse_integer_bin)
 
 void buf_parse_test_integer_dec()
 {
@@ -1121,6 +1136,7 @@ void buf_parse_test_integer_dec()
   BUF_PARSE_TEST_INTEGER_UNSIGNED_DEC("256");
   BUF_PARSE_TEST_INTEGER_UNSIGNED_DEC("100_000_000_000_000_000");
 }
+TEST_CASE_END(buf_parse_integer_bin)
 
 void buf_parse_test_integer_hex()
 {
@@ -1133,6 +1149,7 @@ void buf_parse_test_integer_hex()
   BUF_PARSE_TEST_INTEGER_UNSIGNED_HEX("F");
   BUF_PARSE_TEST_INTEGER_UNSIGNED_HEX("256");
 }
+TEST_CASE_END(buf_parse_integer_bin)
 
 void buf_parse_test_integer_oct()
 {
@@ -1146,6 +1163,7 @@ void buf_parse_test_integer_oct()
   BUF_PARSE_TEST_INTEGER_UNSIGNED_OCT("100");
   BUF_PARSE_TEST_INTEGER_UNSIGNED_OCT("777");
 }
+TEST_CASE_END(buf_parse_integer_bin)
 
 TEST_CASE(buf_parse_list)
 {
@@ -1158,10 +1176,12 @@ TEST_CASE(buf_parse_list)
   BUF_PARSE_TEST_LIST("(a, b | c)");
   BUF_PARSE_TEST_LIST("(a, b, c | d)");
 }
+TEST_CASE_END(buf_parse_list)
 
 TEST_CASE(buf_parse_sw)
 {
 }
+TEST_CASE_END(buf_parse_sw)
 
 
 TEST_CASE(buf_parse_str)
@@ -1211,6 +1231,7 @@ TEST_CASE(buf_parse_str)
   BUF_PARSE_TEST_STR("\"🤩\"", "🤩");
   BUF_PARSE_TEST_STR("\"ꇤ\"", "ꇤ");
 }
+TEST_CASE_END(buf_parse_str)
 
 TEST_CASE(buf_parse_str_character)
 {
@@ -1238,6 +1259,7 @@ TEST_CASE(buf_parse_str_character)
   BUF_PARSE_TEST_STR_CHARACTER("🟣", 128995);
   BUF_PARSE_TEST_STR_CHARACTER("🤩", 129321);
 }
+TEST_CASE_END(buf_parse_str_character)
 
 TEST_CASE(buf_parse_str_u8)
 {
@@ -1277,6 +1299,7 @@ TEST_CASE(buf_parse_str_u8)
   BUF_PARSE_TEST_STR_U8("\\xF08", 4, 0xF0);
   BUF_PARSE_TEST_STR_U8("\\xFF8", 4, 0xFF);
 }
+TEST_CASE_END(buf_parse_str_u8)
 
 TEST_CASE(buf_parse_sym)
 {
@@ -1304,6 +1327,7 @@ TEST_CASE(buf_parse_sym)
   BUF_PARSE_TEST_SYM("Az09az", "Az09az");
   BUF_PARSE_TEST_SYM(":az09AZ", "az09AZ");
 }
+TEST_CASE_END(buf_parse_sym)
 
 TEST_CASE(buf_parse_tag)
 {
@@ -1311,6 +1335,7 @@ TEST_CASE(buf_parse_tag)
   BUF_PARSE_TEST_TAG("_x");
   BUF_PARSE_TEST_TAG("(x | _y)");
 }
+TEST_CASE_END(buf_parse_tag)
 
 TEST_CASE(buf_parse_tuple)
 {
@@ -1322,11 +1347,14 @@ TEST_CASE(buf_parse_tuple)
   BUF_PARSE_TEST_TUPLE("{{a, b}, c}");
   BUF_PARSE_TEST_TUPLE("{{a, b}, {c, d}}");
 }
+TEST_CASE_END(buf_parse_tuple)
 
 TEST_CASE(buf_parse_u)
 {
 }
+TEST_CASE_END(buf_parse_u)
 
 TEST_CASE(buf_parse_uw)
 {
 }
+TEST_CASE_END(buf_parse_uw)
diff --git a/test/buf_parse_test_s16.c b/test/buf_parse_test_s16.c
index 8ed5442..6262e13 100644
--- a/test/buf_parse_test_s16.c
+++ b/test/buf_parse_test_s16.c
@@ -33,6 +33,7 @@ TEST_CASE(buf_parse_s16_binary)
   BUF_PARSE_TEST_S(16, "0b111111111111110", 32766);
   BUF_PARSE_TEST_S(16, "0b111111111111111", 32767);
 }
+TEST_CASE_END(buf_parse_s16_binary)
 
 TEST_CASE(buf_parse_s16_binary_negative)
 {
@@ -55,6 +56,7 @@ TEST_CASE(buf_parse_s16_binary_negative)
   BUF_PARSE_TEST_S(16, "-0b111111111111111", -32767);
   BUF_PARSE_TEST_S(16, "-0b1000000000000000", -32768);
 }
+TEST_CASE_END(buf_parse_s16_binary_negative)
 
 TEST_CASE(buf_parse_s16_octal)
 {
@@ -645,6 +647,7 @@ TEST_CASE(buf_parse_s16_octal)
   BUF_PARSE_TEST_S(16, "0o77776", 32766);
   BUF_PARSE_TEST_S(16, "0o77777", 32767);
 }
+TEST_CASE_END(buf_parse_s16_octal)
 
 TEST_CASE(buf_parse_s16_octal_negative)
 {
@@ -1235,6 +1238,7 @@ TEST_CASE(buf_parse_s16_octal_negative)
   BUF_PARSE_TEST_S(16, "-0o77777", -32767);
   BUF_PARSE_TEST_S(16, "-0o100000", -32768);
 }
+TEST_CASE_END(buf_parse_s16_octal_negative)
 
 TEST_CASE(buf_parse_s16_hexadecimal)
 {
@@ -8869,6 +8873,7 @@ TEST_CASE(buf_parse_s16_hexadecimal)
   BUF_PARSE_TEST_S(16, "0x7fff", 32767);
   BUF_PARSE_TEST_S(16, "0x7FFF", 32767);
 }
+TEST_CASE_END(buf_parse_s16_hexadecimal)
 
 TEST_CASE(buf_parse_s16_hexadecimal_negative)
 {
@@ -16502,6 +16507,7 @@ TEST_CASE(buf_parse_s16_hexadecimal_negative)
   BUF_PARSE_TEST_S(16, "-0x7FFF", -32767);
   BUF_PARSE_TEST_S(16, "-0x8000", -32768);
 }
+TEST_CASE_END(buf_parse_s16_hexadecimal_negative)
 
 TEST_CASE(buf_parse_s16_decimal)
 {
@@ -17618,6 +17624,7 @@ TEST_CASE(buf_parse_s16_decimal)
   BUF_PARSE_TEST_S(16, "32766", 32766);
   BUF_PARSE_TEST_S(16, "32767", 32767);
 }
+TEST_CASE_END(buf_parse_s16_decimal)
 
 TEST_CASE(buf_parse_s16_decimal_negative)
 {
@@ -18734,3 +18741,4 @@ TEST_CASE(buf_parse_s16_decimal_negative)
   BUF_PARSE_TEST_S(16, "-32767", -32767);
   BUF_PARSE_TEST_S(16, "-32768", -32768);
 }
+TEST_CASE_END(buf_parse_s16_decimal_negative)
diff --git a/test/buf_parse_test_s32.c b/test/buf_parse_test_s32.c
index d271371..cd4317d 100644
--- a/test/buf_parse_test_s32.c
+++ b/test/buf_parse_test_s32.c
@@ -35,6 +35,7 @@ TEST_CASE(buf_parse_s32_binary)
   BUF_PARSE_TEST_S(32, "0b1111111111111111111111111111110", 2147483646);
   BUF_PARSE_TEST_S(32, "0b1111111111111111111111111111111", 2147483647);
 }
+TEST_CASE_END(buf_parse_s32_binary)
 
 TEST_CASE(buf_parse_s32_binary_negative)
 {
@@ -59,6 +60,7 @@ TEST_CASE(buf_parse_s32_binary_negative)
   BUF_PARSE_TEST_S(32, "-0b1111111111111111111111111111111", -2147483647);
   BUF_PARSE_TEST_S(32, "-0b10000000000000000000000000000000", -2147483648);
 }
+TEST_CASE_END(buf_parse_s32_binary_negative)
 
 TEST_CASE(buf_parse_s32_octal)
 {
@@ -651,6 +653,7 @@ TEST_CASE(buf_parse_s32_octal)
   BUF_PARSE_TEST_S(32, "0o17777777776", 2147483646);
   BUF_PARSE_TEST_S(32, "0o17777777777", 2147483647);
 }
+TEST_CASE_END(buf_parse_s32_octal)
 
 TEST_CASE(buf_parse_s32_octal_negative)
 {
@@ -1243,6 +1246,7 @@ TEST_CASE(buf_parse_s32_octal_negative)
   BUF_PARSE_TEST_S(32, "-0o17777777777", -2147483647);
   BUF_PARSE_TEST_S(32, "-0o20000000000", -2147483648);
 }
+TEST_CASE_END(buf_parse_s32_octal_negative)
 
 TEST_CASE(buf_parse_s32_hexadecimal)
 {
@@ -8881,6 +8885,7 @@ TEST_CASE(buf_parse_s32_hexadecimal)
   BUF_PARSE_TEST_S(32, "0x7fffffff", 2147483647);
   BUF_PARSE_TEST_S(32, "0x7FFFFFFF", 2147483647);
 }
+TEST_CASE_END(buf_parse_s32_hexadecimal)
 
 TEST_CASE(buf_parse_s32_hexadecimal_negative)
 {
@@ -16517,6 +16522,7 @@ TEST_CASE(buf_parse_s32_hexadecimal_negative)
   BUF_PARSE_TEST_S(32, "-0x7FFFFFFF", -2147483647);
   BUF_PARSE_TEST_S(32, "-0x80000000", -2147483648);
 }
+TEST_CASE_END(buf_parse_s32_hexadecimal_negative)
 
 TEST_CASE(buf_parse_s32_decimal)
 {
@@ -17635,6 +17641,7 @@ TEST_CASE(buf_parse_s32_decimal)
   BUF_PARSE_TEST_S(32, "2147483646", 2147483646);
   BUF_PARSE_TEST_S(32, "2147483647", 2147483647);
 }
+TEST_CASE_END(buf_parse_s32_decimal)
 
 TEST_CASE(buf_parse_s32_decimal_negative)
 {
@@ -18753,3 +18760,4 @@ TEST_CASE(buf_parse_s32_decimal_negative)
   BUF_PARSE_TEST_S(32, "-2147483647", -2147483647);
   BUF_PARSE_TEST_S(32, "-2147483648", -2147483648);
 }
+TEST_CASE_END(buf_parse_s32_decimal_negative)
diff --git a/test/buf_parse_test_s64.c b/test/buf_parse_test_s64.c
index 4caf732..28fa7b6 100644
--- a/test/buf_parse_test_s64.c
+++ b/test/buf_parse_test_s64.c
@@ -37,6 +37,7 @@ TEST_CASE(buf_parse_s64_binary)
   BUF_PARSE_TEST_S(64, "0b111111111111111111111111111111111111111111111111111111111111110", 9223372036854775806);
   BUF_PARSE_TEST_S(64, "0b111111111111111111111111111111111111111111111111111111111111111", 9223372036854775807);
 }
+TEST_CASE_END(buf_parse_s64_binary)
 
 TEST_CASE(buf_parse_s64_binary_negative)
 {
@@ -63,6 +64,7 @@ TEST_CASE(buf_parse_s64_binary_negative)
   BUF_PARSE_TEST_S(64, "-0b111111111111111111111111111111111111111111111111111111111111111", -9223372036854775807);
   BUF_PARSE_TEST_S(64, "-0b1000000000000000000000000000000000000000000000000000000000000000", -9223372036854775807 - 1);
 }
+TEST_CASE_END(buf_parse_s64_binary_negative)
 
 TEST_CASE(buf_parse_s64_octal)
 {
@@ -657,6 +659,7 @@ TEST_CASE(buf_parse_s64_octal)
   BUF_PARSE_TEST_S(64, "0o777777777777777777776", 9223372036854775806);
   BUF_PARSE_TEST_S(64, "0o777777777777777777777", 9223372036854775807);
 }
+TEST_CASE_END(buf_parse_s64_octal)
 
 TEST_CASE(buf_parse_s64_octal_negative)
 {
@@ -1251,6 +1254,7 @@ TEST_CASE(buf_parse_s64_octal_negative)
   BUF_PARSE_TEST_S(64, "-0o777777777777777777777", -9223372036854775807);
   BUF_PARSE_TEST_S(64, "-0o1000000000000000000000", -9223372036854775807 - 1);
 }
+TEST_CASE_END(buf_parse_s64_octal_negative)
 
 TEST_CASE(buf_parse_s64_hexadecimal)
 {
@@ -8893,6 +8897,7 @@ TEST_CASE(buf_parse_s64_hexadecimal)
   BUF_PARSE_TEST_S(64, "0x7fffffffffffffff", 9223372036854775807);
   BUF_PARSE_TEST_S(64, "0x7FFFFFFFFFFFFFFF", 9223372036854775807);
 }
+TEST_CASE_END(buf_parse_s64_hexadecimal)
 
 TEST_CASE(buf_parse_s64_hexadecimal_negative)
 {
@@ -16532,6 +16537,7 @@ TEST_CASE(buf_parse_s64_hexadecimal_negative)
   BUF_PARSE_TEST_S(64, "-0x7FFFFFFFFFFFFFFF", -9223372036854775807);
   BUF_PARSE_TEST_S(64, "-0x8000000000000000", -9223372036854775807 - 1);
 }
+TEST_CASE_END(buf_parse_s64_hexadecimal_negative)
 
 TEST_CASE(buf_parse_s64_decimal)
 {
@@ -17652,6 +17658,7 @@ TEST_CASE(buf_parse_s64_decimal)
   BUF_PARSE_TEST_S(64, "9223372036854775806", 9223372036854775806);
   BUF_PARSE_TEST_S(64, "9223372036854775807", 9223372036854775807);
 }
+TEST_CASE_END(buf_parse_s64_decimal)
 
 TEST_CASE(buf_parse_s64_decimal_negative)
 {
@@ -18772,3 +18779,4 @@ TEST_CASE(buf_parse_s64_decimal_negative)
   BUF_PARSE_TEST_S(64, "-9223372036854775807", -9223372036854775807);
   BUF_PARSE_TEST_S(64, "-9223372036854775808", -9223372036854775807 - 1);
 }
+TEST_CASE_END(buf_parse_s64_decimal_negative)
diff --git a/test/buf_parse_test_s8.c b/test/buf_parse_test_s8.c
index fab6108..a8779f1 100644
--- a/test/buf_parse_test_s8.c
+++ b/test/buf_parse_test_s8.c
@@ -31,6 +31,7 @@ TEST_CASE(buf_parse_s8_binary)
   BUF_PARSE_TEST_S(8, "0b1111110", 126);
   BUF_PARSE_TEST_S(8, "0b1111111", 127);
 }
+TEST_CASE_END(buf_parse_s8_binary)
 
 TEST_CASE(buf_parse_s8_binary_negative)
 {
@@ -51,6 +52,7 @@ TEST_CASE(buf_parse_s8_binary_negative)
   BUF_PARSE_TEST_S(8, "-0b1111111", -127);
   BUF_PARSE_TEST_S(8, "-0b10000000", -128);
 }
+TEST_CASE_END(buf_parse_s8_binary_negative)
 
 TEST_CASE(buf_parse_s8_octal)
 {
@@ -255,6 +257,7 @@ TEST_CASE(buf_parse_s8_octal)
   BUF_PARSE_TEST_S(8, "0o176", 126);
   BUF_PARSE_TEST_S(8, "0o177", 127);
 }
+TEST_CASE_END(buf_parse_s8_octal)
 
 TEST_CASE(buf_parse_s8_octal_negative)
 {
@@ -460,6 +463,7 @@ TEST_CASE(buf_parse_s8_octal_negative)
   BUF_PARSE_TEST_S(8, "-0o177", -127);
   BUF_PARSE_TEST_S(8, "-0o200", -128);
 }
+TEST_CASE_END(buf_parse_s8_octal_negative)
 
 TEST_CASE(buf_parse_s8_hexadecimal)
 {
@@ -838,6 +842,7 @@ TEST_CASE(buf_parse_s8_hexadecimal)
   BUF_PARSE_TEST_S(8, "0x7F",  127);
   BUF_PARSE_TEST_S(8, "0x07F", 127);
 }
+TEST_CASE_END(buf_parse_s8_hexadecimal)
 
 TEST_CASE(buf_parse_s8_hexadecimal_negative)
 {
@@ -1218,6 +1223,7 @@ TEST_CASE(buf_parse_s8_hexadecimal_negative)
   BUF_PARSE_TEST_S(8, "-0x80",  -128);
   BUF_PARSE_TEST_S(8, "-0x080", -128);
 }
+TEST_CASE_END(buf_parse_s8_hexadecimal_negative)
 
 TEST_CASE(buf_parse_s8_decimal)
 {
@@ -1460,6 +1466,7 @@ TEST_CASE(buf_parse_s8_decimal)
   BUF_PARSE_TEST_S(8, "126", 126);
   BUF_PARSE_TEST_S(8, "127", 127);
 }
+TEST_CASE_END(buf_parse_s8_decimal)
 
 TEST_CASE(buf_parse_s8_decimal_negative)
 {
@@ -1703,3 +1710,4 @@ TEST_CASE(buf_parse_s8_decimal_negative)
   BUF_PARSE_TEST_S(8, "-127", -127);
   BUF_PARSE_TEST_S(8, "-128", -128);
 }
+TEST_CASE_END(buf_parse_s8_decimal_negative)
diff --git a/test/buf_parse_test_u16.c b/test/buf_parse_test_u16.c
index d72a7dc..292c21d 100644
--- a/test/buf_parse_test_u16.c
+++ b/test/buf_parse_test_u16.c
@@ -33,6 +33,7 @@ TEST_CASE(buf_parse_u16_binary)
   BUF_PARSE_TEST_U(16, "0b1111111111111110", 65534U);
   BUF_PARSE_TEST_U(16, "0b1111111111111111", 65535U);
 }
+TEST_CASE_END(buf_parse_u16_binary)
 
 TEST_CASE(buf_parse_u16_octal)
 {
@@ -623,6 +624,7 @@ TEST_CASE(buf_parse_u16_octal)
   BUF_PARSE_TEST_U(16, "0o177776", 65534U);
   BUF_PARSE_TEST_U(16, "0o177777", 65535U);
 }
+TEST_CASE_END(buf_parse_u16_octal)
 
 TEST_CASE(buf_parse_u16_hexadecimal)
 {
@@ -8257,6 +8259,7 @@ TEST_CASE(buf_parse_u16_hexadecimal)
   BUF_PARSE_TEST_U(16, "0xffff", 65535U);
   BUF_PARSE_TEST_U(16, "0xFFFF", 65535U);
 }
+TEST_CASE_END(buf_parse_u16_hexadecimal)
 
 TEST_CASE(buf_parse_u16_decimal)
 {
@@ -9373,3 +9376,4 @@ TEST_CASE(buf_parse_u16_decimal)
   BUF_PARSE_TEST_U(16, "65534", 65534U);
   BUF_PARSE_TEST_U(16, "65535", 65535U);
 }
+TEST_CASE_END(buf_parse_u16_decimal)
diff --git a/test/buf_parse_test_u32.c b/test/buf_parse_test_u32.c
index c75d6ec..790c9dc 100644
--- a/test/buf_parse_test_u32.c
+++ b/test/buf_parse_test_u32.c
@@ -35,6 +35,7 @@ TEST_CASE(buf_parse_u32_binary)
   BUF_PARSE_TEST_U(32, "0b11111111111111111111111111111110", 4294967294U);
   BUF_PARSE_TEST_U(32, "0b11111111111111111111111111111111", 4294967295U);
 }
+TEST_CASE_END(buf_parse_u32_binary)
 
 TEST_CASE(buf_parse_u32_octal)
 {
@@ -627,6 +628,7 @@ TEST_CASE(buf_parse_u32_octal)
   BUF_PARSE_TEST_U(32, "0o37777777776", 4294967294U);
   BUF_PARSE_TEST_U(32, "0o37777777777", 4294967295U);
 }
+TEST_CASE_END(buf_parse_u32_octal)
 
 TEST_CASE(buf_parse_u32_hexadecimal)
 {
@@ -8265,6 +8267,7 @@ TEST_CASE(buf_parse_u32_hexadecimal)
   BUF_PARSE_TEST_U(32, "0xffffffff", 4294967295U);
   BUF_PARSE_TEST_U(32, "0xFFFFFFFF", 4294967295U);
 }
+TEST_CASE_END(buf_parse_u32_hexadecimal)
 
 TEST_CASE(buf_parse_u32_decimal)
 {
@@ -9383,3 +9386,4 @@ TEST_CASE(buf_parse_u32_decimal)
   BUF_PARSE_TEST_U(32, "4294967294", 4294967294U);
   BUF_PARSE_TEST_U(32, "4294967295", 4294967295U);
 }
+TEST_CASE_END(buf_parse_u32_decimal)
diff --git a/test/buf_parse_test_u64.c b/test/buf_parse_test_u64.c
index ccd0122..f915bcc 100644
--- a/test/buf_parse_test_u64.c
+++ b/test/buf_parse_test_u64.c
@@ -37,6 +37,7 @@ TEST_CASE(buf_parse_u64_binary)
   BUF_PARSE_TEST_U(64, "0b1111111111111111111111111111111111111111111111111111111111111110", 18446744073709551614U);
   BUF_PARSE_TEST_U(64, "0b1111111111111111111111111111111111111111111111111111111111111111", 18446744073709551615U);
 }
+TEST_CASE_END(buf_parse_u64_binary)
 
 TEST_CASE(buf_parse_u64_octal)
 {
@@ -631,6 +632,7 @@ TEST_CASE(buf_parse_u64_octal)
   BUF_PARSE_TEST_U(64, "0o1777777777777777777776", 18446744073709551614U);
   BUF_PARSE_TEST_U(64, "0o1777777777777777777777", 18446744073709551615U);
 }
+TEST_CASE_END(buf_parse_u64_octal)
 
 TEST_CASE(buf_parse_u64_hexadecimal)
 {
@@ -8273,6 +8275,7 @@ TEST_CASE(buf_parse_u64_hexadecimal)
   BUF_PARSE_TEST_U(64, "0xffffffffffffffff", 18446744073709551615U);
   BUF_PARSE_TEST_U(64, "0xFFFFFFFFFFFFFFFF", 18446744073709551615U);
 }
+TEST_CASE_END(buf_parse_u64_hexadecimal)
 
 TEST_CASE(buf_parse_u64_decimal)
 {
@@ -9393,3 +9396,4 @@ TEST_CASE(buf_parse_u64_decimal)
   BUF_PARSE_TEST_U(64, "18446744073709551614", 18446744073709551614U);
   BUF_PARSE_TEST_U(64, "18446744073709551615", 18446744073709551615U);
 }
+TEST_CASE_END(buf_parse_u64_decimal)
diff --git a/test/buf_parse_test_u8.c b/test/buf_parse_test_u8.c
index f9e01bd..beada5a 100644
--- a/test/buf_parse_test_u8.c
+++ b/test/buf_parse_test_u8.c
@@ -31,6 +31,7 @@ TEST_CASE(buf_parse_u8_binary)
   BUF_PARSE_TEST_U(8, "0b11111110", 254U);
   BUF_PARSE_TEST_U(8, "0b11111111", 255U);
 }
+TEST_CASE_END(buf_parse_u8_binary)
 
 TEST_CASE(buf_parse_u8_octal)
 {
@@ -363,6 +364,7 @@ TEST_CASE(buf_parse_u8_octal)
   BUF_PARSE_TEST_U(8, "0o376", 254U);
   BUF_PARSE_TEST_U(8, "0o377", 255U);
 }
+TEST_CASE_END(buf_parse_u8_octal)
 
 TEST_CASE(buf_parse_u8_hexadecimal)
 {
@@ -1213,6 +1215,7 @@ TEST_CASE(buf_parse_u8_hexadecimal)
   BUF_PARSE_TEST_U(8, "0xFF",  255U);
   BUF_PARSE_TEST_U(8, "0x0FF", 255U);
 }
+TEST_CASE_END(buf_parse_u8_hexadecimal)
 
 TEST_CASE(buf_parse_u8_decimal)
 {
@@ -1583,3 +1586,4 @@ TEST_CASE(buf_parse_u8_decimal)
   BUF_PARSE_TEST_U(8, "254", 254U);
   BUF_PARSE_TEST_U(8, "255", 255U);
 }
+TEST_CASE_END(buf_parse_u8_decimal)
diff --git a/test/buf_test.c b/test/buf_test.c
index 68ba995..bac6b0f 100644
--- a/test/buf_test.c
+++ b/test/buf_test.c
@@ -227,6 +227,7 @@ TEST_CASE(buf_f)
   BUF_TEST_F(buf_f(&buf, "%s", "ÉoàΠ꒴𐅀 \n\r\t\v\\\""),
              "ÉoàΠ꒴𐅀 \n\r\t\v\\\"");
 }
+TEST_CASE_END(buf_f)
 
 TEST_CASE(buf_ignore)
 {
@@ -247,6 +248,7 @@ TEST_CASE(buf_ignore)
   BUF_TEST_IGNORE("1234567890", 2, 2);
   BUF_TEST_IGNORE("1234567890", 10, 10);
 }
+TEST_CASE_END(buf_ignore)
 
 TEST_CASE(buf_init_clean)
 {
@@ -271,6 +273,7 @@ TEST_CASE(buf_init_clean)
   TEST_EQ(buf.wpos, 0);
   BUF_TEST_CLEAN(buf);
 }
+TEST_CASE_END(buf_init_clean)
 
 TEST_CASE(buf_new_delete)
 {
@@ -295,6 +298,7 @@ TEST_CASE(buf_new_delete)
   TEST_EQ(buf->wpos, 0);
   BUF_TEST_DELETE(buf);
 }
+TEST_CASE_END(buf_new_delete)
 
 TEST_CASE(buf_new_alloc_delete)
 {
@@ -310,6 +314,7 @@ TEST_CASE(buf_new_alloc_delete)
     len++;
   }
 }
+TEST_CASE_END(buf_new_alloc_delete)
 
 TEST_CASE(buf_peek_1)
 {
@@ -335,11 +340,13 @@ TEST_CASE(buf_peek_1)
   BUF_TEST_PEEK_1("ꝝ");
   BUF_TEST_PEEK_1("\x01\x02\x03" "ABCabcÀÉΠꝜ꒴𐅀àéπꝝ");
 }
+TEST_CASE_END(buf_peek_1)
 
 TEST_CASE(buf_peek_character_utf8)
 {
   BUF_TEST_PEEK_CHARACTER_UTF8("0", 1, '0');
 }
+TEST_CASE_END(buf_peek_character_utf8)
 
 TEST_CASE(buf_peek_s8)
 {
@@ -356,6 +363,7 @@ TEST_CASE(buf_peek_s8)
   TEST_EQ(byte, 'A');
   TEST_EQ(buf.wpos, 1);
 }
+TEST_CASE_END(buf_peek_s8)
 
 TEST_CASE(buf_peek_s16)
 {
@@ -370,6 +378,7 @@ TEST_CASE(buf_peek_s16)
   TEST_EQ(val, 0x0000);
   TEST_EQ(buf.rpos, 0);
 }
+TEST_CASE_END(buf_peek_s16)
 
 TEST_CASE(buf_peek_u8)
 {
@@ -386,6 +395,7 @@ TEST_CASE(buf_peek_u8)
   TEST_EQ(byte, 'A');
   TEST_EQ(buf.wpos, 1);
 }
+TEST_CASE_END(buf_peek_u8)
 
 TEST_CASE(buf_read_1)
 {
@@ -416,6 +426,7 @@ TEST_CASE(buf_read_1)
   BUF_TEST_READ_1_("a", "", 0);
   BUF_TEST_READ_1_("abc", "", 0);
 }
+TEST_CASE_END(buf_read_1)
 
 TEST_CASE(buf_read_character_utf8)
 {
@@ -429,6 +440,7 @@ TEST_CASE(buf_read_character_utf8)
   BUF_TEST_READ_CHARACTER_UTF8("꒴", 42164);
   BUF_TEST_READ_CHARACTER_UTF8("𐅀", 65856);
 }
+TEST_CASE_END(buf_read_character_utf8)
 
 void buf_test_read_f32()
 {
@@ -458,6 +470,7 @@ void buf_test_read_f32()
   TEST_FLOAT_EQ(f, FLT_MAX);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_character_utf8)
 
 TEST_CASE(buf_read_f64)
 {
@@ -486,6 +499,7 @@ TEST_CASE(buf_read_f64)
   TEST_EQ(buf_read_f64(&buf, &f), 8);
   TEST_DOUBLE_EQ(f, DBL_MAX);
 }
+TEST_CASE_END(buf_read_f64)
 
 TEST_CASE(buf_read_s8)
 {
@@ -529,6 +543,7 @@ TEST_CASE(buf_read_s8)
   TEST_EQ(buf_read_s8(&buf, &byte), 0);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_s8)
 
 TEST_CASE(buf_read_s16)
 {
@@ -553,6 +568,7 @@ TEST_CASE(buf_read_s16)
   TEST_EQ(val, 0x0100);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_s16)
 
 void buf_test_read_s32()
 {
@@ -582,6 +598,7 @@ void buf_test_read_s32()
   TEST_EQ(val, SHRT_MAX);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_s16)
 
 void buf_test_read_s64()
 {
@@ -611,6 +628,7 @@ void buf_test_read_s64()
   TEST_EQ(val, 65534);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_s16)
 
 TEST_CASE(buf_read_to_str)
 {
@@ -627,6 +645,7 @@ TEST_CASE(buf_read_to_str)
   BUF_TEST_READ_TO_STR("é");
   BUF_TEST_READ_TO_STR("09AZÀÉazàé");
 }
+TEST_CASE_END(buf_read_to_str)
 
 TEST_CASE(buf_read_u8)
 {
@@ -652,6 +671,7 @@ TEST_CASE(buf_read_u8)
   TEST_EQ(buf_read_u8(&buf, &byte), -1);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_u8)
 
 void buf_test_read_u16()
 {
@@ -681,6 +701,7 @@ void buf_test_read_u16()
   TEST_EQ(val, 0xFFFF);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_u8)
 
 void buf_test_read_u32()
 {
@@ -710,6 +731,7 @@ void buf_test_read_u32()
   TEST_EQ(val, 0xFFFFFFFF);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_u8)
 
 void buf_test_read_u64()
 {
@@ -739,6 +761,7 @@ void buf_test_read_u64()
   TEST_EQ(val, 0xFFFFFFFFFFFFFFFF);
   buf_clean(&buf);
 }
+TEST_CASE_END(buf_read_u8)
 
 TEST_CASE(buf_write_s8)
 {
@@ -762,6 +785,7 @@ TEST_CASE(buf_write_s8)
   TEST_EQ(buf.wpos, 4);
   TEST_EQ(buf.ptr.ps8[3], -1);
 }
+TEST_CASE_END(buf_write_s8)
 
 TEST_CASE(buf_write_s16)
 {
@@ -785,6 +809,7 @@ TEST_CASE(buf_write_s16)
   TEST_EQ(buf.wpos, 8);
   TEST_EQ(*((s16 *) (buf.ptr.ps8 + 6)), -1);
 }
+TEST_CASE_END(buf_write_s16)
 
 TEST_CASE(buf_write_s32)
 {
@@ -808,6 +833,7 @@ TEST_CASE(buf_write_s32)
   TEST_EQ(buf.wpos, 16);
   TEST_EQ(*((s32 *) (buf.ptr.ps8 + 12)), -1);
 }
+TEST_CASE_END(buf_write_s32)
 
 TEST_CASE(buf_write_s64)
 {
@@ -831,6 +857,7 @@ TEST_CASE(buf_write_s64)
   TEST_EQ(buf.wpos, 32);
   TEST_EQ(*((s64 *) (buf.ptr.ps8 + 24)), -1);
 }
+TEST_CASE_END(buf_write_s64)
 
 TEST_CASE(buf_write_u8)
 {
@@ -854,6 +881,7 @@ TEST_CASE(buf_write_u8)
   TEST_EQ(buf.wpos, 4);
   TEST_EQ(buf.ptr.pu8[3], 0xFF);
 }
+TEST_CASE_END(buf_write_u8)
 
 TEST_CASE(buf_write_u16)
 {
@@ -877,6 +905,7 @@ TEST_CASE(buf_write_u16)
   TEST_EQ(buf.wpos, 8);
   TEST_EQ(*((u16 *) (buf.ptr.pu8 + 6)), 0xFFFF);
 }
+TEST_CASE_END(buf_write_u16)
 
 TEST_CASE(buf_write_u32)
 {
@@ -900,6 +929,7 @@ TEST_CASE(buf_write_u32)
   TEST_EQ(buf.wpos, 16);
   TEST_EQ(*((u32 *) (buf.ptr.pu8 + 12)), 0xFFFFFFFF);
 }
+TEST_CASE_END(buf_write_u32)
 
 TEST_CASE(buf_write_u64)
 {
@@ -923,10 +953,12 @@ TEST_CASE(buf_write_u64)
   TEST_EQ(buf.wpos, 32);
   TEST_EQ(*((u64 *) (buf.ptr.pu8 + 24)), 0xFFFFFFFFFFFFFFFF);
 }
+TEST_CASE_END(buf_write_u64)
 
 TEST_CASE(buf_write_str)
 {
 }
+TEST_CASE_END(buf_write_str)
 
 TEST_CASE(buf_xfer)
 {
@@ -947,3 +979,4 @@ TEST_CASE(buf_xfer)
   TEST_EQ(buf_xfer(&dest, &src, 7), 0);
   TEST_EQ(buf_xfer(&dest, &src, 8), 0);
 }
+TEST_CASE_END(buf_xfer)
diff --git a/test/call_test.c b/test/call_test.c
index 59f56d2..184f1eb 100644
--- a/test/call_test.c
+++ b/test/call_test.c
@@ -56,6 +56,7 @@ TEST_CASE(call_init_1)
   CALL_TEST_INIT_1("A.b(c, d)");
   CALL_TEST_INIT_1("A.b(c, d, e)");
 }
+TEST_CASE_END(call_init_1)
 
 TEST_CASE(call_inspect)
 {
@@ -68,3 +69,4 @@ TEST_CASE(call_inspect)
   CALL_TEST_INSPECT("A.b(c, d)");
   CALL_TEST_INSPECT("A.b(c, d, e)");
 }
+TEST_CASE_END(call_inspect)
diff --git a/test/cfn_test.c b/test/cfn_test.c
index a3a1801..9c83e83 100644
--- a/test/cfn_test.c
+++ b/test/cfn_test.c
@@ -57,6 +57,7 @@ TEST_CASE(cfn_apply)
   list_delete_all(args);
   cfn_clean(&a);
 }
+TEST_CASE_END(cfn_apply)
 
 TEST_CASE(cfn_copy)
 {
@@ -92,6 +93,7 @@ TEST_CASE(cfn_copy)
   cfn_clean(&b);
   cfn_clean(&a);
 }
+TEST_CASE_END(cfn_copy)
 
 TEST_CASE(cfn_init_clean)
 {
@@ -118,6 +120,7 @@ TEST_CASE(cfn_init_clean)
   cfn_clean(&a);
   test_ok();
 }
+TEST_CASE_END(cfn_init_clean)
 
 TEST_CASE(cfn_link)
 {
@@ -142,11 +145,13 @@ TEST_CASE(cfn_link)
   TEST_EQ(a.cif.flags, b.cif.flags);
   cfn_clean(&a);
 }
+TEST_CASE_END(cfn_link)
 
 bool cfn_test_not (bool a)
 {
   return a ? false : true;
 }
+TEST_CASE_END(cfn_link)
 
 TEST_CASE(cfn_prep_cif)
 {
@@ -170,3 +175,4 @@ TEST_CASE(cfn_prep_cif)
   TEST_EQ(a.cif.rtype, &ffi_type_uint8);
   cfn_clean(&a);
 }
+TEST_CASE_END(cfn_prep_cif)
diff --git a/test/character_test.c b/test/character_test.c
index 4ed4599..fdf00cd 100644
--- a/test/character_test.c
+++ b/test/character_test.c
@@ -72,6 +72,7 @@ TEST_CASE(character_1)
   TEST_EQ(character_1("Ꝝ"), 42844);
   TEST_EQ(character_1("ꝝ"), 42845);
 }
+TEST_CASE_END(character_1)
 
 TEST_CASE(character_is_digit)
 {
@@ -117,6 +118,7 @@ TEST_CASE(character_is_digit)
   TEST_ASSERT(! character_is_digit(character_1("π")));
   TEST_ASSERT(! character_is_digit(character_1("ꝝ")));
 }
+TEST_CASE_END(character_is_digit)
 
 TEST_CASE(character_is_lowercase)
 {
@@ -156,6 +158,7 @@ TEST_CASE(character_is_lowercase)
   TEST_ASSERT(character_is_lowercase(character_1("π")));
   TEST_ASSERT(character_is_lowercase(character_1("ꝝ")));
 }
+TEST_CASE_END(character_is_lowercase)
 
 TEST_CASE(character_is_space)
 {
@@ -192,6 +195,7 @@ TEST_CASE(character_is_space)
   TEST_ASSERT(! character_is_space(character_1("Π")));
   TEST_ASSERT(! character_is_space(character_1("Ꝝ")));
 }
+TEST_CASE_END(character_is_space)
 
 TEST_CASE(character_is_uppercase)
 {
@@ -227,10 +231,12 @@ TEST_CASE(character_is_uppercase)
   TEST_ASSERT(character_is_uppercase(character_1("Π")));
   TEST_ASSERT(character_is_uppercase(character_1("Ꝝ")));
 }
+TEST_CASE_END(character_is_uppercase)
 
 TEST_CASE(character_utf8)
 {
 }
+TEST_CASE_END(character_utf8)
 
 TEST_CASE(character_utf8_size)
 {
@@ -265,3 +271,4 @@ TEST_CASE(character_utf8_size)
   TEST_EQ(character_utf8_size(character_1("꒴")), 3);
   TEST_EQ(character_utf8_size(character_1("𐅀")), 4);
 }
+TEST_CASE_END(character_utf8_size)
diff --git a/test/compare_test.c b/test/compare_test.c
index 86aef3b..7f3a2b8 100644
--- a/test/compare_test.c
+++ b/test/compare_test.c
@@ -65,6 +65,7 @@ TEST_CASE(compare_bool)
   TEST_EQ(compare_bool(true, false), 1);
   TEST_EQ(compare_bool(true, true), 0);
 }
+TEST_CASE_END(compare_bool)
 
 TEST_CASE(compare_character)
 {
@@ -80,6 +81,7 @@ TEST_CASE(compare_character)
   TEST_EQ(compare_character('A', 'a'), -1);
   TEST_EQ(compare_character('a', 'A'), 1);
 }
+TEST_CASE_END(compare_character)
 
 TEST_CASE(compare_f32)
 {
@@ -108,6 +110,7 @@ TEST_CASE(compare_f32)
                       1.597693134862315708145274237317043567981e+38),
           1);
 }
+TEST_CASE_END(compare_f32)
 
 TEST_CASE(compare_f64)
 {
@@ -131,6 +134,7 @@ TEST_CASE(compare_f64)
                       1.597693134862315708145274237317043567981e+308),
           1);
 }
+TEST_CASE_END(compare_f64)
 
 TEST_CASE(compare_list)
 {
@@ -138,6 +142,7 @@ TEST_CASE(compare_list)
   COMPARE_TEST_LIST(list_1("(A, B)"), list_1("(A, C)"), -1);
   COMPARE_TEST_LIST(list_1("(A, C)"), list_1("(A, B)"), 1);
 }
+TEST_CASE_END(compare_list)
 
 TEST_CASE(compare_str)
 {
@@ -166,6 +171,7 @@ TEST_CASE(compare_str)
   COMPARE_TEST_STR(str_init_1(&a, NULL, "012"), str_init_1(&b, NULL, "0134"), -1);
   COMPARE_TEST_STR(str_init_1(&a, NULL, "012"), str_init_1(&b, NULL, "ABC"), -1);
 }
+TEST_CASE_END(compare_str)
 
 TEST_CASE(compare_tag)
 {
@@ -357,6 +363,7 @@ TEST_CASE(compare_tag)
   tag_clean(&a);
   tag_clean(&b);
 }
+TEST_CASE_END(compare_tag)
 
 TEST_CASE(compare_tuple)
 {
@@ -384,3 +391,4 @@ TEST_CASE(compare_tuple)
   tuple_clean(&a);
   tuple_clean(&b);
 }
+TEST_CASE_END(compare_tuple)
diff --git a/test/env_test.c b/test/env_test.c
index f01b084..08b43ca 100644
--- a/test/env_test.c
+++ b/test/env_test.c
@@ -89,6 +89,7 @@ TEST_CASE(env_eval_equal_tag)
   tag_clean(&y);
   test_context(NULL);
 }
+TEST_CASE_END(env_eval_equal_tag)
 
 TEST_CASE(env_init_clean)
 {
@@ -98,3 +99,4 @@ TEST_CASE(env_init_clean)
   env_clean(&env);
   test_ok();
 }
+TEST_CASE_END(env_init_clean)
diff --git a/test/fact_test.c b/test/fact_test.c
index ab45735..a69492a 100644
--- a/test/fact_test.c
+++ b/test/fact_test.c
@@ -62,6 +62,7 @@ TEST_CASE(fact_init)
   TEST_EQ(fact.predicate, sym + 1);
   TEST_EQ(fact.object, sym + 2);
 }
+TEST_CASE_END(fact_init)
 
 s_fact * fact_test_init_1 (s_fact *fact, const s8 *tag)
 {
@@ -69,6 +70,7 @@ s_fact * fact_test_init_1 (s_fact *fact, const s8 *tag)
   fact->subject = fact->predicate = fact->object = tag_new_1(tag);
   return fact;
 }
+TEST_CASE_END(fact_init)
 
 s_fact * fact_test_init_3 (s_fact *fact, const s8 *subject,
                            const s8 *predicate, const s8 *object)
@@ -79,6 +81,7 @@ s_fact * fact_test_init_3 (s_fact *fact, const s8 *subject,
   fact->object    = tag_new_1(object);
   return fact;
 }
+TEST_CASE_END(fact_init)
 
 TEST_CASE(fact_inspect)
 {
@@ -90,3 +93,4 @@ TEST_CASE(fact_inspect)
   fact_init(&fact, tag, tag + 1, tag + 2);
   FACT_TEST_INSPECT(&fact, "{A, B, C}");
 }
+TEST_CASE_END(fact_inspect)
diff --git a/test/facts_cursor_test.c b/test/facts_cursor_test.c
index aba7219..b8f5d91 100644
--- a/test/facts_cursor_test.c
+++ b/test/facts_cursor_test.c
@@ -107,6 +107,7 @@ TEST_CASE(facts_cursor_init)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_cursor_init)
 
 TEST_CASE(facts_cursor_next)
 {
@@ -231,3 +232,4 @@ TEST_CASE(facts_cursor_next)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_cursor_next)
diff --git a/test/facts_test.c b/test/facts_test.c
index f51ee8d..00253c8 100644
--- a/test/facts_test.c
+++ b/test/facts_test.c
@@ -99,6 +99,7 @@ TEST_CASE(facts_add)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_add)
 
 TEST_CASE(facts_dump_file)
 {
@@ -149,6 +150,7 @@ TEST_CASE(facts_dump_file)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_dump_file)
 
 TEST_CASE(facts_find)
 {
@@ -202,6 +204,7 @@ TEST_CASE(facts_find)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_find)
 
 TEST_CASE(facts_init_clean)
 {
@@ -219,6 +222,7 @@ TEST_CASE(facts_init_clean)
   facts_clean(&facts);
   test_ok();
 }
+TEST_CASE_END(facts_init_clean)
 
 TEST_CASE(facts_load)
 {
@@ -264,6 +268,7 @@ TEST_CASE(facts_load)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_load)
 
 TEST_CASE(facts_log_add)
 {
@@ -314,6 +319,7 @@ TEST_CASE(facts_log_add)
   if (g_test_last_ok)
     unlink("facts_test_log_add.facts");
 }
+TEST_CASE_END(facts_log_add)
 
 TEST_CASE(facts_log_remove)
 {
@@ -371,6 +377,7 @@ TEST_CASE(facts_log_remove)
   if (g_test_last_ok)
     unlink("facts_test_log_remove.facts");
 }
+TEST_CASE_END(facts_log_remove)
 
 TEST_CASE(facts_new_delete)
 {
@@ -393,6 +400,7 @@ TEST_CASE(facts_new_delete)
     test_ok();
   }
 }
+TEST_CASE_END(facts_new_delete)
 
 TEST_CASE(facts_open_file)
 {
@@ -542,6 +550,7 @@ TEST_CASE(facts_open_file)
   if (g_test_last_ok)
     unlink("facts_test_open_file.3.facts");
 }
+TEST_CASE_END(facts_open_file)
 
 TEST_CASE(facts_remove)
 {
@@ -591,6 +600,7 @@ TEST_CASE(facts_remove)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_remove)
 
 TEST_CASE(facts_save)
 {
@@ -641,3 +651,4 @@ TEST_CASE(facts_save)
   }
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_save)
diff --git a/test/facts_with_test.c b/test/facts_with_test.c
index e92f3f1..c35acdc 100644
--- a/test/facts_with_test.c
+++ b/test/facts_with_test.c
@@ -177,6 +177,7 @@ TEST_CASE(facts_with_)
   facts_with_cursor_clean(&cursor);
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_with_)
 
 TEST_CASE(facts_with_tags)
 {
@@ -241,3 +242,4 @@ TEST_CASE(facts_with_tags)
   FACT_TEST_EQ(NULL, facts_cursor_next(&cursor));
   facts_clean(&facts);
 }
+TEST_CASE_END(facts_with_tags)
diff --git a/test/ident_test.c b/test/ident_test.c
index d528ef5..70eb5aa 100644
--- a/test/ident_test.c
+++ b/test/ident_test.c
@@ -70,6 +70,7 @@ TEST_CASE(ident_character_is_reserved)
   IDENT_TEST_CHARACTER_IS_RESERVED(character_1("🟣"), false);
   IDENT_TEST_CHARACTER_IS_RESERVED(character_1("🤩"), false);
 }
+TEST_CASE_END(ident_character_is_reserved)
 
 TEST_CASE(ident_first_character_is_reserved)
 {
@@ -94,6 +95,7 @@ TEST_CASE(ident_first_character_is_reserved)
   IDENT_TEST_FIRST_CHARACTER_IS_RESERVED(character_1("🟣"), false);
   IDENT_TEST_FIRST_CHARACTER_IS_RESERVED(character_1("🤩"), false);
 }
+TEST_CASE_END(ident_first_character_is_reserved)
 
 void ident_test ()
 {
@@ -101,6 +103,7 @@ void ident_test ()
   ident_test_first_character_is_reserved();
   ident_test_character_is_reserved();
 }
+TEST_CASE_END(ident_first_character_is_reserved)
 
 TEST_CASE(ident_inspect)
 {
@@ -139,3 +142,4 @@ TEST_CASE(ident_inspect)
   IDENT_TEST_INSPECT("é", "é");
   IDENT_TEST_INSPECT("éoπꝝ꒴", "éoπꝝ꒴");
 }
+TEST_CASE_END(ident_inspect)
diff --git a/test/list_test.c b/test/list_test.c
index 8be1fcb..6da279f 100644
--- a/test/list_test.c
+++ b/test/list_test.c
@@ -62,6 +62,7 @@ TEST_CASE(list_1)
   LIST_TEST_1("(A, B, C)");
   LIST_TEST_1("(A, B, C | D)");
 }
+TEST_CASE_END(list_1)
 
 TEST_CASE(list_inspect)
 {
@@ -69,3 +70,4 @@ TEST_CASE(list_inspect)
   LIST_TEST_INSPECT("(() | ())", "(())");
   LIST_TEST_INSPECT("((), () | ())", "((), ())");
 }
+TEST_CASE_END(list_inspect)
diff --git a/test/set__fact_test.c b/test/set__fact_test.c
index 78ce27d..86515e6 100644
--- a/test/set__fact_test.c
+++ b/test/set__fact_test.c
@@ -137,6 +137,7 @@ TEST_CASE(set__fact_add)
   }
   set_clean__fact(&set);
 }
+TEST_CASE_END(set__fact_add)
 
 TEST_CASE(set__fact_cursor)
 {
@@ -186,6 +187,7 @@ TEST_CASE(set__fact_cursor)
   }
   set_clean__fact(&set);
 }
+TEST_CASE_END(set__fact_cursor)
 
 TEST_CASE(set__fact_init_clean)
 {
@@ -220,6 +222,7 @@ TEST_CASE(set__fact_init_clean)
   SET__FACT_TEST_INIT_CLEAN(1000000);
   SET__FACT_TEST_INIT_CLEAN(1024 * 1024);
 }
+TEST_CASE_END(set__fact_init_clean)
 
 TEST_CASE(set__fact_remove)
 {
@@ -266,6 +269,7 @@ TEST_CASE(set__fact_remove)
   }
   set_clean__fact(&set);
 }
+TEST_CASE_END(set__fact_remove)
 
 TEST_CASE(set__fact_resize)
 {
@@ -347,3 +351,4 @@ TEST_CASE(set__fact_resize)
   }
   set_clean__fact(&set);
 }
+TEST_CASE_END(set__fact_resize)
diff --git a/test/set__tag_test.c b/test/set__tag_test.c
index 379c472..ff2c446 100644
--- a/test/set__tag_test.c
+++ b/test/set__tag_test.c
@@ -159,6 +159,7 @@ TEST_CASE(set__tag_add)
   tag_clean(&tag);
   set_clean__tag(&set);
 }
+TEST_CASE_END(set__tag_add)
 
 TEST_CASE(set__tag_cursor)
 {
@@ -264,6 +265,7 @@ TEST_CASE(set__tag_cursor)
   tag_clean(&tag);
   set_clean__tag(&set);
 }
+TEST_CASE_END(set__tag_cursor)
 
 TEST_CASE(set__tag_init_clean)
 {
@@ -298,6 +300,7 @@ TEST_CASE(set__tag_init_clean)
   SET__TAG_TEST_INIT_CLEAN(1000000);
   SET__TAG_TEST_INIT_CLEAN(1024 * 1024);
 }
+TEST_CASE_END(set__tag_init_clean)
 
 TEST_CASE(set__tag_remove)
 {
@@ -378,6 +381,7 @@ TEST_CASE(set__tag_remove)
   tag_clean(&tag);
   set_clean__tag(&set);
 }
+TEST_CASE_END(set__tag_remove)
 
 TEST_CASE(set__tag_resize)
 {
@@ -454,3 +458,4 @@ TEST_CASE(set__tag_resize)
   tag_clean(&tag);
   set_clean__tag(&set);
 }
+TEST_CASE_END(set__tag_resize)
diff --git a/test/skiplist__fact_test.c b/test/skiplist__fact_test.c
index 3a56b13..54b171d 100644
--- a/test/skiplist__fact_test.c
+++ b/test/skiplist__fact_test.c
@@ -119,6 +119,7 @@ TEST_CASE(skiplist__fact_find)
     }
   }
 }
+TEST_CASE_END(skiplist__fact_find)
 
 TEST_CASE(skiplist__fact_insert)
 {
@@ -177,6 +178,7 @@ TEST_CASE(skiplist__fact_insert)
     i++;
   }
 }
+TEST_CASE_END(skiplist__fact_insert)
 
 TEST_CASE(skiplist__fact_new_delete)
 {
@@ -190,6 +192,7 @@ TEST_CASE(skiplist__fact_new_delete)
     }
   }
 }
+TEST_CASE_END(skiplist__fact_new_delete)
 
 TEST_CASE(skiplist__fact_remove)
 {
@@ -244,3 +247,4 @@ TEST_CASE(skiplist__fact_remove)
     }
   }
 }
+TEST_CASE_END(skiplist__fact_remove)
diff --git a/test/str_test.c b/test/str_test.c
index 6e37032..a4c4547 100644
--- a/test/str_test.c
+++ b/test/str_test.c
@@ -124,6 +124,7 @@ TEST_CASE(str_character_is_reserved)
   TEST_ASSERT(str_character_is_reserved('"'));
   TEST_ASSERT(str_character_is_reserved('\\'));
 }
+TEST_CASE_END(str_character_is_reserved)
 
 TEST_CASE(str_init_clean)
 {
@@ -146,6 +147,7 @@ TEST_CASE(str_init_clean)
   str_clean(&stra);
   test_ok();
 }
+TEST_CASE_END(str_init_clean)
 
 TEST_CASE(str_init_dup)
 {
@@ -173,6 +175,7 @@ TEST_CASE(str_init_dup)
   str_clean(&str);
   test_ok();
 }
+TEST_CASE_END(str_init_dup)
 
 TEST_CASE(str_init_dup_1)
 {
@@ -196,6 +199,7 @@ TEST_CASE(str_init_dup_1)
   str_clean(&str);
   test_ok();
 }
+TEST_CASE_END(str_init_dup_1)
 
 TEST_CASE(str_inspect)
 {
@@ -278,6 +282,7 @@ TEST_CASE(str_inspect)
                    "\"\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0"
                    "\\0\"");
 }
+TEST_CASE_END(str_inspect)
 
 TEST_CASE(str_new_1)
 {
@@ -285,6 +290,7 @@ TEST_CASE(str_new_1)
   TEST_ASSERT((str = str_new_1(NULL, "test")));
   str_delete(str);
 }
+TEST_CASE_END(str_new_1)
 
 TEST_CASE(str_new_cpy)
 {
@@ -292,6 +298,7 @@ TEST_CASE(str_new_cpy)
   TEST_ASSERT((str = str_new_cpy(4, "test")));
   str_delete(str);
 }
+TEST_CASE_END(str_new_cpy)
 
 TEST_CASE(str_new_delete)
 {
@@ -313,6 +320,7 @@ TEST_CASE(str_new_delete)
   str_delete(str);
   test_ok();
 }
+TEST_CASE_END(str_new_delete)
 
 TEST_CASE(str_new_dup)
 {
@@ -339,6 +347,7 @@ TEST_CASE(str_new_dup)
   str_delete(str);
   test_ok();
 }
+TEST_CASE_END(str_new_dup)
 
 TEST_CASE(str_new_f)
 {
@@ -350,6 +359,7 @@ TEST_CASE(str_new_f)
   TEST_STRNCMP(str->ptr.p, "test42", str->size);
   str_delete(str);
 }
+TEST_CASE_END(str_new_f)
 
 TEST_CASE(str_to_hex)
 {
@@ -430,6 +440,7 @@ TEST_CASE(str_to_hex)
                   "6162636465666768696A6B6C6D6E6F70"
                   "7172737475767778797A");
 }
+TEST_CASE_END(str_to_hex)
 
 TEST_CASE(str_to_sym)
 {
@@ -445,3 +456,4 @@ TEST_CASE(str_to_sym)
   STR_TEST_TO_SYM("à");
   STR_TEST_TO_SYM("é");
 }
+TEST_CASE_END(str_to_sym)
diff --git a/test/sym_test.c b/test/sym_test.c
index 65e2c48..e05bfce 100644
--- a/test/sym_test.c
+++ b/test/sym_test.c
@@ -91,6 +91,7 @@ TEST_CASE(sym_1)
   sym_test_1_test("éo");
   sym_test_1_test("éoà \n\r\t\v\"");
 }
+TEST_CASE_END(sym_1)
 
 const s_sym * sym_test_1_test (const s8 *p)
 {
@@ -103,6 +104,7 @@ const s_sym * sym_test_1_test (const s8 *p)
   TEST_EQ(sym_1(p), sym_1(p));
   return sym;
 }
+TEST_CASE_END(sym_1)
 
 TEST_CASE(sym_inspect)
 {
@@ -141,3 +143,4 @@ TEST_CASE(sym_inspect)
   SYM_TEST_INSPECT("éoà \n\r\t\v\"",
                    ":\"éoà \\n\\r\\t\\v\\\"\"");
 }
+TEST_CASE_END(sym_inspect)
diff --git a/test/tag_test.c b/test/tag_test.c
index 9b57198..4b6555c 100644
--- a/test/tag_test.c
+++ b/test/tag_test.c
@@ -46,6 +46,7 @@ TEST_CASE(tag_hash_u64)
   tag_clean(&a);
   tag_clean(&b);
 }
+TEST_CASE_END(tag_hash_u64)
 
 TEST_CASE(tag_init_1)
 {
@@ -57,3 +58,4 @@ TEST_CASE(tag_init_1)
   TEST_ASSERT(tag_init_1(&a, "fn (x, y) { x }"));
   tag_clean(&a);
 }
+TEST_CASE_END(tag_init_1)
diff --git a/test/test_case_end.rb b/test/test_case_end.rb
index 6893181..b1ebd78 100644
--- a/test/test_case_end.rb
+++ b/test/test_case_end.rb
@@ -2,13 +2,13 @@ require 'fileutils'
 Dir["*.c"].each do |file|
   file_tmp = file + ".tmp"
   File.open(file_tmp, "w") do |out|
-    test_case_name = nil
+    test_case_name = ""
     File.foreach(file) do |line|
       line.match(/^TEST_CASE\((.*)\)$/) do |m|
         test_case_name = m[1]
       end
       out.write line
-      out.puts "TEST_CASE_END(#{test_case_name})" if line == "}\n"
+      out.puts "TEST_CASE_END(#{test_case_name})" if line == "}\n" && test_case_name != ""
     end
   end
   FileUtils.cp(file, file + "~")
diff --git a/test/tuple_test.c b/test/tuple_test.c
index e2b59a4..b8e8138 100644
--- a/test/tuple_test.c
+++ b/test/tuple_test.c
@@ -110,6 +110,7 @@ TEST_CASE(tuple_init_clean)
   TUPLE_TEST_INIT_CLEAN(19);
   TUPLE_TEST_INIT_CLEAN(20);
 }
+TEST_CASE_END(tuple_init_clean)
 
 TEST_CASE(tuple_init_1)
 {
@@ -121,6 +122,7 @@ TEST_CASE(tuple_init_1)
   TUPLE_TEST_INIT_1("{{:a, :b}, {:c, :d}, {:e, :f}, {:g, :h}}");
   TUPLE_TEST_INIT_1("{{:a, :b}, {:c, :d}, {:e, :f}, {:g, :h}, {:i, :j}}");
 }
+TEST_CASE_END(tuple_init_1)
 
 TEST_CASE(tuple_inspect)
 {
@@ -129,6 +131,7 @@ TEST_CASE(tuple_inspect)
   TUPLE_TEST_INSPECT("{{:a, :b}, {:c, :d}, {:e, :f}}",
                      "{{:a, :b}, {:c, :d}, {:e, :f}}");
 }
+TEST_CASE_END(tuple_inspect)
 
 TEST_CASE(tuple_new_1)
 {
@@ -140,6 +143,7 @@ TEST_CASE(tuple_new_1)
   TUPLE_TEST_NEW_1("{{:a, :b}, {:c, :d}, {:e, :f}, {:g, :h}}");
   TUPLE_TEST_NEW_1("{{:a, :b}, {:c, :d}, {:e, :f}, {:g, :h}, {:i, :j}}");
 }
+TEST_CASE_END(tuple_new_1)
 
 TEST_CASE(tuple_new_delete)
 {
@@ -163,3 +167,4 @@ TEST_CASE(tuple_new_delete)
   TUPLE_TEST_NEW_DELETE(19);
   TUPLE_TEST_NEW_DELETE(20);
 }
+TEST_CASE_END(tuple_new_delete)
diff --git a/test/types_test.c b/test/types_test.c
index 6d498d4..113ff23 100644
--- a/test/types_test.c
+++ b/test/types_test.c
@@ -36,3 +36,4 @@ TEST_CASE(types_sizeof)
   TEST_EQ(sizeof(bool), sizeof(u8));
   TEST_EQ(sizeof(u_ptr), sizeof(void *));
 }
+TEST_CASE_END(types_sizeof)