kc3-lang/kc3

diff --git a/test/bool_test.c b/test/bool_test.c
index e499218..2ff1aa2 100644
--- a/test/bool_test.c
+++ b/test/bool_test.c
@@ -32,8 +32,8 @@ TEST_CASE_PROTOTYPE(bool_inspect);
 
 void bool_test ()
 {
-  bool_test_compat();
-  bool_test_inspect();
+  TEST_CASE_RUN(bool_compat);
+  TEST_CASE_RUN(bool_inspect);
 }
 
 TEST_CASE(bool_compat)
diff --git a/test/buf_file_test.c b/test/buf_file_test.c
index 895c467..fdad6c2 100644
--- a/test/buf_file_test.c
+++ b/test/buf_file_test.c
@@ -22,9 +22,9 @@ TEST_CASE_PROTOTYPE(buf_file_open_w_flush);
 
 void buf_file_test ()
 {
-  buf_file_test_open_r_close();
-  buf_file_test_open_r_refill();
-  buf_file_test_open_w_close();
+  TEST_CASE_RUN(buf_file_open_r_close);
+  TEST_CASE_RUN(buf_file_open_r_refill);
+  TEST_CASE_RUN(buf_file_open_w_close);
 }
 
 TEST_CASE(buf_file_open_r_close)
diff --git a/test/buf_inspect_test.c b/test/buf_inspect_test.c
index 6a49746..1e1057e 100644
--- a/test/buf_inspect_test.c
+++ b/test/buf_inspect_test.c
@@ -167,16 +167,16 @@ TEST_CASE_PROTOTYPE(buf_inspect_tag);
 
 void buf_inspect_test ()
 {
-  buf_inspect_test_bool();
-  buf_inspect_test_str_character_size();
-  buf_inspect_test_str_character();
-  buf_inspect_test_character();
-  buf_inspect_test_f32();
-  buf_inspect_test_f64();
-  buf_inspect_test_integer();
-  buf_inspect_test_list();
-  buf_inspect_test_str();
-  buf_inspect_test_tag();
+  TEST_CASE_RUN(buf_inspect_bool);
+  TEST_CASE_RUN(buf_inspect_str_character_size);
+  TEST_CASE_RUN(buf_inspect_str_character);
+  TEST_CASE_RUN(buf_inspect_character);
+  TEST_CASE_RUN(buf_inspect_f32);
+  TEST_CASE_RUN(buf_inspect_f64);
+  TEST_CASE_RUN(buf_inspect_integer);
+  TEST_CASE_RUN(buf_inspect_list);
+  TEST_CASE_RUN(buf_inspect_str);
+  TEST_CASE_RUN(buf_inspect_tag);
 }
 
 TEST_CASE(buf_inspect_bool)
diff --git a/test/buf_parse_test.c b/test/buf_parse_test.c
index 126d260..9ea93b4 100644
--- a/test/buf_parse_test.c
+++ b/test/buf_parse_test.c
@@ -691,81 +691,81 @@ TEST_CASE_PROTOTYPE(buf_parse_uw);
 
 void buf_parse_test ()
 {
-  buf_parse_test_bool();
-  buf_parse_test_call();
-  buf_parse_test_call_op();
-  buf_parse_test_digit_bin();
-  buf_parse_test_digit_hex();
-  buf_parse_test_digit_oct();
-  buf_parse_test_digit_dec();
-  buf_parse_test_str_character();
-  buf_parse_test_str_u8();
-  buf_parse_test_character();
-  buf_parse_test_f32();
-  buf_parse_test_f64();
-  buf_parse_test_fn();
-  buf_parse_test_integer_bin();
-  buf_parse_test_integer_dec();
-  buf_parse_test_integer_hex();
-  buf_parse_test_integer_oct();
-  buf_parse_test_integer();
-  buf_parse_test_str();
-  buf_parse_test_sym();
-  buf_parse_test_ident();
-  buf_parse_test_list();
-  buf_parse_test_tag();
-  buf_parse_test_tuple();
-  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_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();
+  TEST_CASE_RUN(buf_parse_bool);
+  TEST_CASE_RUN(buf_parse_call);
+  TEST_CASE_RUN(buf_parse_call_op);
+  TEST_CASE_RUN(buf_parse_digit_bin);
+  TEST_CASE_RUN(buf_parse_digit_hex);
+  TEST_CASE_RUN(buf_parse_digit_oct);
+  TEST_CASE_RUN(buf_parse_digit_dec);
+  TEST_CASE_RUN(buf_parse_str_character);
+  TEST_CASE_RUN(buf_parse_str_u8);
+  TEST_CASE_RUN(buf_parse_character);
+  TEST_CASE_RUN(buf_parse_f32);
+  TEST_CASE_RUN(buf_parse_f64);
+  TEST_CASE_RUN(buf_parse_fn);
+  TEST_CASE_RUN(buf_parse_integer_bin);
+  TEST_CASE_RUN(buf_parse_integer_dec);
+  TEST_CASE_RUN(buf_parse_integer_hex);
+  TEST_CASE_RUN(buf_parse_integer_oct);
+  TEST_CASE_RUN(buf_parse_integer);
+  TEST_CASE_RUN(buf_parse_str);
+  TEST_CASE_RUN(buf_parse_sym);
+  TEST_CASE_RUN(buf_parse_ident);
+  TEST_CASE_RUN(buf_parse_list);
+  TEST_CASE_RUN(buf_parse_tag);
+  TEST_CASE_RUN(buf_parse_tuple);
+  TEST_CASE_RUN(buf_parse_u8_binary);
+  TEST_CASE_RUN(buf_parse_u8_octal);
+  TEST_CASE_RUN(buf_parse_u8_hexadecimal);
+  TEST_CASE_RUN(buf_parse_u8_decimal);
+  TEST_CASE_RUN(buf_parse_u16_binary);
+  TEST_CASE_RUN(buf_parse_u16_octal);
+  TEST_CASE_RUN(buf_parse_u16_hexadecimal);
+  TEST_CASE_RUN(buf_parse_u16_decimal);
+  TEST_CASE_RUN(buf_parse_u32_binary);
+  TEST_CASE_RUN(buf_parse_u32_octal);
+  TEST_CASE_RUN(buf_parse_u32_hexadecimal);
+  TEST_CASE_RUN(buf_parse_u32_decimal);
+  TEST_CASE_RUN(buf_parse_u64_binary);
+  TEST_CASE_RUN(buf_parse_u64_octal);
+  TEST_CASE_RUN(buf_parse_u64_hexadecimal);
+  TEST_CASE_RUN(buf_parse_u64_decimal);
+  TEST_CASE_RUN(buf_parse_uw);
+  TEST_CASE_RUN(buf_parse_s16_binary);
+  TEST_CASE_RUN(buf_parse_s16_binary_negative);
+  TEST_CASE_RUN(buf_parse_s16_octal);
+  TEST_CASE_RUN(buf_parse_s16_octal_negative);
+  TEST_CASE_RUN(buf_parse_s16_hexadecimal);
+  TEST_CASE_RUN(buf_parse_s16_hexadecimal_negative);
+  TEST_CASE_RUN(buf_parse_s16_decimal);
+  TEST_CASE_RUN(buf_parse_s16_decimal_negative);
+  TEST_CASE_RUN(buf_parse_s32_binary);
+  TEST_CASE_RUN(buf_parse_s32_binary_negative);
+  TEST_CASE_RUN(buf_parse_s32_octal);
+  TEST_CASE_RUN(buf_parse_s32_octal_negative);
+  TEST_CASE_RUN(buf_parse_s32_hexadecimal);
+  TEST_CASE_RUN(buf_parse_s32_hexadecimal_negative);
+  TEST_CASE_RUN(buf_parse_s32_decimal);
+  TEST_CASE_RUN(buf_parse_s32_decimal_negative);
+  TEST_CASE_RUN(buf_parse_s64_binary);
+  TEST_CASE_RUN(buf_parse_s64_binary_negative);
+  TEST_CASE_RUN(buf_parse_s64_octal);
+  TEST_CASE_RUN(buf_parse_s64_octal_negative);
+  TEST_CASE_RUN(buf_parse_s64_hexadecimal);
+  TEST_CASE_RUN(buf_parse_s64_hexadecimal_negative);
+  TEST_CASE_RUN(buf_parse_s64_decimal);
+  TEST_CASE_RUN(buf_parse_s64_decimal_negative);
+  TEST_CASE_RUN(buf_parse_s8_binary);
+  TEST_CASE_RUN(buf_parse_s8_binary_negative);
+  TEST_CASE_RUN(buf_parse_s8_octal);
+  TEST_CASE_RUN(buf_parse_s8_octal_negative);
+  TEST_CASE_RUN(buf_parse_s8_hexadecimal);
+  TEST_CASE_RUN(buf_parse_s8_hexadecimal_negative);
+  TEST_CASE_RUN(buf_parse_s8_decimal);
+  TEST_CASE_RUN(buf_parse_s8_decimal_negative);
+  TEST_CASE_RUN(buf_parse_sw);
+  TEST_CASE_RUN(buf_parse_cfn);
 }
 
 TEST_CASE(buf_parse_bool)
diff --git a/test/buf_test.c b/test/buf_test.c
index 31e8c2a..d27ad23 100644
--- a/test/buf_test.c
+++ b/test/buf_test.c
@@ -176,39 +176,39 @@ TEST_CASE_PROTOTYPE(buf_xfer);
 
 void buf_test ()
 {
-  buf_test_init_clean();
-  buf_test_new_delete();
-  buf_test_new_alloc_delete();
-  buf_test_write_u8();
-  buf_test_write_u16();
-  buf_test_write_u32();
-  buf_test_write_u64();
-  buf_test_write_s8();
-  buf_test_write_s16();
-  buf_test_write_s32();
-  buf_test_write_s64();
-  buf_test_write_str();
-  buf_test_peek_1();
-  buf_test_peek_character_utf8();
+  TEST_CASE_RUN(buf_init_clean);
+  TEST_CASE_RUN(buf_new_delete);
+  TEST_CASE_RUN(buf_new_alloc_delete);
+  TEST_CASE_RUN(buf_write_u8);
+  TEST_CASE_RUN(buf_write_u16);
+  TEST_CASE_RUN(buf_write_u32);
+  TEST_CASE_RUN(buf_write_u64);
+  TEST_CASE_RUN(buf_write_s8);
+  TEST_CASE_RUN(buf_write_s16);
+  TEST_CASE_RUN(buf_write_s32);
+  TEST_CASE_RUN(buf_write_s64);
+  TEST_CASE_RUN(buf_write_str);
+  TEST_CASE_RUN(buf_peek_1);
+  TEST_CASE_RUN(buf_peek_character_utf8);
   buf_test_peek_s8 ();
   buf_test_peek_s16 ();
-  buf_test_peek_u8();
-  buf_test_read_1();
-  buf_test_read_f32();
-  buf_test_read_f64();
-  buf_test_read_s8();
-  buf_test_read_s16();
-  buf_test_read_s32();
-  buf_test_read_s64();
-  buf_test_read_u8();
-  buf_test_read_u16();
-  buf_test_read_u32();
-  buf_test_read_u64();
-  buf_test_read_character_utf8();
-  buf_test_read_to_str();
-  buf_test_xfer();
-  buf_test_f();
-  buf_test_ignore();
+  TEST_CASE_RUN(buf_peek_u8);
+  TEST_CASE_RUN(buf_read_1);
+  TEST_CASE_RUN(buf_read_f32);
+  TEST_CASE_RUN(buf_read_f64);
+  TEST_CASE_RUN(buf_read_s8);
+  TEST_CASE_RUN(buf_read_s16);
+  TEST_CASE_RUN(buf_read_s32);
+  TEST_CASE_RUN(buf_read_s64);
+  TEST_CASE_RUN(buf_read_u8);
+  TEST_CASE_RUN(buf_read_u16);
+  TEST_CASE_RUN(buf_read_u32);
+  TEST_CASE_RUN(buf_read_u64);
+  TEST_CASE_RUN(buf_read_character_utf8);
+  TEST_CASE_RUN(buf_read_to_str);
+  TEST_CASE_RUN(buf_xfer);
+  TEST_CASE_RUN(buf_f);
+  TEST_CASE_RUN(buf_ignore);
 }
 
 TEST_CASE(buf_f)
diff --git a/test/call_test.c b/test/call_test.c
index af9461b..58c7227 100644
--- a/test/call_test.c
+++ b/test/call_test.c
@@ -41,8 +41,8 @@ TEST_CASE_PROTOTYPE(call_inspect);
 
 void call_test ()
 {
-  call_test_init_1();
-  call_test_inspect();
+  TEST_CASE_RUN(call_init_1);
+  TEST_CASE_RUN(call_inspect);
 }
 
 TEST_CASE(call_init_1)
diff --git a/test/cfn_test.c b/test/cfn_test.c
index 39463f2..bdde3c1 100644
--- a/test/cfn_test.c
+++ b/test/cfn_test.c
@@ -32,11 +32,11 @@ void cfn_test ();
 
 void cfn_test ()
 {
-  cfn_test_init_clean();
-  cfn_test_copy();
-  cfn_test_link();
-  cfn_test_prep_cif();
-  cfn_test_apply();
+  TEST_CASE_RUN(cfn_init_clean);
+  TEST_CASE_RUN(cfn_copy);
+  TEST_CASE_RUN(cfn_link);
+  TEST_CASE_RUN(cfn_prep_cif);
+  TEST_CASE_RUN(cfn_apply);
 }
 
 TEST_CASE(cfn_apply)
diff --git a/test/character_test.c b/test/character_test.c
index de943a5..8cac8ed 100644
--- a/test/character_test.c
+++ b/test/character_test.c
@@ -25,13 +25,13 @@ TEST_CASE_PROTOTYPE(character_utf8_size);
 
 void character_test ()
 {
-  character_test_1();
-  character_test_is_digit();
-  character_test_is_lowercase();
-  character_test_is_space();
-  character_test_is_uppercase();
-  character_test_utf8_size();
-  character_test_utf8();
+  TEST_CASE_RUN(character_1);
+  TEST_CASE_RUN(character_is_digit);
+  TEST_CASE_RUN(character_is_lowercase);
+  TEST_CASE_RUN(character_is_space);
+  TEST_CASE_RUN(character_is_uppercase);
+  TEST_CASE_RUN(character_utf8_size);
+  TEST_CASE_RUN(character_utf8);
 }
 
 #define CHARACTER_TEST_1_ASCII(string)        \
diff --git a/test/compare_test.c b/test/compare_test.c
index 6bcee5f..d8f69a3 100644
--- a/test/compare_test.c
+++ b/test/compare_test.c
@@ -48,14 +48,14 @@ TEST_CASE_PROTOTYPE(compare_tuple);
 
 void compare_test ()
 {
-  compare_test_bool();
-  compare_test_character();
-  compare_test_f32();
-  compare_test_f64();
-  compare_test_list();
-  compare_test_str();
-  compare_test_tag();
-  compare_test_tuple();
+  TEST_CASE_RUN(compare_bool);
+  TEST_CASE_RUN(compare_character);
+  TEST_CASE_RUN(compare_f32);
+  TEST_CASE_RUN(compare_f64);
+  TEST_CASE_RUN(compare_list);
+  TEST_CASE_RUN(compare_str);
+  TEST_CASE_RUN(compare_tag);
+  TEST_CASE_RUN(compare_tuple);
 }
 
 TEST_CASE(compare_bool)
diff --git a/test/env_test.c b/test/env_test.c
index a8a25bc..0e9ce31 100644
--- a/test/env_test.c
+++ b/test/env_test.c
@@ -23,8 +23,8 @@ TEST_CASE_PROTOTYPE(env_init_clean);
 
 void env_test ()
 {
-  env_test_init_clean();
-  env_test_eval_equal_tag();
+  TEST_CASE_RUN(env_init_clean);
+  TEST_CASE_RUN(env_eval_equal_tag);
 }
 
 TEST_CASE(env_eval_equal_tag)
diff --git a/test/fact_test.c b/test/fact_test.c
index 8b1ed3a..fae35d3 100644
--- a/test/fact_test.c
+++ b/test/fact_test.c
@@ -32,8 +32,8 @@ TEST_CASE_PROTOTYPE(fact_inspect);
 
 void fact_test ()
 {
-  fact_test_init();
-  fact_test_inspect();
+  TEST_CASE_RUN(fact_init);
+  TEST_CASE_RUN(fact_inspect);
 }
 
 void fact_test_clean_1 (s_fact *fact)
diff --git a/test/facts_cursor_test.c b/test/facts_cursor_test.c
index 2bb8de8..fb245c2 100644
--- a/test/facts_cursor_test.c
+++ b/test/facts_cursor_test.c
@@ -22,8 +22,8 @@ TEST_CASE_PROTOTYPE(facts_cursor_next);
 
 void facts_cursor_test ()
 {
-  facts_cursor_test_init();
-  facts_cursor_test_next();
+  TEST_CASE_RUN(facts_cursor_init);
+  TEST_CASE_RUN(facts_cursor_next);
 }
 
 TEST_CASE(facts_cursor_init)
diff --git a/test/facts_test.c b/test/facts_test.c
index 6257216..6047ba5 100644
--- a/test/facts_test.c
+++ b/test/facts_test.c
@@ -34,17 +34,17 @@ TEST_CASE_PROTOTYPE(facts_save);
 
 void facts_test ()
 {
-  facts_test_init_clean();
-  facts_test_new_delete();
-  facts_test_add();
-  facts_test_remove();
-  facts_test_find();
-  facts_test_log_add();
-  facts_test_log_remove();
-  facts_test_dump_file();
-  facts_test_load();
-  facts_test_save();
-  facts_test_open_file();
+  TEST_CASE_RUN(facts_init_clean);
+  TEST_CASE_RUN(facts_new_delete);
+  TEST_CASE_RUN(facts_add);
+  TEST_CASE_RUN(facts_remove);
+  TEST_CASE_RUN(facts_find);
+  TEST_CASE_RUN(facts_log_add);
+  TEST_CASE_RUN(facts_log_remove);
+  TEST_CASE_RUN(facts_dump_file);
+  TEST_CASE_RUN(facts_load);
+  TEST_CASE_RUN(facts_save);
+  TEST_CASE_RUN(facts_open_file);
 }
 
 TEST_CASE(facts_add)
diff --git a/test/facts_with_test.c b/test/facts_with_test.c
index d58dae7..9186e8b 100644
--- a/test/facts_with_test.c
+++ b/test/facts_with_test.c
@@ -24,8 +24,8 @@ TEST_CASE_PROTOTYPE(facts_with_tags);
 
 void facts_with_test ()
 {
-  facts_with_test_tags();
-  facts_with_test_();
+  TEST_CASE_RUN(facts_with_tags);
+  TEST_CASE_RUN(facts_with_);
 }
 
 TEST_CASE(facts_with_)
diff --git a/test/ident_test.c b/test/ident_test.c
index cfa9915..9c8960b 100644
--- a/test/ident_test.c
+++ b/test/ident_test.c
@@ -99,9 +99,9 @@ TEST_CASE_END(ident_first_character_is_reserved)
 
 void ident_test ()
 {
-  ident_test_inspect();
-  ident_test_first_character_is_reserved();
-  ident_test_character_is_reserved();
+  TEST_CASE_RUN(ident_inspect);
+  TEST_CASE_RUN(ident_first_character_is_reserved);
+  TEST_CASE_RUN(ident_character_is_reserved);
 }
 TEST_CASE_END(ident_first_character_is_reserved)
 
diff --git a/test/list_test.c b/test/list_test.c
index cb105a2..afbc3e1 100644
--- a/test/list_test.c
+++ b/test/list_test.c
@@ -45,8 +45,8 @@ TEST_CASE_PROTOTYPE(list_inspect);
 
 void list_test ()
 {
-  list_test_1();
-  list_test_inspect();
+  TEST_CASE_RUN(list_1);
+  TEST_CASE_RUN(list_inspect);
 }
 
 TEST_CASE(list_1)
diff --git a/test/set__fact_test.c b/test/set__fact_test.c
index 38c681d..6fdb445 100644
--- a/test/set__fact_test.c
+++ b/test/set__fact_test.c
@@ -83,11 +83,11 @@ TEST_CASE_PROTOTYPE(set__fact_resize);
 
 void set__fact_test ()
 {
-  set__fact_test_init_clean();
-  set__fact_test_add();
-  set__fact_test_remove();
-  set__fact_test_resize();
-  set__fact_test_cursor();
+  TEST_CASE_RUN(set__fact_init_clean);
+  TEST_CASE_RUN(set__fact_add);
+  TEST_CASE_RUN(set__fact_remove);
+  TEST_CASE_RUN(set__fact_resize);
+  TEST_CASE_RUN(set__fact_cursor);
 }
 
 TEST_CASE(set__fact_add)
diff --git a/test/set__tag_test.c b/test/set__tag_test.c
index 6839e97..ce65bf3 100644
--- a/test/set__tag_test.c
+++ b/test/set__tag_test.c
@@ -104,11 +104,11 @@ TEST_CASE_PROTOTYPE(set__tag_resize);
 
 void set__tag_test ()
 {
-  set__tag_test_init_clean();
-  set__tag_test_add();
-  set__tag_test_remove();
-  set__tag_test_resize();
-  set__tag_test_cursor();
+  TEST_CASE_RUN(set__tag_init_clean);
+  TEST_CASE_RUN(set__tag_add);
+  TEST_CASE_RUN(set__tag_remove);
+  TEST_CASE_RUN(set__tag_resize);
+  TEST_CASE_RUN(set__tag_cursor);
 }
 
 TEST_CASE(set__tag_add)
diff --git a/test/skiplist__fact_test.c b/test/skiplist__fact_test.c
index 7049fe1..d51aa73 100644
--- a/test/skiplist__fact_test.c
+++ b/test/skiplist__fact_test.c
@@ -58,10 +58,10 @@ TEST_CASE_PROTOTYPE(skiplist__fact_remove);
 
 void skiplist__fact_test ()
 {
-  skiplist__fact_test_new_delete();
-  skiplist__fact_test_insert();
-  skiplist__fact_test_remove();
-  skiplist__fact_test_find();
+  TEST_CASE_RUN(skiplist__fact_new_delete);
+  TEST_CASE_RUN(skiplist__fact_insert);
+  TEST_CASE_RUN(skiplist__fact_remove);
+  TEST_CASE_RUN(skiplist__fact_find);
 }
 
 TEST_CASE(skiplist__fact_find)
diff --git a/test/str_test.c b/test/str_test.c
index 1839ee7..3208523 100644
--- a/test/str_test.c
+++ b/test/str_test.c
@@ -77,18 +77,18 @@ TEST_CASE_PROTOTYPE(str_to_sym);
 
 void str_test ()
 {
-  str_test_init_clean();
-  str_test_init_dup();
-  str_test_init_dup_1();
-  str_test_new_delete();
-  str_test_new_1();
-  str_test_new_dup();
-  str_test_new_cpy();
-  str_test_new_f();
-  str_test_character_is_reserved();
-  str_test_inspect();
-  str_test_to_hex();
-  str_test_to_sym();
+  TEST_CASE_RUN(str_init_clean);
+  TEST_CASE_RUN(str_init_dup);
+  TEST_CASE_RUN(str_init_dup_1);
+  TEST_CASE_RUN(str_new_delete);
+  TEST_CASE_RUN(str_new_1);
+  TEST_CASE_RUN(str_new_dup);
+  TEST_CASE_RUN(str_new_cpy);
+  TEST_CASE_RUN(str_new_f);
+  TEST_CASE_RUN(str_character_is_reserved);
+  TEST_CASE_RUN(str_inspect);
+  TEST_CASE_RUN(str_to_hex);
+  TEST_CASE_RUN(str_to_sym);
 }
 
 TEST_CASE(str_character_is_reserved)
diff --git a/test/sym_test.c b/test/sym_test.c
index e0e74ed..44d9518 100644
--- a/test/sym_test.c
+++ b/test/sym_test.c
@@ -38,8 +38,8 @@ TEST_CASE_PROTOTYPE(sym_inspect);
 
 void sym_test ()
 {
-  sym_test_1();
-  sym_test_inspect();
+  TEST_CASE_RUN(sym_1);
+  TEST_CASE_RUN(sym_inspect);
 }
 TEST_CASE(sym_1)
 {
diff --git a/test/tag_test.c b/test/tag_test.c
index 6602999..d69b683 100644
--- a/test/tag_test.c
+++ b/test/tag_test.c
@@ -29,8 +29,8 @@ TEST_CASE_PROTOTYPE(tag_init_1);
 
 void tag_test ()
 {
-  tag_test_init_1();
-  tag_test_hash_u64();
+  TEST_CASE_RUN(tag_init_1);
+  TEST_CASE_RUN(tag_hash_u64);
 }
 
 TEST_CASE(tag_hash_u64)
diff --git a/test/tuple_test.c b/test/tuple_test.c
index 49fcf9f..997d8ed 100644
--- a/test/tuple_test.c
+++ b/test/tuple_test.c
@@ -81,11 +81,11 @@ TEST_CASE_PROTOTYPE(tuple_new_delete);
 
 void tuple_test ()
 {
-  tuple_test_init_clean();
-  tuple_test_new_delete();
-  tuple_test_init_1();
-  tuple_test_new_1();
-  tuple_test_inspect();
+  TEST_CASE_RUN(tuple_init_clean);
+  TEST_CASE_RUN(tuple_new_delete);
+  TEST_CASE_RUN(tuple_init_1);
+  TEST_CASE_RUN(tuple_new_1);
+  TEST_CASE_RUN(tuple_inspect);
 }
 
 TEST_CASE(tuple_init_clean)
diff --git a/test/types_test.c b/test/types_test.c
index 7a98f91..d185dce 100644
--- a/test/types_test.c
+++ b/test/types_test.c
@@ -18,7 +18,7 @@ TEST_CASE_PROTOTYPE(types_sizeof);
 
 void types_test ()
 {
-  types_test_sizeof();
+  TEST_CASE_RUN(types_sizeof);
 }
 
 TEST_CASE(types_sizeof)