diff --git a/test/main.c b/test/main.c
index 22803e0..19bb2a2 100644
--- a/test/main.c
+++ b/test/main.c
@@ -41,7 +41,8 @@
   hits = (char *)malloc(utest_state.tests_length);
   memset(hits, 0, utest_state.tests_length);
 
-  ASSERT_EQ(0, subprocess_create(command, subprocess_option_combined_stdout_stderr,
+  ASSERT_EQ(0,
+            subprocess_create(command, subprocess_option_combined_stdout_stderr,
                               &process));
 
   stdout_file = subprocess_stdout(&process);

diff --git a/test/main.c b/test/main.c
index 22803e0..19bb2a2 100644
--- a/test/main.c
+++ b/test/main.c
@@ -41,7 +41,8 @@
   hits = (char *)malloc(utest_state.tests_length);
   memset(hits, 0, utest_state.tests_length);
 
-  ASSERT_EQ(0, subprocess_create(command, subprocess_option_combined_stdout_stderr,
+  ASSERT_EQ(0,
+            subprocess_create(command, subprocess_option_combined_stdout_stderr,
                               &process));
 
   stdout_file = subprocess_stdout(&process);
diff --git a/test/test.c b/test/test.c
index cb3604a..ce5e2d4 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,11 +1,11 @@
 /*
    This is free and unencumbered software released into the public domain.
-  
+
    Anyone is free to copy, modify, publish, use, compile, sell, or
    distribute this software, either in source code form or as a compiled
    binary, for any purpose, commercial or non-commercial, and by any
    means.
-  
+
    In jurisdictions that recognize copyright laws, the author or authors
    of this software dedicate any and all copyright interest in the
    software to the public domain. We make this dedication for the benefit
@@ -13,7 +13,7 @@
    successors. We intend this dedication to be an overt act of
    relinquishment in perpetuity of all present and future rights to this
    software under copyright law.
-  
+
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,14 +21,15 @@
    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    OTHER DEALINGS IN THE SOFTWARE.
-  
+
    For more information, please refer to <http://unlicense.org/>
 */
 
 #include "utest.h"
 
 #ifdef _MSC_VER
-/* disable 'conditional expression is constant' - our examples below use this! */
+/* disable 'conditional expression is constant' - our examples below use this!
+ */
 #pragma warning(disable : 4127)
 #pragma
 #endif
@@ -108,9 +109,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, c) {
   ASSERT_EQ(42, utest_fixture->foo);

diff --git a/test/main.c b/test/main.c
index 22803e0..19bb2a2 100644
--- a/test/main.c
+++ b/test/main.c
@@ -41,7 +41,8 @@
   hits = (char *)malloc(utest_state.tests_length);
   memset(hits, 0, utest_state.tests_length);
 
-  ASSERT_EQ(0, subprocess_create(command, subprocess_option_combined_stdout_stderr,
+  ASSERT_EQ(0,
+            subprocess_create(command, subprocess_option_combined_stdout_stderr,
                               &process));
 
   stdout_file = subprocess_stdout(&process);
diff --git a/test/test.c b/test/test.c
index cb3604a..ce5e2d4 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,11 +1,11 @@
 /*
    This is free and unencumbered software released into the public domain.
-  
+
    Anyone is free to copy, modify, publish, use, compile, sell, or
    distribute this software, either in source code form or as a compiled
    binary, for any purpose, commercial or non-commercial, and by any
    means.
-  
+
    In jurisdictions that recognize copyright laws, the author or authors
    of this software dedicate any and all copyright interest in the
    software to the public domain. We make this dedication for the benefit
@@ -13,7 +13,7 @@
    successors. We intend this dedication to be an overt act of
    relinquishment in perpetuity of all present and future rights to this
    software under copyright law.
-  
+
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,14 +21,15 @@
    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    OTHER DEALINGS IN THE SOFTWARE.
-  
+
    For more information, please refer to <http://unlicense.org/>
 */
 
 #include "utest.h"
 
 #ifdef _MSC_VER
-/* disable 'conditional expression is constant' - our examples below use this! */
+/* disable 'conditional expression is constant' - our examples below use this!
+ */
 #pragma warning(disable : 4127)
 #pragma
 #endif
@@ -108,9 +109,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, c) {
   ASSERT_EQ(42, utest_fixture->foo);
diff --git a/test/test.cpp b/test/test.cpp
index 31bf2cd..67f3574 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -105,9 +105,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, cpp_1) {
   ASSERT_EQ(42, utest_fixture->foo);

diff --git a/test/main.c b/test/main.c
index 22803e0..19bb2a2 100644
--- a/test/main.c
+++ b/test/main.c
@@ -41,7 +41,8 @@
   hits = (char *)malloc(utest_state.tests_length);
   memset(hits, 0, utest_state.tests_length);
 
-  ASSERT_EQ(0, subprocess_create(command, subprocess_option_combined_stdout_stderr,
+  ASSERT_EQ(0,
+            subprocess_create(command, subprocess_option_combined_stdout_stderr,
                               &process));
 
   stdout_file = subprocess_stdout(&process);
diff --git a/test/test.c b/test/test.c
index cb3604a..ce5e2d4 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,11 +1,11 @@
 /*
    This is free and unencumbered software released into the public domain.
-  
+
    Anyone is free to copy, modify, publish, use, compile, sell, or
    distribute this software, either in source code form or as a compiled
    binary, for any purpose, commercial or non-commercial, and by any
    means.
-  
+
    In jurisdictions that recognize copyright laws, the author or authors
    of this software dedicate any and all copyright interest in the
    software to the public domain. We make this dedication for the benefit
@@ -13,7 +13,7 @@
    successors. We intend this dedication to be an overt act of
    relinquishment in perpetuity of all present and future rights to this
    software under copyright law.
-  
+
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,14 +21,15 @@
    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    OTHER DEALINGS IN THE SOFTWARE.
-  
+
    For more information, please refer to <http://unlicense.org/>
 */
 
 #include "utest.h"
 
 #ifdef _MSC_VER
-/* disable 'conditional expression is constant' - our examples below use this! */
+/* disable 'conditional expression is constant' - our examples below use this!
+ */
 #pragma warning(disable : 4127)
 #pragma
 #endif
@@ -108,9 +109,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, c) {
   ASSERT_EQ(42, utest_fixture->foo);
diff --git a/test/test.cpp b/test/test.cpp
index 31bf2cd..67f3574 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -105,9 +105,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, cpp_1) {
   ASSERT_EQ(42, utest_fixture->foo);
diff --git a/test/test11.cpp b/test/test11.cpp
index b1b3f2c..a373700 100644
--- a/test/test11.cpp
+++ b/test/test11.cpp
@@ -105,9 +105,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, cpp11_1) {
   ASSERT_EQ(42, utest_fixture->foo);

diff --git a/test/main.c b/test/main.c
index 22803e0..19bb2a2 100644
--- a/test/main.c
+++ b/test/main.c
@@ -41,7 +41,8 @@
   hits = (char *)malloc(utest_state.tests_length);
   memset(hits, 0, utest_state.tests_length);
 
-  ASSERT_EQ(0, subprocess_create(command, subprocess_option_combined_stdout_stderr,
+  ASSERT_EQ(0,
+            subprocess_create(command, subprocess_option_combined_stdout_stderr,
                               &process));
 
   stdout_file = subprocess_stdout(&process);
diff --git a/test/test.c b/test/test.c
index cb3604a..ce5e2d4 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,11 +1,11 @@
 /*
    This is free and unencumbered software released into the public domain.
-  
+
    Anyone is free to copy, modify, publish, use, compile, sell, or
    distribute this software, either in source code form or as a compiled
    binary, for any purpose, commercial or non-commercial, and by any
    means.
-  
+
    In jurisdictions that recognize copyright laws, the author or authors
    of this software dedicate any and all copyright interest in the
    software to the public domain. We make this dedication for the benefit
@@ -13,7 +13,7 @@
    successors. We intend this dedication to be an overt act of
    relinquishment in perpetuity of all present and future rights to this
    software under copyright law.
-  
+
    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,14 +21,15 @@
    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    OTHER DEALINGS IN THE SOFTWARE.
-  
+
    For more information, please refer to <http://unlicense.org/>
 */
 
 #include "utest.h"
 
 #ifdef _MSC_VER
-/* disable 'conditional expression is constant' - our examples below use this! */
+/* disable 'conditional expression is constant' - our examples below use this!
+ */
 #pragma warning(disable : 4127)
 #pragma
 #endif
@@ -108,9 +109,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, c) {
   ASSERT_EQ(42, utest_fixture->foo);
diff --git a/test/test.cpp b/test/test.cpp
index 31bf2cd..67f3574 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -105,9 +105,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, cpp_1) {
   ASSERT_EQ(42, utest_fixture->foo);
diff --git a/test/test11.cpp b/test/test11.cpp
index b1b3f2c..a373700 100644
--- a/test/test11.cpp
+++ b/test/test11.cpp
@@ -105,9 +105,7 @@
   utest_fixture->foo = 42;
 }
 
-UTEST_F_TEARDOWN(MyTestF) {
-  ASSERT_EQ(13, utest_fixture->foo);
-}
+UTEST_F_TEARDOWN(MyTestF) { ASSERT_EQ(13, utest_fixture->foo); }
 
 UTEST_F(MyTestF, cpp11_1) {
   ASSERT_EQ(42, utest_fixture->foo);
diff --git a/utest.h b/utest.h
index 860bee8..045dd4b 100644
--- a/utest.h
+++ b/utest.h
@@ -642,6 +642,7 @@
                                    utest_state.tests_length));                 \
     utest_state.tests[index].func = &utest_##SET##_##NAME;                     \
     utest_state.tests[index].name = name;                                      \
+    utest_state.tests[index].index = 0;                                        \
     UTEST_SNPRINTF(name, name_size, "%s", name_part);                          \
   }                                                                            \
   void utest_run_##SET##_##NAME(int *utest_result)