fixing clang builds...
diff --git a/doc/markdown/benchmarks.md b/doc/markdown/benchmarks.md
index bae3459..741d203 100644
--- a/doc/markdown/benchmarks.md
+++ b/doc/markdown/benchmarks.md
@@ -1,8 +1,10 @@
-# Benchmarks
+# Compile time benchmarks
 
-The benchmarks are done with [**this**](../../scripts/bench/bench.py) script using CMake.
+The benchmarks are done with [**this**](../../scripts/bench/bench.py) script using CMake. There are 2 benchmarking scenarios:
+- [the cost of including the header](#cost-of-including-the-header)
+- [the cost of an assertion macro](#cost-of-an-assertion-macro)
 
-GCC performs much better on Unix - but even there the speedup ratios are similar (clang should be the similar).
+GCC performs much better on Unix - and there the speedup ratios are similar (clang should be the similar as well).
 
 Compilers used:
 - Microsoft Visual Studio Community 2015 - Version 14.0.25431.01 Update 3
@@ -23,7 +25,7 @@
 
 The script generates 201 source files and in 200 of them makes a function in the form of ```int f135() { return 135; }``` and in ```main.cpp``` it forward declares all the 200 such dummy functions and accumulates their result to return from the ```main()``` function. This is done to ensure that all source files are built and that the linker doesn't remove/optimize anything.
 
-- **baseline** - how much time the source files need for a single threaded build with ```msbuild```/```mingw32-make``` 
+- **baseline** - how much time the source files need for a single threaded build with ```msbuild```/```make```
 - **+ implement** - only in ```main.cpp``` the header is included with a ```#define``` before it so the test runner gets implemented:
 
     ```c++
@@ -46,14 +48,14 @@
 
 ### Catch
 
-|                   | baseline | + implement | + header everywhere |                             |
-|------------------------|----------|-------------|---------------------|------------|
-| MSVC Debug             | 5.9      | 8.5         | 102                 |            |
-| MSVC Release           | 5.4      | 10.3        | 96                  |            |
-| MinGW-w64 GCC Debug    | 9.4      | 24.5        | 125                 |            |
-| MinGW-w64 GCC Release  | 9.6      | 18.4        | 113                 |            |
-| Linux GCC Debug        | 6.3      | 10.4        | 59                  |            |
-| Linux GCC Release      | 6.5      | 14.1        | 64                  |            |
+|                   | baseline | + implement | + header everywhere |
+|------------------------|----------|-------------|---------------------|
+| MSVC Debug             | 5.9      | 8.5         | 102                 |
+| MSVC Release           | 5.4      | 10.3        | 96                  |
+| MinGW-w64 GCC Debug    | 9.4      | 24.5        | 125                 |
+| MinGW-w64 GCC Release  | 9.6      | 18.4        | 113                 |
+| Linux GCC Debug        | 6.3      | 10.4        | 59                  |
+| Linux GCC Release      | 6.5      | 14.1        | 64                  |
 
 ### Conclusion
 
@@ -74,7 +76,7 @@
 
 ----------
 
-So if ```doctest.h``` costs 8ms and ```catch.hpp``` costs 430ms on MSVC - then the **doctest** header is >> **54** << times lighter! 
+So if ```doctest.h``` costs 8ms and ```catch.hpp``` costs 430ms on MSVC - then the **doctest** header is >> **54** << times lighter!
 
 ----------
 
@@ -84,7 +86,18 @@
 
 ## Cost of an assertion macro
 
-coming soon
+The script generates 11 source files and in 10 of them makes 10 test cases with 250 assertion macros in them.
+
+- **baseline** - how much time it takes for a single threaded build with the header included everywhere - ```msbuild```/```make```
+- **+ implement** - only in ```main.cpp``` the header is included with a ```#define``` before it so the test runner gets implemented:
+
+    ```c++
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+    ```
+- **+ header everywhere** - the framework header is also included in all the other source files
+- **+ disabled** - **doctest** specific - only this framework can remove everything related to it from the binary
+
 
 ---------------
 
diff --git a/doc/markdown/roadmap.md b/doc/markdown/roadmap.md
index dff026c..c4b741b 100644
--- a/doc/markdown/roadmap.md
+++ b/doc/markdown/roadmap.md
@@ -74,9 +74,7 @@
 - hierarchical test suites - using a stack for the pushed ones - should be easy
 - put everything from the ```detail``` namespace also in a nested anonymous namespace to make them with internal linkage
 - ability to re-run only newly compiled tests based on time stamps using ```__DATE__``` and ```__TIME__``` - stored in some file
-- submit to [boost](http://www.boost.org/development/requirements.html)?
-- fix all the hacks in the cmake scripts for OSX (they are mainly for gcc 4.4)
-- the [range_based_execution](../../examples/range_based_execution/) example sometimes leaves one subprocess running and hangs ctest - should fix probably the python script
+- add option to not report line numbers - getting annoyed of re-committing reference output files with changed line reports from a tiny change...
 
 ---------------
 
diff --git a/scripts/code_coverage_source/test.cpp b/scripts/code_coverage_source/test.cpp
index 3323cae..8bc0715 100644
--- a/scripts/code_coverage_source/test.cpp
+++ b/scripts/code_coverage_source/test.cpp
@@ -48,7 +48,9 @@
     CHECK(true);
     CHECK(1 == 0);
     CHECK_FALSE(1);
-    CHECK(myType() == myType());
+    myType a;
+    myType b;
+    CHECK(a == b);
     CHECK(Approx(0.1) == 0.2);
 
     CHECK_THROWS(throws(true));
diff --git a/scripts/code_coverage_source/test_output/filter_1.txt b/scripts/code_coverage_source/test_output/filter_1.txt
index c77529c..abc6b17 100644
--- a/scripts/code_coverage_source/test_output/filter_1.txt
+++ b/scripts/code_coverage_source/test_output/filter_1.txt
@@ -14,30 +14,30 @@
 with expansion:
   CHECK_FALSE( 1 )
 
-test.cpp(51) FAILED! 
-  CHECK( myType() == myType() )
+test.cpp(53) FAILED! 
+  CHECK( a == b )
 with expansion:
   CHECK( myType! == myType! )
 
-test.cpp(52) FAILED! 
+test.cpp(54) FAILED! 
   CHECK( Approx(0.1) == 0.2 )
 with expansion:
   CHECK( Approx( 0.1 ) == 0.2 )
 
-test.cpp(55) FAILED!
+test.cpp(57) FAILED!
   CHECK_THROWS( throws(false) )
 
-test.cpp(57) FAILED!
+test.cpp(59) FAILED!
   CHECK_NOTHROW( throws(true) )
 
-test.cpp(59) FAILED! (didn't throw at all)
+test.cpp(61) FAILED! (didn't throw at all)
   REQUIRE_THROWS_AS( throws(false), bool )
 
 ===============================================================================
-test.cpp(62)
+test.cpp(64)
 assertions - all of them
 
-test.cpp(125) FAILED! 
+test.cpp(127) FAILED! 
   FAST_REQUIRE_UNARY_FALSE( 1 )
 with expansion:
   FAST_REQUIRE_UNARY_FALSE( 1 )
diff --git a/scripts/code_coverage_source/test_output/filter_2.txt b/scripts/code_coverage_source/test_output/filter_2.txt
index f8de630..e60d80f 100644
--- a/scripts/code_coverage_source/test_output/filter_2.txt
+++ b/scripts/code_coverage_source/test_output/filter_2.txt
@@ -11,7 +11,7 @@
   CHECK( 0 )
 
 ===============================================================================
-test.cpp(128)
+test.cpp(130)
 throws
 
 TEST CASE FAILED! (threw exception)
diff --git a/scripts/code_coverage_source/test_output/filter_5.txt b/scripts/code_coverage_source/test_output/filter_5.txt
index 5f127b1..2f513a9 100644
--- a/scripts/code_coverage_source/test_output/filter_5.txt
+++ b/scripts/code_coverage_source/test_output/filter_5.txt
@@ -14,36 +14,36 @@
 with expansion:
   CHECK_FALSE( 1 )
 
-test.cpp(51) FAILED! 
-  CHECK( myType() == myType() )
+test.cpp(53) FAILED! 
+  CHECK( a == b )
 with expansion:
   CHECK( myType! == myType! )
 
-test.cpp(52) FAILED! 
+test.cpp(54) FAILED! 
   CHECK( Approx(0.1) == 0.2 )
 with expansion:
   CHECK( Approx( 0.1 ) == 0.2 )
 
-test.cpp(55) FAILED!
+test.cpp(57) FAILED!
   CHECK_THROWS( throws(false) )
 
-test.cpp(57) FAILED!
+test.cpp(59) FAILED!
   CHECK_NOTHROW( throws(true) )
 
-test.cpp(59) FAILED! (didn't throw at all)
+test.cpp(61) FAILED! (didn't throw at all)
   REQUIRE_THROWS_AS( throws(false), bool )
 
 ===============================================================================
-test.cpp(62)
+test.cpp(64)
 assertions - all of them
 
-test.cpp(125) FAILED! 
+test.cpp(127) FAILED! 
   FAST_REQUIRE_UNARY_FALSE( 1 )
 with expansion:
   FAST_REQUIRE_UNARY_FALSE( 1 )
 
 ===============================================================================
-test.cpp(128)
+test.cpp(130)
 throws
 
 TEST CASE FAILED! (threw exception)
diff --git a/scripts/code_coverage_source/test_output/first_last.txt b/scripts/code_coverage_source/test_output/first_last.txt
index e719090..b65306e 100644
--- a/scripts/code_coverage_source/test_output/first_last.txt
+++ b/scripts/code_coverage_source/test_output/first_last.txt
@@ -24,23 +24,23 @@
 with expansion:
   CHECK_FALSE( 1 )
 
-test.cpp(51) FAILED! 
-  CHECK( myType() == myType() )
+test.cpp(53) FAILED! 
+  CHECK( a == b )
 with expansion:
   CHECK( myType! == myType! )
 
-test.cpp(52) FAILED! 
+test.cpp(54) FAILED! 
   CHECK( Approx(0.1) == 0.2 )
 with expansion:
   CHECK( Approx( 0.1 ) == 0.2 )
 
-test.cpp(55) FAILED!
+test.cpp(57) FAILED!
   CHECK_THROWS( throws(false) )
 
-test.cpp(57) FAILED!
+test.cpp(59) FAILED!
   CHECK_NOTHROW( throws(true) )
 
-test.cpp(59) FAILED! (didn't throw at all)
+test.cpp(61) FAILED! (didn't throw at all)
   REQUIRE_THROWS_AS( throws(false), bool )
 
 ===============================================================================
diff --git a/scripts/code_coverage_source/test_output/order_1.txt b/scripts/code_coverage_source/test_output/order_1.txt
index e27dfbb..1da6272 100644
--- a/scripts/code_coverage_source/test_output/order_1.txt
+++ b/scripts/code_coverage_source/test_output/order_1.txt
@@ -24,36 +24,36 @@
 with expansion:
   CHECK_FALSE( 1 )
 
-test.cpp(51) FAILED! 
-  CHECK( myType() == myType() )
+test.cpp(53) FAILED! 
+  CHECK( a == b )
 with expansion:
   CHECK( myType! == myType! )
 
-test.cpp(52) FAILED! 
+test.cpp(54) FAILED! 
   CHECK( Approx(0.1) == 0.2 )
 with expansion:
   CHECK( Approx( 0.1 ) == 0.2 )
 
-test.cpp(55) FAILED!
+test.cpp(57) FAILED!
   CHECK_THROWS( throws(false) )
 
-test.cpp(57) FAILED!
+test.cpp(59) FAILED!
   CHECK_NOTHROW( throws(true) )
 
-test.cpp(59) FAILED! (didn't throw at all)
+test.cpp(61) FAILED! (didn't throw at all)
   REQUIRE_THROWS_AS( throws(false), bool )
 
 ===============================================================================
-test.cpp(62)
+test.cpp(64)
 assertions - all of them
 
-test.cpp(125) FAILED! 
+test.cpp(127) FAILED! 
   FAST_REQUIRE_UNARY_FALSE( 1 )
 with expansion:
   FAST_REQUIRE_UNARY_FALSE( 1 )
 
 ===============================================================================
-test.cpp(128)
+test.cpp(130)
 throws
 
 TEST CASE FAILED! (threw exception)
diff --git a/scripts/code_coverage_source/test_output/order_2.txt b/scripts/code_coverage_source/test_output/order_2.txt
index 58ceea0..84c3011 100644
--- a/scripts/code_coverage_source/test_output/order_2.txt
+++ b/scripts/code_coverage_source/test_output/order_2.txt
@@ -14,30 +14,30 @@
 with expansion:
   CHECK_FALSE( 1 )
 
-test.cpp(51) FAILED! 
-  CHECK( myType() == myType() )
+test.cpp(53) FAILED! 
+  CHECK( a == b )
 with expansion:
   CHECK( myType! == myType! )
 
-test.cpp(52) FAILED! 
+test.cpp(54) FAILED! 
   CHECK( Approx(0.1) == 0.2 )
 with expansion:
   CHECK( Approx( 0.1 ) == 0.2 )
 
-test.cpp(55) FAILED!
+test.cpp(57) FAILED!
   CHECK_THROWS( throws(false) )
 
-test.cpp(57) FAILED!
+test.cpp(59) FAILED!
   CHECK_NOTHROW( throws(true) )
 
-test.cpp(59) FAILED! (didn't throw at all)
+test.cpp(61) FAILED! (didn't throw at all)
   REQUIRE_THROWS_AS( throws(false), bool )
 
 ===============================================================================
-test.cpp(62)
+test.cpp(64)
 assertions - all of them
 
-test.cpp(125) FAILED! 
+test.cpp(127) FAILED! 
   FAST_REQUIRE_UNARY_FALSE( 1 )
 with expansion:
   FAST_REQUIRE_UNARY_FALSE( 1 )
@@ -53,7 +53,7 @@
   CHECK( 0 )
 
 ===============================================================================
-test.cpp(128)
+test.cpp(130)
 throws
 
 TEST CASE FAILED! (threw exception)
diff --git a/scripts/code_coverage_source/test_output/successful.txt b/scripts/code_coverage_source/test_output/successful.txt
index 1340aa1..3d26bf8 100644
--- a/scripts/code_coverage_source/test_output/successful.txt
+++ b/scripts/code_coverage_source/test_output/successful.txt
@@ -47,337 +47,337 @@
 with expansion:
   CHECK_FALSE( 1 )
 
-test.cpp(51) FAILED! 
-  CHECK( myType() == myType() )
+test.cpp(53) FAILED! 
+  CHECK( a == b )
 with expansion:
   CHECK( myType! == myType! )
 
-test.cpp(52) FAILED! 
+test.cpp(54) FAILED! 
   CHECK( Approx(0.1) == 0.2 )
 with expansion:
   CHECK( Approx( 0.1 ) == 0.2 )
 
-test.cpp(54) PASSED!
+test.cpp(56) PASSED!
   CHECK_THROWS( throws(true) )
 
-test.cpp(55) FAILED!
+test.cpp(57) FAILED!
   CHECK_THROWS( throws(false) )
 
-test.cpp(56) PASSED!
+test.cpp(58) PASSED!
   CHECK_NOTHROW( throws(false) )
 
-test.cpp(57) FAILED!
+test.cpp(59) FAILED!
   CHECK_NOTHROW( throws(true) )
 
-test.cpp(58) PASSED!
+test.cpp(60) PASSED!
   CHECK_THROWS_AS( throws(true), bool )
 
-test.cpp(59) FAILED! (didn't throw at all)
+test.cpp(61) FAILED! (didn't throw at all)
   REQUIRE_THROWS_AS( throws(false), bool )
 
 ===============================================================================
-test.cpp(62)
+test.cpp(64)
 assertions - all of them
 
-test.cpp(63) PASSED!
-  WARN( true )
-with expansion:
-  WARN( true )
-
-test.cpp(64) PASSED!
-  CHECK( true )
-with expansion:
-  CHECK( true )
-
 test.cpp(65) PASSED!
-  REQUIRE( true )
+  WARN( true )
 with expansion:
-  REQUIRE( true )
+  WARN( true )
 
 test.cpp(66) PASSED!
-  WARN_FALSE( false )
+  CHECK( true )
 with expansion:
-  WARN_FALSE( false )
+  CHECK( true )
 
 test.cpp(67) PASSED!
-  CHECK_FALSE( false )
+  REQUIRE( true )
 with expansion:
-  CHECK_FALSE( false )
+  REQUIRE( true )
 
 test.cpp(68) PASSED!
-  REQUIRE_FALSE( false )
+  WARN_FALSE( false )
 with expansion:
-  REQUIRE_FALSE( false )
+  WARN_FALSE( false )
 
 test.cpp(69) PASSED!
-  WARN_THROWS( throws(true) )
+  CHECK_FALSE( false )
+with expansion:
+  CHECK_FALSE( false )
 
 test.cpp(70) PASSED!
-  CHECK_THROWS( throws(true) )
+  REQUIRE_FALSE( false )
+with expansion:
+  REQUIRE_FALSE( false )
 
 test.cpp(71) PASSED!
-  REQUIRE_THROWS( throws(true) )
+  WARN_THROWS( throws(true) )
 
 test.cpp(72) PASSED!
-  WARN_THROWS_AS( throws(true), bool )
+  CHECK_THROWS( throws(true) )
 
 test.cpp(73) PASSED!
-  CHECK_THROWS_AS( throws(true), bool )
+  REQUIRE_THROWS( throws(true) )
 
 test.cpp(74) PASSED!
-  REQUIRE_THROWS_AS( throws(true), bool )
+  WARN_THROWS_AS( throws(true), bool )
 
 test.cpp(75) PASSED!
-  WARN_NOTHROW( throws(false) )
+  CHECK_THROWS_AS( throws(true), bool )
 
 test.cpp(76) PASSED!
-  CHECK_NOTHROW( throws(false) )
+  REQUIRE_THROWS_AS( throws(true), bool )
 
 test.cpp(77) PASSED!
-  REQUIRE_NOTHROW( throws(false) )
+  WARN_NOTHROW( throws(false) )
 
 test.cpp(78) PASSED!
-  WARN_EQ( 1, 1 )
-with expansion:
-  WARN_EQ( 1, 1 )
+  CHECK_NOTHROW( throws(false) )
 
 test.cpp(79) PASSED!
-  CHECK_EQ( 1, 1 )
-with expansion:
-  CHECK_EQ( 1, 1 )
+  REQUIRE_NOTHROW( throws(false) )
 
 test.cpp(80) PASSED!
-  REQUIRE_EQ( 1, 1 )
+  WARN_EQ( 1, 1 )
 with expansion:
-  REQUIRE_EQ( 1, 1 )
+  WARN_EQ( 1, 1 )
 
 test.cpp(81) PASSED!
-  WARN_NE( 1, 0 )
+  CHECK_EQ( 1, 1 )
 with expansion:
-  WARN_NE( 1, 0 )
+  CHECK_EQ( 1, 1 )
 
 test.cpp(82) PASSED!
-  CHECK_NE( 1, 0 )
+  REQUIRE_EQ( 1, 1 )
 with expansion:
-  CHECK_NE( 1, 0 )
+  REQUIRE_EQ( 1, 1 )
 
 test.cpp(83) PASSED!
-  REQUIRE_NE( 1, 0 )
+  WARN_NE( 1, 0 )
 with expansion:
-  REQUIRE_NE( 1, 0 )
+  WARN_NE( 1, 0 )
 
 test.cpp(84) PASSED!
-  WARN_GT( 1, 0 )
+  CHECK_NE( 1, 0 )
 with expansion:
-  WARN_GT( 1, 0 )
+  CHECK_NE( 1, 0 )
 
 test.cpp(85) PASSED!
-  CHECK_GT( 1, 0 )
+  REQUIRE_NE( 1, 0 )
 with expansion:
-  CHECK_GT( 1, 0 )
+  REQUIRE_NE( 1, 0 )
 
 test.cpp(86) PASSED!
-  REQUIRE_GT( 1, 0 )
+  WARN_GT( 1, 0 )
 with expansion:
-  REQUIRE_GT( 1, 0 )
+  WARN_GT( 1, 0 )
 
 test.cpp(87) PASSED!
-  WARN_LT( 0, 1 )
+  CHECK_GT( 1, 0 )
 with expansion:
-  WARN_LT( 0, 1 )
+  CHECK_GT( 1, 0 )
 
 test.cpp(88) PASSED!
-  CHECK_LT( 0, 1 )
+  REQUIRE_GT( 1, 0 )
 with expansion:
-  CHECK_LT( 0, 1 )
+  REQUIRE_GT( 1, 0 )
 
 test.cpp(89) PASSED!
-  REQUIRE_LT( 0, 1 )
+  WARN_LT( 0, 1 )
 with expansion:
-  REQUIRE_LT( 0, 1 )
+  WARN_LT( 0, 1 )
 
 test.cpp(90) PASSED!
-  WARN_GE( 1, 1 )
+  CHECK_LT( 0, 1 )
 with expansion:
-  WARN_GE( 1, 1 )
+  CHECK_LT( 0, 1 )
 
 test.cpp(91) PASSED!
-  CHECK_GE( 1, 1 )
+  REQUIRE_LT( 0, 1 )
 with expansion:
-  CHECK_GE( 1, 1 )
+  REQUIRE_LT( 0, 1 )
 
 test.cpp(92) PASSED!
-  REQUIRE_GE( 1, 1 )
+  WARN_GE( 1, 1 )
 with expansion:
-  REQUIRE_GE( 1, 1 )
+  WARN_GE( 1, 1 )
 
 test.cpp(93) PASSED!
-  WARN_LE( 1, 1 )
+  CHECK_GE( 1, 1 )
 with expansion:
-  WARN_LE( 1, 1 )
+  CHECK_GE( 1, 1 )
 
 test.cpp(94) PASSED!
-  CHECK_LE( 1, 1 )
+  REQUIRE_GE( 1, 1 )
 with expansion:
-  CHECK_LE( 1, 1 )
+  REQUIRE_GE( 1, 1 )
 
 test.cpp(95) PASSED!
-  REQUIRE_LE( 1, 1 )
+  WARN_LE( 1, 1 )
 with expansion:
-  REQUIRE_LE( 1, 1 )
+  WARN_LE( 1, 1 )
 
 test.cpp(96) PASSED!
-  WARN_UNARY( 1 )
+  CHECK_LE( 1, 1 )
 with expansion:
-  WARN_UNARY( 1 )
+  CHECK_LE( 1, 1 )
 
 test.cpp(97) PASSED!
-  CHECK_UNARY( 1 )
+  REQUIRE_LE( 1, 1 )
 with expansion:
-  CHECK_UNARY( 1 )
+  REQUIRE_LE( 1, 1 )
 
 test.cpp(98) PASSED!
-  REQUIRE_UNARY( 1 )
+  WARN_UNARY( 1 )
 with expansion:
-  REQUIRE_UNARY( 1 )
+  WARN_UNARY( 1 )
 
 test.cpp(99) PASSED!
-  WARN_UNARY_FALSE( 0 )
+  CHECK_UNARY( 1 )
 with expansion:
-  WARN_UNARY_FALSE( 0 )
+  CHECK_UNARY( 1 )
 
 test.cpp(100) PASSED!
-  CHECK_UNARY_FALSE( 0 )
+  REQUIRE_UNARY( 1 )
 with expansion:
-  CHECK_UNARY_FALSE( 0 )
+  REQUIRE_UNARY( 1 )
 
 test.cpp(101) PASSED!
-  REQUIRE_UNARY_FALSE( 0 )
+  WARN_UNARY_FALSE( 0 )
 with expansion:
-  REQUIRE_UNARY_FALSE( 0 )
+  WARN_UNARY_FALSE( 0 )
 
 test.cpp(102) PASSED!
-  FAST_WARN_EQ( 1, 1 )
+  CHECK_UNARY_FALSE( 0 )
 with expansion:
-  FAST_WARN_EQ( 1, 1 )
+  CHECK_UNARY_FALSE( 0 )
 
 test.cpp(103) PASSED!
-  FAST_CHECK_EQ( 1, 1 )
+  REQUIRE_UNARY_FALSE( 0 )
 with expansion:
-  FAST_CHECK_EQ( 1, 1 )
+  REQUIRE_UNARY_FALSE( 0 )
 
 test.cpp(104) PASSED!
-  FAST_REQUIRE_EQ( 1, 1 )
+  FAST_WARN_EQ( 1, 1 )
 with expansion:
-  FAST_REQUIRE_EQ( 1, 1 )
+  FAST_WARN_EQ( 1, 1 )
 
 test.cpp(105) PASSED!
-  FAST_WARN_NE( 1, 0 )
+  FAST_CHECK_EQ( 1, 1 )
 with expansion:
-  FAST_WARN_NE( 1, 0 )
+  FAST_CHECK_EQ( 1, 1 )
 
 test.cpp(106) PASSED!
-  FAST_CHECK_NE( 1, 0 )
+  FAST_REQUIRE_EQ( 1, 1 )
 with expansion:
-  FAST_CHECK_NE( 1, 0 )
+  FAST_REQUIRE_EQ( 1, 1 )
 
 test.cpp(107) PASSED!
-  FAST_REQUIRE_NE( 1, 0 )
+  FAST_WARN_NE( 1, 0 )
 with expansion:
-  FAST_REQUIRE_NE( 1, 0 )
+  FAST_WARN_NE( 1, 0 )
 
 test.cpp(108) PASSED!
-  FAST_WARN_GT( 1, 0 )
+  FAST_CHECK_NE( 1, 0 )
 with expansion:
-  FAST_WARN_GT( 1, 0 )
+  FAST_CHECK_NE( 1, 0 )
 
 test.cpp(109) PASSED!
-  FAST_CHECK_GT( 1, 0 )
+  FAST_REQUIRE_NE( 1, 0 )
 with expansion:
-  FAST_CHECK_GT( 1, 0 )
+  FAST_REQUIRE_NE( 1, 0 )
 
 test.cpp(110) PASSED!
-  FAST_REQUIRE_GT( 1, 0 )
+  FAST_WARN_GT( 1, 0 )
 with expansion:
-  FAST_REQUIRE_GT( 1, 0 )
+  FAST_WARN_GT( 1, 0 )
 
 test.cpp(111) PASSED!
-  FAST_WARN_LT( 0, 1 )
+  FAST_CHECK_GT( 1, 0 )
 with expansion:
-  FAST_WARN_LT( 0, 1 )
+  FAST_CHECK_GT( 1, 0 )
 
 test.cpp(112) PASSED!
-  FAST_CHECK_LT( 0, 1 )
+  FAST_REQUIRE_GT( 1, 0 )
 with expansion:
-  FAST_CHECK_LT( 0, 1 )
+  FAST_REQUIRE_GT( 1, 0 )
 
 test.cpp(113) PASSED!
-  FAST_REQUIRE_LT( 0, 1 )
+  FAST_WARN_LT( 0, 1 )
 with expansion:
-  FAST_REQUIRE_LT( 0, 1 )
+  FAST_WARN_LT( 0, 1 )
 
 test.cpp(114) PASSED!
-  FAST_WARN_GE( 1, 1 )
+  FAST_CHECK_LT( 0, 1 )
 with expansion:
-  FAST_WARN_GE( 1, 1 )
+  FAST_CHECK_LT( 0, 1 )
 
 test.cpp(115) PASSED!
-  FAST_CHECK_GE( 1, 1 )
+  FAST_REQUIRE_LT( 0, 1 )
 with expansion:
-  FAST_CHECK_GE( 1, 1 )
+  FAST_REQUIRE_LT( 0, 1 )
 
 test.cpp(116) PASSED!
-  FAST_REQUIRE_GE( 1, 1 )
+  FAST_WARN_GE( 1, 1 )
 with expansion:
-  FAST_REQUIRE_GE( 1, 1 )
+  FAST_WARN_GE( 1, 1 )
 
 test.cpp(117) PASSED!
-  FAST_WARN_LE( 1, 1 )
+  FAST_CHECK_GE( 1, 1 )
 with expansion:
-  FAST_WARN_LE( 1, 1 )
+  FAST_CHECK_GE( 1, 1 )
 
 test.cpp(118) PASSED!
-  FAST_CHECK_LE( 1, 1 )
+  FAST_REQUIRE_GE( 1, 1 )
 with expansion:
-  FAST_CHECK_LE( 1, 1 )
+  FAST_REQUIRE_GE( 1, 1 )
 
 test.cpp(119) PASSED!
-  FAST_REQUIRE_LE( 1, 1 )
+  FAST_WARN_LE( 1, 1 )
 with expansion:
-  FAST_REQUIRE_LE( 1, 1 )
+  FAST_WARN_LE( 1, 1 )
 
 test.cpp(120) PASSED!
-  FAST_WARN_UNARY( 1 )
+  FAST_CHECK_LE( 1, 1 )
 with expansion:
-  FAST_WARN_UNARY( 1 )
+  FAST_CHECK_LE( 1, 1 )
 
 test.cpp(121) PASSED!
-  FAST_CHECK_UNARY( 1 )
+  FAST_REQUIRE_LE( 1, 1 )
 with expansion:
-  FAST_CHECK_UNARY( 1 )
+  FAST_REQUIRE_LE( 1, 1 )
 
 test.cpp(122) PASSED!
-  FAST_REQUIRE_UNARY( 1 )
+  FAST_WARN_UNARY( 1 )
 with expansion:
-  FAST_REQUIRE_UNARY( 1 )
+  FAST_WARN_UNARY( 1 )
 
 test.cpp(123) PASSED!
-  FAST_WARN_UNARY_FALSE( 0 )
+  FAST_CHECK_UNARY( 1 )
 with expansion:
-  FAST_WARN_UNARY_FALSE( 0 )
+  FAST_CHECK_UNARY( 1 )
 
 test.cpp(124) PASSED!
+  FAST_REQUIRE_UNARY( 1 )
+with expansion:
+  FAST_REQUIRE_UNARY( 1 )
+
+test.cpp(125) PASSED!
+  FAST_WARN_UNARY_FALSE( 0 )
+with expansion:
+  FAST_WARN_UNARY_FALSE( 0 )
+
+test.cpp(126) PASSED!
   FAST_CHECK_UNARY_FALSE( 0 )
 with expansion:
   FAST_CHECK_UNARY_FALSE( 0 )
 
-test.cpp(125) FAILED! 
+test.cpp(127) FAILED! 
   FAST_REQUIRE_UNARY_FALSE( 1 )
 with expansion:
   FAST_REQUIRE_UNARY_FALSE( 1 )
 
 ===============================================================================
-test.cpp(128)
+test.cpp(130)
 throws
 
 TEST CASE FAILED! (threw exception)