diff --git a/src/utl/log.h b/src/utl/log.h
index a5fc8aa..55231d4 100644
--- a/src/utl/log.h
+++ b/src/utl/log.h
@@ -83,7 +83,7 @@ static struct
 
 } cmc_log_config = {0, 0, true, true, NULL, true};
 
-typedef enum cmc_log_type_e
+enum cmc_log_type
 {
     CMC_LOG_TRACE = 1,
     CMC_LOG_DEBUG = 2,
@@ -92,7 +92,7 @@ typedef enum cmc_log_type_e
     CMC_LOG_ERROR = 5,
     CMC_LOG_FATAL = 6
 
-} cmc_log_type;
+};
 
 #define cmc_log_trace(fmt, ...) cmc_log(CMC_LOG_TRACE, __FILE__, __func__, __LINE__, fmt, __VA_ARGS__)
 #define cmc_log_debug(fmt, ...) cmc_log(CMC_LOG_DEBUG, __FILE__, __func__, __LINE__, fmt, __VA_ARGS__)
@@ -101,7 +101,7 @@ typedef enum cmc_log_type_e
 #define cmc_log_error(fmt, ...) cmc_log(CMC_LOG_ERROR, __FILE__, __func__, __LINE__, fmt, __VA_ARGS__)
 #define cmc_log_fatal(fmt, ...) cmc_log(CMC_LOG_FATAL, __FILE__, __func__, __LINE__, fmt, __VA_ARGS__)
 
-static void cmc_log(cmc_log_type log, const char *filename, const char *funcname, int line, const char *fmt, ...)
+static void cmc_log(enum cmc_log_type log, const char *filename, const char *funcname, int line, const char *fmt, ...)
 {
     if (!cmc_log_config.enabled)
         return;
diff --git a/src/utl/test.h b/src/utl/test.h
index 219cf32..5b4cd93 100644
--- a/src/utl/test.h
+++ b/src/utl/test.h
@@ -59,14 +59,14 @@
 static const char *cmc_test_color[] = {"\x1b[32m", "\x1b[31m", "\x1b[35m"};
 #endif
 
-typedef struct cmc_test_info_s
+struct cmc_test_info
 {
     uintmax_t total;
     uintmax_t passed;
     uintmax_t failed;
     bool aborted;
     bool verbose;
-} cmc_test_info;
+};
 
 /* Logging function */
 static void cmc_test_log(const char *unit_name, const char *current_test, bool aborted, bool passed)
@@ -102,7 +102,7 @@ static void cmc_test_log(const char *unit_name, const char *current_test, bool a
         const char *unit_name = #UNAME;                                                     \
         const char *current_test = NULL;                                                    \
                                                                                             \
-        cmc_test_info tinfo = {0};                                                          \
+        struct cmc_test_info tinfo = {0};                                                   \
         cmc_timer timer = {0};                                                              \
                                                                                             \
         tinfo.verbose = VERBOSE;                                                            \
@@ -133,29 +133,32 @@ static void cmc_test_log(const char *unit_name, const char *current_test, bool a
         return tinfo.failed;                                                                \
     }
 
-#define CMC_CREATE_TEST(TNAME, BODY)                             \
-    do                                                           \
-    {                                                            \
-        current_test = #TNAME;                                   \
-                                                                 \
-        tinfo.total += 1;                                        \
-                                                                 \
-        /* Provided by assert.h */                               \
-        cmc_assert_state = true;                                 \
-                                                                 \
-        BODY;                                                    \
-                                                                 \
-        if (!cmc_assert_state)                                   \
-        {                                                        \
-            tinfo.failed += 1;                                   \
-            cmc_test_log(unit_name, current_test, false, false); \
-        }                                                        \
-        else                                                     \
-        {                                                        \
-            tinfo.passed += 1;                                   \
-            cmc_test_log(unit_name, current_test, false, true);  \
-        }                                                        \
-                                                                 \
+#define CMC_CREATE_TEST(TNAME, BODY)                                 \
+    do                                                               \
+    {                                                                \
+        current_test = #TNAME;                                       \
+                                                                     \
+        tinfo.total += 1;                                            \
+                                                                     \
+        /* Provided by assert.h */                                   \
+        cmc_assert_state = true;                                     \
+                                                                     \
+        BODY;                                                        \
+                                                                     \
+        if (tinfo.verbose)                                           \
+        {                                                            \
+            if (!cmc_assert_state)                                   \
+            {                                                        \
+                tinfo.failed += 1;                                   \
+                cmc_test_log(unit_name, current_test, false, false); \
+            }                                                        \
+            else                                                     \
+            {                                                        \
+                tinfo.passed += 1;                                   \
+                cmc_test_log(unit_name, current_test, false, true);  \
+            }                                                        \
+        }                                                            \
+                                                                     \
     } while (0)
 
 #define CMC_TEST_ABORT()      \