regenerated test output - relates #123

15 files changed, 475 insertions, 778 deletions

diff --git a/examples/all_features/test_output/abort_after.txt b/examples/all_features/test_output/abort_after.txt
index 9901387..3bec68f 100644
--- a/examples/all_features/test_output/abort_after.txt
+++ b/examples/all_features/test_output/abort_after.txt
@@ -1,21 +1,15 @@
 [doctest] run with "--help" for options
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST CASE:  doctest internals
 
-coverage_maxout.cpp(0) ERROR!
-  CHECK( a.compare(const_str, true) != 0 )
-with expansion:
-  CHECK( 0 != 0 )
-with context:
-  should fail
+coverage_maxout.cpp(0): ERROR: CHECK( a.compare(const_str, true) != 0 ) is NOT correct!
+  values: CHECK( 0 != 0 )
+  logged: should fail
 
-coverage_maxout.cpp(0) ERROR!
-  CHECK( a.compare("omgomgomg", false) != 0 )
-with expansion:
-  CHECK( 0 != 0 )
-with context:
-  should fail
+coverage_maxout.cpp(0): ERROR: CHECK( a.compare("omgomgomg", false) != 0 ) is NOT correct!
+  values: CHECK( 0 != 0 )
+  logged: should fail
 
 Aborting - too many failed asserts!
 ===============================================================================
diff --git a/examples/all_features/test_output/all_binary.txt b/examples/all_features/test_output/all_binary.txt
index 01ff859..75b80f2 100644
--- a/examples/all_features/test_output/all_binary.txt
+++ b/examples/all_features/test_output/all_binary.txt
@@ -1,247 +1,151 @@
 [doctest] run with "--help" for options
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  all binary assertions
 
-assertion_macros.cpp(0) PASSED!
-  WARN_EQ( 1, 1 )
-with expansion:
-  WARN_EQ( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_EQ( 1, 1 )
-with expansion:
-  CHECK_EQ( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_EQ( 1, 1 )
-with expansion:
-  REQUIRE_EQ( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_NE( 1, 0 )
-with expansion:
-  WARN_NE( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_NE( 1, 0 )
-with expansion:
-  CHECK_NE( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_NE( 1, 0 )
-with expansion:
-  REQUIRE_NE( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_GT( 1, 0 )
-with expansion:
-  WARN_GT( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_GT( 1, 0 )
-with expansion:
-  CHECK_GT( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_GT( 1, 0 )
-with expansion:
-  REQUIRE_GT( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_LT( 0, 1 )
-with expansion:
-  WARN_LT( 0, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_LT( 0, 1 )
-with expansion:
-  CHECK_LT( 0, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_LT( 0, 1 )
-with expansion:
-  REQUIRE_LT( 0, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_GE( 1, 1 )
-with expansion:
-  WARN_GE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_GE( 1, 1 )
-with expansion:
-  CHECK_GE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_GE( 1, 1 )
-with expansion:
-  REQUIRE_GE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_LE( 1, 1 )
-with expansion:
-  WARN_LE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_LE( 1, 1 )
-with expansion:
-  CHECK_LE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_LE( 1, 1 )
-with expansion:
-  REQUIRE_LE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_UNARY( 1 )
-with expansion:
-  WARN_UNARY( 1 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_UNARY( 1 )
-with expansion:
-  CHECK_UNARY( 1 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_UNARY( 1 )
-with expansion:
-  REQUIRE_UNARY( 1 )
-
-assertion_macros.cpp(0) PASSED!
-  WARN_UNARY_FALSE( 0 )
-with expansion:
-  WARN_UNARY_FALSE( 0 )
-
-assertion_macros.cpp(0) PASSED!
-  CHECK_UNARY_FALSE( 0 )
-with expansion:
-  CHECK_UNARY_FALSE( 0 )
-
-assertion_macros.cpp(0) PASSED!
-  REQUIRE_UNARY_FALSE( 0 )
-with expansion:
-  REQUIRE_UNARY_FALSE( 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_EQ( 1, 1 )
-with expansion:
-  FAST_WARN_EQ( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_EQ( 1, 1 )
-with expansion:
-  FAST_CHECK_EQ( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_EQ( 1, 1 )
-with expansion:
-  FAST_REQUIRE_EQ( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_NE( 1, 0 )
-with expansion:
-  FAST_WARN_NE( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_NE( 1, 0 )
-with expansion:
-  FAST_CHECK_NE( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_NE( 1, 0 )
-with expansion:
-  FAST_REQUIRE_NE( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_GT( 1, 0 )
-with expansion:
-  FAST_WARN_GT( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_GT( 1, 0 )
-with expansion:
-  FAST_CHECK_GT( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_GT( 1, 0 )
-with expansion:
-  FAST_REQUIRE_GT( 1, 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_LT( 0, 1 )
-with expansion:
-  FAST_WARN_LT( 0, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_LT( 0, 1 )
-with expansion:
-  FAST_CHECK_LT( 0, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_LT( 0, 1 )
-with expansion:
-  FAST_REQUIRE_LT( 0, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_GE( 1, 1 )
-with expansion:
-  FAST_WARN_GE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_GE( 1, 1 )
-with expansion:
-  FAST_CHECK_GE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_GE( 1, 1 )
-with expansion:
-  FAST_REQUIRE_GE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_LE( 1, 1 )
-with expansion:
-  FAST_WARN_LE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_LE( 1, 1 )
-with expansion:
-  FAST_CHECK_LE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_LE( 1, 1 )
-with expansion:
-  FAST_REQUIRE_LE( 1, 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_UNARY( 1 )
-with expansion:
-  FAST_WARN_UNARY( 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_UNARY( 1 )
-with expansion:
-  FAST_CHECK_UNARY( 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_UNARY( 1 )
-with expansion:
-  FAST_REQUIRE_UNARY( 1 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_WARN_UNARY_FALSE( 0 )
-with expansion:
-  FAST_WARN_UNARY_FALSE( 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_CHECK_UNARY_FALSE( 0 )
-with expansion:
-  FAST_CHECK_UNARY_FALSE( 0 )
-
-assertion_macros.cpp(0) PASSED!
-  FAST_REQUIRE_UNARY_FALSE( 0 )
-with expansion:
-  FAST_REQUIRE_UNARY_FALSE( 0 )
+assertion_macros.cpp(0): SUCCESS: WARN_EQ( 1, 1 ) is correct!
+  values: WARN_EQ( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_EQ( 1, 1 ) is correct!
+  values: CHECK_EQ( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_EQ( 1, 1 ) is correct!
+  values: REQUIRE_EQ( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_NE( 1, 0 ) is correct!
+  values: WARN_NE( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_NE( 1, 0 ) is correct!
+  values: CHECK_NE( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_NE( 1, 0 ) is correct!
+  values: REQUIRE_NE( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_GT( 1, 0 ) is correct!
+  values: WARN_GT( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_GT( 1, 0 ) is correct!
+  values: CHECK_GT( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_GT( 1, 0 ) is correct!
+  values: REQUIRE_GT( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_LT( 0, 1 ) is correct!
+  values: WARN_LT( 0, 1 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_LT( 0, 1 ) is correct!
+  values: CHECK_LT( 0, 1 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_LT( 0, 1 ) is correct!
+  values: REQUIRE_LT( 0, 1 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_GE( 1, 1 ) is correct!
+  values: WARN_GE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_GE( 1, 1 ) is correct!
+  values: CHECK_GE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_GE( 1, 1 ) is correct!
+  values: REQUIRE_GE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_LE( 1, 1 ) is correct!
+  values: WARN_LE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_LE( 1, 1 ) is correct!
+  values: CHECK_LE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_LE( 1, 1 ) is correct!
+  values: REQUIRE_LE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_UNARY( 1 ) is correct!
+  values: WARN_UNARY( 1 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_UNARY( 1 ) is correct!
+  values: CHECK_UNARY( 1 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_UNARY( 1 ) is correct!
+  values: REQUIRE_UNARY( 1 )
+
+assertion_macros.cpp(0): SUCCESS: WARN_UNARY_FALSE( 0 ) is correct!
+  values: WARN_UNARY_FALSE( 0 )
+
+assertion_macros.cpp(0): SUCCESS: CHECK_UNARY_FALSE( 0 ) is correct!
+  values: CHECK_UNARY_FALSE( 0 )
+
+assertion_macros.cpp(0): SUCCESS: REQUIRE_UNARY_FALSE( 0 ) is correct!
+  values: REQUIRE_UNARY_FALSE( 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_EQ( 1, 1 ) is correct!
+  values: FAST_WARN_EQ( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_EQ( 1, 1 ) is correct!
+  values: FAST_CHECK_EQ( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_EQ( 1, 1 ) is correct!
+  values: FAST_REQUIRE_EQ( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_NE( 1, 0 ) is correct!
+  values: FAST_WARN_NE( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_NE( 1, 0 ) is correct!
+  values: FAST_CHECK_NE( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_NE( 1, 0 ) is correct!
+  values: FAST_REQUIRE_NE( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_GT( 1, 0 ) is correct!
+  values: FAST_WARN_GT( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_GT( 1, 0 ) is correct!
+  values: FAST_CHECK_GT( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_GT( 1, 0 ) is correct!
+  values: FAST_REQUIRE_GT( 1, 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_LT( 0, 1 ) is correct!
+  values: FAST_WARN_LT( 0, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_LT( 0, 1 ) is correct!
+  values: FAST_CHECK_LT( 0, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_LT( 0, 1 ) is correct!
+  values: FAST_REQUIRE_LT( 0, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_GE( 1, 1 ) is correct!
+  values: FAST_WARN_GE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_GE( 1, 1 ) is correct!
+  values: FAST_CHECK_GE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_GE( 1, 1 ) is correct!
+  values: FAST_REQUIRE_GE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_LE( 1, 1 ) is correct!
+  values: FAST_WARN_LE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_LE( 1, 1 ) is correct!
+  values: FAST_CHECK_LE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_LE( 1, 1 ) is correct!
+  values: FAST_REQUIRE_LE( 1, 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_UNARY( 1 ) is correct!
+  values: FAST_WARN_UNARY( 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_UNARY( 1 ) is correct!
+  values: FAST_CHECK_UNARY( 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_UNARY( 1 ) is correct!
+  values: FAST_REQUIRE_UNARY( 1 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_WARN_UNARY_FALSE( 0 ) is correct!
+  values: FAST_WARN_UNARY_FALSE( 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_CHECK_UNARY_FALSE( 0 ) is correct!
+  values: FAST_CHECK_UNARY_FALSE( 0 )
+
+assertion_macros.cpp(0): SUCCESS: FAST_REQUIRE_UNARY_FALSE( 0 ) is correct!
+  values: FAST_REQUIRE_UNARY_FALSE( 0 )
 
 ===============================================================================
 [doctest] test cases:      1 |      1 passed |      0 failed | 
diff --git a/examples/all_features/test_output/assertion_macros.cpp.txt b/examples/all_features/test_output/assertion_macros.cpp.txt
index e358ba9..db1c51b 100644
--- a/examples/all_features/test_output/assertion_macros.cpp.txt
+++ b/examples/all_features/test_output/assertion_macros.cpp.txt
@@ -1,294 +1,190 @@
 [doctest] run with "--help" for options
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  normal macros
 
-assertion_macros.cpp(0) ERROR!
-  CHECK( throw_if(true, std::runtime_error("whops!")) == 42 )
-threw exception:
-  whops!
+assertion_macros.cpp(0): ERROR: CHECK( throw_if(true, std::runtime_error("whops!")) == 42 ) THREW exception: whops!
 
-assertion_macros.cpp(0) ERROR!
-  CHECK( doctest::Approx(0.502) == 0.501 )
-with expansion:
-  CHECK( Approx( 0.502 ) == 0.501 )
+assertion_macros.cpp(0): ERROR: CHECK( doctest::Approx(0.502) == 0.501 ) is NOT correct!
+  values: CHECK( Approx( 0.502 ) == 0.501 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  exceptions-related macros
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS( throw_if(false, 0) )
-didn't throw at all
+assertion_macros.cpp(0): ERROR: CHECK_THROWS( throw_if(false, 0) ) did NOT throw at all!
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS_AS( throw_if(true, 0), char )
-threw a different exception:
-  0
+assertion_macros.cpp(0): ERROR: CHECK_THROWS_AS( throw_if(true, 0), char ) threw a DIFFERENT exception: 0
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS_AS( throw_if(false, 0), int )
-didn't throw at all
+assertion_macros.cpp(0): ERROR: CHECK_THROWS_AS( throw_if(false, 0), int ) did NOT throw at all!
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_NOTHROW( throw_if(true, 0) )
-threw exception:
-  0
+assertion_macros.cpp(0): ERROR: CHECK_NOTHROW( throw_if(true, 0) ) THREW exception: 0
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  exceptions-related macros for std::exception
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS( throw_if(false, 0) )
-didn't throw at all
+assertion_macros.cpp(0): ERROR: CHECK_THROWS( throw_if(false, 0) ) did NOT throw at all!
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS_AS( throw_if(false, std::runtime_error("whops!")), std::exception )
-didn't throw at all
+assertion_macros.cpp(0): ERROR: CHECK_THROWS_AS( throw_if(false, std::runtime_error("whops!")), std::exception ) did NOT throw at all!
 
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS_AS( throw_if(true, std::runtime_error("whops!")), int )
-threw a different exception:
-  whops!
+assertion_macros.cpp(0): ERROR: CHECK_THROWS_AS( throw_if(true, std::runtime_error("whops!")), int ) threw a DIFFERENT exception: whops!
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_NOTHROW( throw_if(true, std::runtime_error("whops!")) )
-threw exception:
-  whops!
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_NOTHROW( throw_if(true, std::runtime_error("whops!")) ) THREW exception: whops!
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  WARN level of asserts don't fail the test case
 
-assertion_macros.cpp(0) WARNING!
-  WARN( 0 )
-with expansion:
-  WARN( 0 )
-
-assertion_macros.cpp(0) WARNING!
-  WARN_FALSE( 1 )
-with expansion:
-  WARN_FALSE( 1 )
-
-assertion_macros.cpp(0) WARNING!
-  WARN_THROWS( throw_if(false, 0) )
-didn't throw at all
-
-assertion_macros.cpp(0) WARNING!
-  WARN_THROWS_AS( throw_if(false, 0), bool )
-didn't throw at all
-
-assertion_macros.cpp(0) WARNING!
-  WARN_THROWS_AS( throw_if(true, 0), bool )
-threw a different exception:
-  0
-
-assertion_macros.cpp(0) WARNING!
-  WARN_NOTHROW( throw_if(true, 0) )
-threw exception:
-  0
-
-assertion_macros.cpp(0) WARNING!
-  WARN_EQ( 1, 0 )
-with expansion:
-  WARN_EQ( 1, 0 )
-
-assertion_macros.cpp(0) WARNING!
-  WARN_UNARY( 0 )
-with expansion:
-  WARN_UNARY( 0 )
-
-assertion_macros.cpp(0) WARNING!
-  WARN_UNARY_FALSE( 1 )
-with expansion:
-  WARN_UNARY_FALSE( 1 )
-
-assertion_macros.cpp(0) WARNING!
-  FAST_WARN_EQ( 1, 0 )
-with expansion:
-  FAST_WARN_EQ( 1, 0 )
-
-assertion_macros.cpp(0) WARNING!
-  FAST_WARN_UNARY( 0 )
-with expansion:
-  FAST_WARN_UNARY( 0 )
-
-assertion_macros.cpp(0) WARNING!
-  FAST_WARN_UNARY_FALSE( 1 )
-with expansion:
-  FAST_WARN_UNARY_FALSE( 1 )
+assertion_macros.cpp(0): WARNING: WARN( 0 ) is NOT correct!
+  values: WARN( 0 )
+
+assertion_macros.cpp(0): WARNING: WARN_FALSE( 1 ) is NOT correct!
+  values: WARN_FALSE( 1 )
+
+assertion_macros.cpp(0): WARNING: WARN_THROWS( throw_if(false, 0) ) did NOT throw at all!
+
+assertion_macros.cpp(0): WARNING: WARN_THROWS_AS( throw_if(false, 0), bool ) did NOT throw at all!
+
+assertion_macros.cpp(0): WARNING: WARN_THROWS_AS( throw_if(true, 0), bool ) threw a DIFFERENT exception: 0
+
+assertion_macros.cpp(0): WARNING: WARN_NOTHROW( throw_if(true, 0) ) THREW exception: 0
+
+assertion_macros.cpp(0): WARNING: WARN_EQ( 1, 0 ) is NOT correct!
+  values: WARN_EQ( 1, 0 )
+
+assertion_macros.cpp(0): WARNING: WARN_UNARY( 0 ) is NOT correct!
+  values: WARN_UNARY( 0 )
+
+assertion_macros.cpp(0): WARNING: WARN_UNARY_FALSE( 1 ) is NOT correct!
+  values: WARN_UNARY_FALSE( 1 )
+
+assertion_macros.cpp(0): WARNING: FAST_WARN_EQ( 1, 0 ) is NOT correct!
+  values: FAST_WARN_EQ( 1, 0 )
+
+assertion_macros.cpp(0): WARNING: FAST_WARN_UNARY( 0 ) is NOT correct!
+  values: FAST_WARN_UNARY( 0 )
+
+assertion_macros.cpp(0): WARNING: FAST_WARN_UNARY_FALSE( 1 ) is NOT correct!
+  values: FAST_WARN_UNARY_FALSE( 1 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  CHECK level of asserts fail the test case but don't abort it
 
-assertion_macros.cpp(0) ERROR!
-  CHECK( 0 )
-with expansion:
-  CHECK( 0 )
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_FALSE( 1 )
-with expansion:
-  CHECK_FALSE( 1 )
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS( throw_if(false, 0) )
-didn't throw at all
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS_AS( throw_if(false, 0), bool )
-didn't throw at all
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_THROWS_AS( throw_if(true, 0), bool )
-threw a different exception:
-  0
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_NOTHROW( throw_if(true, 0) )
-threw exception:
-  0
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_EQ( 1, 0 )
-with expansion:
-  CHECK_EQ( 1, 0 )
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_UNARY( 0 )
-with expansion:
-  CHECK_UNARY( 0 )
-
-assertion_macros.cpp(0) ERROR!
-  CHECK_UNARY_FALSE( 1 )
-with expansion:
-  CHECK_UNARY_FALSE( 1 )
-
-assertion_macros.cpp(0) ERROR!
-  FAST_CHECK_EQ( 1, 0 )
-with expansion:
-  FAST_CHECK_EQ( 1, 0 )
-
-assertion_macros.cpp(0) ERROR!
-  FAST_CHECK_UNARY( 0 )
-with expansion:
-  FAST_CHECK_UNARY( 0 )
-
-assertion_macros.cpp(0) ERROR!
-  FAST_CHECK_UNARY_FALSE( 1 )
-with expansion:
-  FAST_CHECK_UNARY_FALSE( 1 )
-
-assertion_macros.cpp(0) MESSAGE!
-  reached!
+assertion_macros.cpp(0): ERROR: CHECK( 0 ) is NOT correct!
+  values: CHECK( 0 )
+
+assertion_macros.cpp(0): ERROR: CHECK_FALSE( 1 ) is NOT correct!
+  values: CHECK_FALSE( 1 )
+
+assertion_macros.cpp(0): ERROR: CHECK_THROWS( throw_if(false, 0) ) did NOT throw at all!
+
+assertion_macros.cpp(0): ERROR: CHECK_THROWS_AS( throw_if(false, 0), bool ) did NOT throw at all!
+
+assertion_macros.cpp(0): ERROR: CHECK_THROWS_AS( throw_if(true, 0), bool ) threw a DIFFERENT exception: 0
+
+assertion_macros.cpp(0): ERROR: CHECK_NOTHROW( throw_if(true, 0) ) THREW exception: 0
+
+assertion_macros.cpp(0): ERROR: CHECK_EQ( 1, 0 ) is NOT correct!
+  values: CHECK_EQ( 1, 0 )
+
+assertion_macros.cpp(0): ERROR: CHECK_UNARY( 0 ) is NOT correct!
+  values: CHECK_UNARY( 0 )
+
+assertion_macros.cpp(0): ERROR: CHECK_UNARY_FALSE( 1 ) is NOT correct!
+  values: CHECK_UNARY_FALSE( 1 )
+
+assertion_macros.cpp(0): ERROR: FAST_CHECK_EQ( 1, 0 ) is NOT correct!
+  values: FAST_CHECK_EQ( 1, 0 )
+
+assertion_macros.cpp(0): ERROR: FAST_CHECK_UNARY( 0 ) is NOT correct!
+  values: FAST_CHECK_UNARY( 0 )
+
+assertion_macros.cpp(0): ERROR: FAST_CHECK_UNARY_FALSE( 1 ) is NOT correct!
+  values: FAST_CHECK_UNARY_FALSE( 1 )
+
+assertion_macros.cpp(0): MESSAGE: reached!
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 1
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE( 0 )
-with expansion:
-  REQUIRE( 0 )
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE( 0 ) is NOT correct!
+  values: REQUIRE( 0 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 2
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_FALSE( 1 )
-with expansion:
-  REQUIRE_FALSE( 1 )
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_FALSE( 1 ) is NOT correct!
+  values: REQUIRE_FALSE( 1 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 3
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_THROWS( throw_if(false, 0) )
-didn't throw at all
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_THROWS( throw_if(false, 0) ) did NOT throw at all!
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 4
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_THROWS_AS( throw_if(false, 0), bool )
-didn't throw at all
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_THROWS_AS( throw_if(false, 0), bool ) did NOT throw at all!
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 5
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_THROWS_AS( throw_if(true, 0), bool )
-threw a different exception:
-  0
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_THROWS_AS( throw_if(true, 0), bool ) threw a DIFFERENT exception: 0
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 6
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_NOTHROW( throw_if(true, 0) )
-threw exception:
-  0
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_NOTHROW( throw_if(true, 0) ) THREW exception: 0
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 7
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_EQ( 1, 0 )
-with expansion:
-  REQUIRE_EQ( 1, 0 )
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_EQ( 1, 0 ) is NOT correct!
+  values: REQUIRE_EQ( 1, 0 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 8
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_UNARY( 0 )
-with expansion:
-  REQUIRE_UNARY( 0 )
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_UNARY( 0 ) is NOT correct!
+  values: REQUIRE_UNARY( 0 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 9
 
-assertion_macros.cpp(0) FATAL ERROR!
-  REQUIRE_UNARY_FALSE( 1 )
-with expansion:
-  REQUIRE_UNARY_FALSE( 1 )
+assertion_macros.cpp(0): FATAL ERROR: REQUIRE_UNARY_FALSE( 1 ) is NOT correct!
+  values: REQUIRE_UNARY_FALSE( 1 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 10
 
-assertion_macros.cpp(0) FATAL ERROR!
-  FAST_REQUIRE_EQ( 1, 0 )
-with expansion:
-  FAST_REQUIRE_EQ( 1, 0 )
+assertion_macros.cpp(0): FATAL ERROR: FAST_REQUIRE_EQ( 1, 0 ) is NOT correct!
+  values: FAST_REQUIRE_EQ( 1, 0 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 11
 
-assertion_macros.cpp(0) FATAL ERROR!
-  FAST_REQUIRE_UNARY( 0 )
-with expansion:
-  FAST_REQUIRE_UNARY( 0 )
+assertion_macros.cpp(0): FATAL ERROR: FAST_REQUIRE_UNARY( 0 ) is NOT correct!
+  values: FAST_REQUIRE_UNARY( 0 )
 
 ===============================================================================
-assertion_macros.cpp(0)
+assertion_macros.cpp(0):
 TEST CASE:  REQUIRE level of asserts fail and abort the test case - 12
 
-assertion_macros.cpp(0) FATAL ERROR!
-  FAST_REQUIRE_UNARY_FALSE( 1 )
-with expansion:
-  FAST_REQUIRE_UNARY_FALSE( 1 )
+assertion_macros.cpp(0): FATAL ERROR: FAST_REQUIRE_UNARY_FALSE( 1 ) is NOT correct!
+  values: FAST_REQUIRE_UNARY_FALSE( 1 )
 
 ===============================================================================
 [doctest] test cases:     20 |      4 passed |     16 failed | 
diff --git a/examples/all_features/test_output/coverage_maxout.cpp.txt b/examples/all_features/test_output/coverage_maxout.cpp.txt
index f5d0066..88ef8f8 100644
--- a/examples/all_features/test_output/coverage_maxout.cpp.txt
+++ b/examples/all_features/test_output/coverage_maxout.cpp.txt
@@ -1,55 +1,40 @@
 [doctest] run with "--help" for options
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST CASE:  doctest internals
 
-coverage_maxout.cpp(0) ERROR!
-  CHECK( a.compare(const_str, true) != 0 )
-with expansion:
-  CHECK( 0 != 0 )
-with context:
-  should fail
-
-coverage_maxout.cpp(0) ERROR!
-  CHECK( a.compare("omgomgomg", false) != 0 )
-with expansion:
-  CHECK( 0 != 0 )
-with context:
-  should fail
-
-coverage_maxout.cpp(0) ERROR!
-  CHECK( len_is_zero )
-with expansion:
-  CHECK( false )
-with context:
-  should fail
+coverage_maxout.cpp(0): ERROR: CHECK( a.compare(const_str, true) != 0 ) is NOT correct!
+  values: CHECK( 0 != 0 )
+  logged: should fail
+
+coverage_maxout.cpp(0): ERROR: CHECK( a.compare("omgomgomg", false) != 0 ) is NOT correct!
+  values: CHECK( 0 != 0 )
+  logged: should fail
+
+coverage_maxout.cpp(0): ERROR: CHECK( len_is_zero ) is NOT correct!
+  values: CHECK( false )
+  logged: should fail
 
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST SUITE: exception related
 TEST CASE:  will end from a std::string exception
 
-TEST CASE FAILED!
-threw exception:
-  std::string!
+coverage_maxout.cpp(0): ERROR: test case THREW exception: std::string!
 
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST SUITE: exception related
 TEST CASE:  will end from a const char* exception
 
-TEST CASE FAILED!
-threw exception:
-  const char*!
+coverage_maxout.cpp(0): ERROR: test case THREW exception: const char*!
 
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST SUITE: exception related
 TEST CASE:  will end from an unknown exception
 
-TEST CASE FAILED!
-threw exception:
-  unknown exception
+coverage_maxout.cpp(0): ERROR: test case THREW exception: unknown exception
 
 ===============================================================================
 [doctest] test cases:      4 |      0 passed |      4 failed | 
diff --git a/examples/all_features/test_output/filter_3.txt b/examples/all_features/test_output/filter_3.txt
index 95f4251..b1869c5 100644
--- a/examples/all_features/test_output/filter_3.txt
+++ b/examples/all_features/test_output/filter_3.txt
@@ -2,28 +2,25 @@
 
 root
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
   from function...
 
-subcases.cpp(0) MESSAGE!
-  print me twice
+subcases.cpp(0): MESSAGE: print me twice
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
   from function...
   sc1
 
-subcases.cpp(0) MESSAGE!
-  hello! from sc1
+subcases.cpp(0): MESSAGE: hello! from sc1
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
 
-subcases.cpp(0) MESSAGE!
-  lala
+subcases.cpp(0): MESSAGE: lala
 
 ===============================================================================
 [doctest] test cases:      3 |      3 passed |      0 failed | 
diff --git a/examples/all_features/test_output/first_last.txt b/examples/all_features/test_output/first_last.txt
index 72055b8..e4508c3 100644
--- a/examples/all_features/test_output/first_last.txt
+++ b/examples/all_features/test_output/first_last.txt
@@ -1,30 +1,24 @@
 [doctest] run with "--help" for options
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST SUITE: exception related
 TEST CASE:  will end from a std::string exception
 
-TEST CASE FAILED!
-threw exception:
-  std::string!
+coverage_maxout.cpp(0): ERROR: test case THREW exception: std::string!
 
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST SUITE: exception related
 TEST CASE:  will end from a const char* exception
 
-TEST CASE FAILED!
-threw exception:
-  const char*!
+coverage_maxout.cpp(0): ERROR: test case THREW exception: const char*!
 
 ===============================================================================
-coverage_maxout.cpp(0)
+coverage_maxout.cpp(0):
 TEST SUITE: exception related
 TEST CASE:  will end from an unknown exception
 
-TEST CASE FAILED!
-threw exception:
-  unknown exception
+coverage_maxout.cpp(0): ERROR: test case THREW exception: unknown exception
 
 ===============================================================================
 [doctest] test cases:      4 |      1 passed |      3 failed | 
diff --git a/examples/all_features/test_output/header.h.txt b/examples/all_features/test_output/header.h.txt
index 8d9f3d6..e427a62 100644
--- a/examples/all_features/test_output/header.h.txt
+++ b/examples/all_features/test_output/header.h.txt
@@ -1,22 +1,22 @@
 [doctest] run with "--help" for options
 ===============================================================================
-header.h(0)
+header.h(0):
 TEST SUITE: some TS
 TEST CASE:  in TS
 
-header.h(0) FATAL ERROR!
+header.h(0): FATAL ERROR: 
 
 ===============================================================================
-header.h(0)
+header.h(0):
 TEST CASE:  template 1<char>
 
-header.h(0) FATAL ERROR!
+header.h(0): FATAL ERROR: 
 
 ===============================================================================
-header.h(0)
+header.h(0):
 TEST CASE:  template 2<doctest::String>
 
-header.h(0) FATAL ERROR!
+header.h(0): FATAL ERROR: 
 
 ===============================================================================
 [doctest] test cases:      4 |      1 passed |      3 failed | 
diff --git a/examples/all_features/test_output/help.txt b/examples/all_features/test_output/help.txt
index aee1ca0..bd5a793 100644
--- a/examples/all_features/test_output/help.txt
+++ b/examples/all_features/test_output/help.txt
@@ -49,6 +49,7 @@
  -fc,  --force-colors=<bool>           use colors even when not in a tty
  -nb,  --no-breaks=<bool>              disables breakpoints in debuggers
  -ns,  --no-skip=<bool>                don't skip test cases marked as skip
+ -gfl, --gnu-file-line=<bool>          :n: vs (n): for line numbers in output
  -npf, --no-path-filenames=<bool>      only filenames and no paths in output
  -nln, --no-line-numbers=<bool>        0 instead of real line numbers in output
 
diff --git a/examples/all_features/test_output/logging.cpp.txt b/examples/all_features/test_output/logging.cpp.txt
index ac09c63..4e61073 100644
--- a/examples/all_features/test_output/logging.cpp.txt
+++ b/examples/all_features/test_output/logging.cpp.txt
@@ -1,107 +1,80 @@
 [doctest] run with "--help" for options
 ===============================================================================
-logging.cpp(0)
+logging.cpp(0):
 TEST CASE:  logging the counter of a loop
 
-logging.cpp(0) ERROR!
-  CHECK( vec[i] != (1 << i) )
-with expansion:
-  CHECK( 1 != 1 )
-with context:
-  current iteration of loop:
-  i := 0
-
-logging.cpp(0) ERROR!
-  CHECK( vec[i] != (1 << i) )
-with expansion:
-  CHECK( 2 != 2 )
-with context:
-  current iteration of loop:
-  i := 1
-
-logging.cpp(0) ERROR!
-  CHECK( vec[i] != (1 << i) )
-with expansion:
-  CHECK( 4 != 4 )
-with context:
-  current iteration of loop:
-  i := 2
-
-logging.cpp(0) ERROR!
-  CHECK( vec[i] != (1 << i) )
-with expansion:
-  CHECK( 8 != 8 )
-with context:
-  current iteration of loop:
-  i := 3
-
-logging.cpp(0) ERROR!
-  CHECK( vec[i] != (1 << i) )
-with expansion:
-  CHECK( 16 != 16 )
-with context:
-  current iteration of loop:
-  i := 4
+logging.cpp(0): ERROR: CHECK( vec[i] != (1 << i) ) is NOT correct!
+  values: CHECK( 1 != 1 )
+  logged: current iteration of loop:
+          i := 0
+
+logging.cpp(0): ERROR: CHECK( vec[i] != (1 << i) ) is NOT correct!
+  values: CHECK( 2 != 2 )
+  logged: current iteration of loop:
+          i := 1
+
+logging.cpp(0): ERROR: CHECK( vec[i] != (1 << i) ) is NOT correct!
+  values: CHECK( 4 != 4 )
+  logged: current iteration of loop:
+          i := 2
+
+logging.cpp(0): ERROR: CHECK( vec[i] != (1 << i) ) is NOT correct!
+  values: CHECK( 8 != 8 )
+  logged: current iteration of loop:
+          i := 3
+
+logging.cpp(0): ERROR: CHECK( vec[i] != (1 << i) ) is NOT correct!
+  values: CHECK( 16 != 16 )
+  logged: current iteration of loop:
+          i := 4
 
 ===============================================================================
-logging.cpp(0)
+logging.cpp(0):
 TEST CASE:  a test case that will end from an exception
 
-logging.cpp(0) ERROR!
-  forcing the many captures (including those on the heap) to be stringified
-with context:
-  lots of captures - some on heap: 42 42 42;
-
-logging.cpp(0) ERROR!
-  CHECK( some_var == 666 )
-with expansion:
-  CHECK( 42 == 666 )
-with context:
-  someTests() returned: 42
-  this should be printed if an exception is thrown even if no assert has failed: 42
-  in a nested scope this should be printed as well: 42
-  why is this not 666 ?!
-
-TEST CASE FAILED!
-threw exception:
-  0
+logging.cpp(0): ERROR: forcing the many captures (including those on the heap) to be stringified
+  logged: lots of captures - some on heap: 42 42 42;
+
+logging.cpp(0): ERROR: CHECK( some_var == 666 ) is NOT correct!
+  values: CHECK( 42 == 666 )
+  logged: someTests() returned: 42
+          this should be printed if an exception is thrown even if no assert has failed: 42
+          in a nested scope this should be printed as well: 42
+          why is this not 666 ?!
+
+logging.cpp(0): ERROR: test case THREW exception: 0
+  logged: someTests() returned: 42
+          this should be printed if an exception is thrown even if no assert has failed: 42
+          in a nested scope this should be printed as well: 42
 
 ===============================================================================
-logging.cpp(0)
+logging.cpp(0):
 TEST CASE:  a test case that will end from an exception and should print the unprinted context
 
-TEST CASE FAILED!
-threw exception:
-  0
-with context:
-  should be printed even if an exception is thrown and no assert fails before that
+logging.cpp(0): ERROR: test case THREW exception: 0
+  logged: should be printed even if an exception is thrown and no assert fails before that
 
 ===============================================================================
-logging.cpp(0)
+logging.cpp(0):
 TEST CASE:  third party asserts can report failures to doctest
 
-logging.cpp(0) ERROR!
-  MY_ASSERT(false)
+logging.cpp(0): ERROR: MY_ASSERT(false)
 
-logging.cpp(0) FATAL ERROR!
-  MY_ASSERT_FATAL(false)
+logging.cpp(0): FATAL ERROR: MY_ASSERT_FATAL(false)
 
 ===============================================================================
-logging.cpp(0)
+logging.cpp(0):
 TEST CASE:  explicit failures 1
 
-logging.cpp(0) ERROR!
-  this should not end the test case, but mark it as failing
+logging.cpp(0): ERROR: this should not end the test case, but mark it as failing
 
-logging.cpp(0) MESSAGE!
-  reached!
+logging.cpp(0): MESSAGE: reached!
 
 ===============================================================================
-logging.cpp(0)
+logging.cpp(0):
 TEST CASE:  explicit failures 2
 
-logging.cpp(0) FATAL ERROR!
-  fail the test case and also end it
+logging.cpp(0): FATAL ERROR: fail the test case and also end it
 
 ===============================================================================
 [doctest] test cases:      6 |      0 passed |      6 failed | 
diff --git a/examples/all_features/test_output/order_1.txt b/examples/all_features/test_output/order_1.txt
index 9f59587..6fb2069 100644
--- a/examples/all_features/test_output/order_1.txt
+++ b/examples/all_features/test_output/order_1.txt
@@ -1,109 +1,104 @@
 [doctest] run with "--help" for options
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST CASE:  should fail because of an exception
 
-TEST CASE FAILED!
-threw exception:
-  0
+test_cases_and_suites.cpp(0): ERROR: test case THREW exception: 0
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST CASE:  fixtured test - not part of a test suite
 
-test_cases_and_suites.cpp(0) ERROR!
-  CHECK( data == 85 )
-with expansion:
-  CHECK( 21 == 85 )
+test_cases_and_suites.cpp(0): ERROR: CHECK( data == 85 ) is NOT correct!
+  values: CHECK( 21 == 85 )
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: scoped test suite
 TEST CASE:  part of scoped
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: scoped test suite
 TEST CASE:  part of scoped 2
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: this test has overrided its skip decorator
 TEST SUITE: skipped test cases
 TEST CASE:  unskipped
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: skipped test cases
 TEST CASE:  skipped - inherited from the test suite
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: some TS
 TEST CASE:  part of some TS
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails - and its allowed
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Allowed to fail so marking it as not failed
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails as it should
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Failed as expected so marking it as not failed
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  doesn't fail but it should have
 
 Should have failed but didn't! Marking it as failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails 1 time as it should
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Failed exactly 1 times as expected so marking it as not failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails more times as it should
 
-test_cases_and_suites.cpp(0) ERROR!
+test_cases_and_suites.cpp(0): ERROR: 
 
-test_cases_and_suites.cpp(0) ERROR!
+test_cases_and_suites.cpp(0): ERROR: 
 
 Didn't fail exactly 1 times so marking it as failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: ts1
 TEST CASE:  normal test in a test suite from a decorator
 
-test_cases_and_suites.cpp(0) MESSAGE!
-  failing because of the timeout decorator!
+test_cases_and_suites.cpp(0): MESSAGE: failing because of the timeout decorator!
 
 Test case exceeded time limit of 0.000001!
 ===============================================================================
diff --git a/examples/all_features/test_output/order_2.txt b/examples/all_features/test_output/order_2.txt
index 0f1dbb8..6fe76ec 100644
--- a/examples/all_features/test_output/order_2.txt
+++ b/examples/all_features/test_output/order_2.txt
@@ -1,103 +1,98 @@
 [doctest] run with "--help" for options
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  doesn't fail but it should have
 
 Should have failed but didn't! Marking it as failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails - and its allowed
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Allowed to fail so marking it as not failed
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails 1 time as it should
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Failed exactly 1 times as expected so marking it as not failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails as it should
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Failed as expected so marking it as not failed
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails more times as it should
 
-test_cases_and_suites.cpp(0) ERROR!
+test_cases_and_suites.cpp(0): ERROR: 
 
-test_cases_and_suites.cpp(0) ERROR!
+test_cases_and_suites.cpp(0): ERROR: 
 
 Didn't fail exactly 1 times so marking it as failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST CASE:  fixtured test - not part of a test suite
 
-test_cases_and_suites.cpp(0) ERROR!
-  CHECK( data == 85 )
-with expansion:
-  CHECK( 21 == 85 )
+test_cases_and_suites.cpp(0): ERROR: CHECK( data == 85 ) is NOT correct!
+  values: CHECK( 21 == 85 )
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: ts1
 TEST CASE:  normal test in a test suite from a decorator
 
-test_cases_and_suites.cpp(0) MESSAGE!
-  failing because of the timeout decorator!
+test_cases_and_suites.cpp(0): MESSAGE: failing because of the timeout decorator!
 
 Test case exceeded time limit of 0.000001!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: scoped test suite
 TEST CASE:  part of scoped
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: scoped test suite
 TEST CASE:  part of scoped 2
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: some TS
 TEST CASE:  part of some TS
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST CASE:  should fail because of an exception
 
-TEST CASE FAILED!
-threw exception:
-  0
+test_cases_and_suites.cpp(0): ERROR: test case THREW exception: 0
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: this test has overrided its skip decorator
 TEST SUITE: skipped test cases
 TEST CASE:  unskipped
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
 [doctest] test cases:     14 |      5 passed |      9 failed | 
diff --git a/examples/all_features/test_output/stringification.cpp.txt b/examples/all_features/test_output/stringification.cpp.txt
index c763801..b5b74f6 100644
--- a/examples/all_features/test_output/stringification.cpp.txt
+++ b/examples/all_features/test_output/stringification.cpp.txt
@@ -1,39 +1,27 @@
 [doctest] run with "--help" for options
 ===============================================================================
-stringification.cpp(0)
+stringification.cpp(0):
 TEST CASE:  all asserts should fail and show how the objects get stringified
 
-stringification.cpp(0) ERROR!
-  CHECK( f1 == f2 )
-with expansion:
-  CHECK( Foo{} == Foo{} )
+stringification.cpp(0): ERROR: CHECK( f1 == f2 ) is NOT correct!
+  values: CHECK( Foo{} == Foo{} )
 
-stringification.cpp(0) ERROR!
-  CHECK( dummy1 == dummy2 )
-with expansion:
-  CHECK( omg == tralala )
+stringification.cpp(0): ERROR: CHECK( dummy1 == dummy2 ) is NOT correct!
+  values: CHECK( omg == tralala )
 
-stringification.cpp(0) ERROR!
-  CHECK( vec1 == vec2 )
-with expansion:
-  CHECK( [1, 2, 3] == [1, 2, 4] )
+stringification.cpp(0): ERROR: CHECK( vec1 == vec2 ) is NOT correct!
+  values: CHECK( [1, 2, 3] == [1, 2, 4] )
 
-stringification.cpp(0) ERROR!
-  CHECK( lst_1 == lst_2 )
-with expansion:
-  CHECK( [1, 42, 3, ] == [1, 2, 666, ] )
+stringification.cpp(0): ERROR: CHECK( lst_1 == lst_2 ) is NOT correct!
+  values: CHECK( [1, 42, 3, ] == [1, 2, 666, ] )
 
-TEST CASE FAILED!
-threw exception:
-  MyTypeInherited<int>(5, 4)
+stringification.cpp(0): ERROR: test case THREW exception: MyTypeInherited<int>(5, 4)
 
 ===============================================================================
-stringification.cpp(0)
+stringification.cpp(0):
 TEST CASE:  a test case that registers an exception translator for int and then throws one
 
-TEST CASE FAILED!
-threw exception:
-  5
+stringification.cpp(0): ERROR: test case THREW exception: 5
 
 ===============================================================================
 [doctest] test cases:      2 |      0 passed |      2 failed | 
diff --git a/examples/all_features/test_output/subcases.cpp.txt b/examples/all_features/test_output/subcases.cpp.txt
index 7f35631..6e9101d 100644
--- a/examples/all_features/test_output/subcases.cpp.txt
+++ b/examples/all_features/test_output/subcases.cpp.txt
@@ -11,82 +11,72 @@ root
 root
 2
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  lots of nested subcases
 
-subcases.cpp(0) FATAL ERROR!
+subcases.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
   from function...
 
-subcases.cpp(0) MESSAGE!
-  print me twice
+subcases.cpp(0): MESSAGE: print me twice
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
   from function...
   sc1
 
-subcases.cpp(0) MESSAGE!
-  hello! from sc1
+subcases.cpp(0): MESSAGE: hello! from sc1
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
 
-subcases.cpp(0) MESSAGE!
-  lala
+subcases.cpp(0): MESSAGE: lala
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
   from function...
 
-subcases.cpp(0) MESSAGE!
-  print me twice
+subcases.cpp(0): MESSAGE: print me twice
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
   from function...
   sc2
 
-subcases.cpp(0) MESSAGE!
-  hello! from sc2
+subcases.cpp(0): MESSAGE: hello! from sc2
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
 TEST CASE:  subcases can be used in a separate function as well
 
-subcases.cpp(0) MESSAGE!
-  lala
+subcases.cpp(0): MESSAGE: lala
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
   Scenario: vectors can be sized and resized
      Given: A vector with some items
       When: the size is increased
       Then: the size and capacity change
 
-subcases.cpp(0) ERROR!
-  CHECK( v.size() == 20 )
-with expansion:
-  CHECK( 10 == 20 )
+subcases.cpp(0): ERROR: CHECK( v.size() == 20 ) is NOT correct!
+  values: CHECK( 10 == 20 )
 
 ===============================================================================
-subcases.cpp(0)
+subcases.cpp(0):
   Scenario: vectors can be sized and resized
      Given: A vector with some items
       When: less capacity is reserved
       Then: neither size nor capacity are changed
 
-subcases.cpp(0) ERROR!
-  CHECK( v.size() == 10 )
-with expansion:
-  CHECK( 5 == 10 )
+subcases.cpp(0): ERROR: CHECK( v.size() == 10 ) is NOT correct!
+  values: CHECK( 5 == 10 )
 
 ===============================================================================
 [doctest] test cases:      3 |      1 passed |      2 failed | 
diff --git a/examples/all_features/test_output/templated_test_cases.cpp.txt b/examples/all_features/test_output/templated_test_cases.cpp.txt
index cdb3324..87c8b23 100644
--- a/examples/all_features/test_output/templated_test_cases.cpp.txt
+++ b/examples/all_features/test_output/templated_test_cases.cpp.txt
@@ -1,48 +1,38 @@
 [doctest] run with "--help" for options
 ===============================================================================
-templated_test_cases.cpp(0)
+templated_test_cases.cpp(0):
 TEST CASE:  vector stuff<std::vector<int>>
 
-templated_test_cases.cpp(0) ERROR!
-  CHECK( vec.size() == 20 )
-with expansion:
-  CHECK( 10 == 20 )
+templated_test_cases.cpp(0): ERROR: CHECK( vec.size() == 20 ) is NOT correct!
+  values: CHECK( 10 == 20 )
 
 ===============================================================================
-templated_test_cases.cpp(0)
+templated_test_cases.cpp(0):
 TEST CASE:  multiple types<>
 
-templated_test_cases.cpp(0) ERROR!
-  CHECK( t2 != T2() )
-with expansion:
-  CHECK( 0 != 0 )
+templated_test_cases.cpp(0): ERROR: CHECK( t2 != T2() ) is NOT correct!
+  values: CHECK( 0 != 0 )
 
 ===============================================================================
-templated_test_cases.cpp(0)
+templated_test_cases.cpp(0):
 TEST CASE:  multiple types<>
 
-templated_test_cases.cpp(0) ERROR!
-  CHECK( t2 != T2() )
-with expansion:
-  CHECK( 0 != 0 )
+templated_test_cases.cpp(0): ERROR: CHECK( t2 != T2() ) is NOT correct!
+  values: CHECK( 0 != 0 )
 
 ===============================================================================
-templated_test_cases.cpp(0)
+templated_test_cases.cpp(0):
 TEST CASE:  multiple types<>
 
-templated_test_cases.cpp(0) ERROR!
-  CHECK( t2 != T2() )
-with expansion:
-  CHECK( 0 != 0 )
+templated_test_cases.cpp(0): ERROR: CHECK( t2 != T2() ) is NOT correct!
+  values: CHECK( 0 != 0 )
 
 ===============================================================================
-templated_test_cases.cpp(0)
+templated_test_cases.cpp(0):
 TEST CASE:  bad stringification of type pair<int_pair>
 
-templated_test_cases.cpp(0) ERROR!
-  CHECK( t2 != T2() )
-with expansion:
-  CHECK( 0 != 0 )
+templated_test_cases.cpp(0): ERROR: CHECK( t2 != T2() ) is NOT correct!
+  values: CHECK( 0 != 0 )
 
 ===============================================================================
 [doctest] test cases:     13 |      8 passed |      5 failed | 
diff --git a/examples/all_features/test_output/test_cases_and_suites.cpp.txt b/examples/all_features/test_output/test_cases_and_suites.cpp.txt
index c1087a8..a399638 100644
--- a/examples/all_features/test_output/test_cases_and_suites.cpp.txt
+++ b/examples/all_features/test_output/test_cases_and_suites.cpp.txt
@@ -1,102 +1,97 @@
 [doctest] run with "--help" for options
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST CASE:  should fail because of an exception
 
-TEST CASE FAILED!
-threw exception:
-  0
+test_cases_and_suites.cpp(0): ERROR: test case THREW exception: 0
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: scoped test suite
 TEST CASE:  part of scoped
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: scoped test suite
 TEST CASE:  part of scoped 2
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: some TS
 TEST CASE:  part of some TS
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST CASE:  fixtured test - not part of a test suite
 
-test_cases_and_suites.cpp(0) ERROR!
-  CHECK( data == 85 )
-with expansion:
-  CHECK( 21 == 85 )
+test_cases_and_suites.cpp(0): ERROR: CHECK( data == 85 ) is NOT correct!
+  values: CHECK( 21 == 85 )
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 TEST SUITE: ts1
 TEST CASE:  normal test in a test suite from a decorator
 
-test_cases_and_suites.cpp(0) MESSAGE!
-  failing because of the timeout decorator!
+test_cases_and_suites.cpp(0): MESSAGE: failing because of the timeout decorator!
 
 Test case exceeded time limit of 0.000001!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: this test has overrided its skip decorator
 TEST SUITE: skipped test cases
 TEST CASE:  unskipped
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails - and its allowed
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Allowed to fail so marking it as not failed
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails as it should
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Failed as expected so marking it as not failed
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  doesn't fail but it should have
 
 Should have failed but didn't! Marking it as failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails 1 time as it should
 
-test_cases_and_suites.cpp(0) FATAL ERROR!
+test_cases_and_suites.cpp(0): FATAL ERROR: 
 
 Failed exactly 1 times as expected so marking it as not failed!
 ===============================================================================
-test_cases_and_suites.cpp(0)
+test_cases_and_suites.cpp(0):
 DESCRIPTION: regarding failures
 TEST SUITE: test suite with a description
 TEST CASE:  fails more times as it should
 
-test_cases_and_suites.cpp(0) ERROR!
+test_cases_and_suites.cpp(0): ERROR: 
 
-test_cases_and_suites.cpp(0) ERROR!
+test_cases_and_suites.cpp(0): ERROR: 
 
 Didn't fail exactly 1 times so marking it as failed!
 ===============================================================================